From f8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 30 Aug 2022 14:22:17 -0700 Subject: [PATCH] j2d / map_path work, d_drawlist / d_attention cleanup (#208) * work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress * finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data * rename more data * remove asm / progress * match all of d_pane_class * fixes / some dKankyo doc * bunch of j2d work. d_drawlist / d_attention cleanup * progress / asm * cleanup wip * decompile JStage * setup some more JStudio structs * set up d_demo classes * some d_demo work * cleanup dolphin os stuff * some initial dEvent documentation * some At collision documentation * match JUTConsole::doDraw * dbgs work / split up some of d_a_alink into .inc files * d_a_alink_spinner work --- Progress.md | 8 +- .../J2DMatBlock/__ct__12J2DTevBlock1Fv.s | 68 - .../J2DMatBlock/__ct__12J2DTevBlock2Fv.s | 69 - .../J2DMatBlock/__ct__12J2DTevBlock4Fv.s | 76 - .../J2DMatBlock/__ct__12J2DTevBlock8Fv.s | 76 - .../J2DMatBlock/__ct__13J2DTevBlock16Fv.s | 76 - .../J2DMatBlock/__dt__12J2DTevBlock1Fv.s | 51 - .../J2DMatBlock/__dt__12J2DTevBlock2Fv.s | 60 - .../J2DMatBlock/__dt__12J2DTevBlock4Fv.s | 62 - .../J2DMatBlock/__dt__12J2DTevBlock8Fv.s | 62 - .../J2DMatBlock/__dt__13J2DTevBlock16Fv.s | 62 - .../J2DMatBlock/__dt__14J2DTexGenBlockFv.s | 37 - .../J2DMatBlock/__dt__15J2DIndBlockFullFv.s | 42 - .../getFontNo__12J2DTevBlock1CFv.s | 3 - .../getFontNo__12J2DTevBlock2CFv.s | 3 - .../getFontNo__12J2DTevBlock4CFv.s | 3 - .../getFontNo__12J2DTevBlock8CFv.s | 3 - .../getFontNo__13J2DTevBlock16CFv.s | 3 - .../J2DMatBlock/getFont__12J2DTevBlock1Fv.s | 3 - .../J2DMatBlock/getFont__12J2DTevBlock2Fv.s | 3 - .../J2DMatBlock/getFont__12J2DTevBlock4Fv.s | 3 - .../J2DMatBlock/getFont__12J2DTevBlock8Fv.s | 3 - .../J2DMatBlock/getFont__13J2DTevBlock16Fv.s | 3 - .../getIndTevStage__12J2DTevBlock1FUl.s | 6 - .../getIndTevStage__12J2DTevBlock2FUl.s | 6 - .../getIndTevStage__12J2DTevBlock4FUl.s | 6 - .../getIndTevStage__12J2DTevBlock8FUl.s | 6 - .../getIndTevStage__13J2DTevBlock16FUl.s | 6 - ...etIndTexCoordScale__15J2DIndBlockFullFUl.s | 6 - .../getIndTexMtx__15J2DIndBlockFullFUl.s | 6 - .../getIndTexOrder__15J2DIndBlockFullFUl.s | 6 - .../getIndTexStageNum__15J2DIndBlockFullCFv.s | 3 - .../getPalette__12J2DTevBlock1FUl.s | 10 - .../getPalette__12J2DTevBlock2FUl.s | 10 - .../getPalette__12J2DTevBlock4FUl.s | 10 - .../getPalette__12J2DTevBlock8FUl.s | 10 - .../getPalette__13J2DTevBlock16FUl.s | 10 - .../getTevColor__12J2DTevBlock1FUl.s | 6 - .../getTevColor__12J2DTevBlock2FUl.s | 6 - .../getTevColor__12J2DTevBlock4FUl.s | 6 - .../getTevColor__12J2DTevBlock8FUl.s | 6 - .../getTevColor__13J2DTevBlock16FUl.s | 6 - .../getTevKAlphaSel__12J2DTevBlock1FUl.s | 4 - .../getTevKAlphaSel__12J2DTevBlock2FUl.s | 4 - .../getTevKAlphaSel__12J2DTevBlock4FUl.s | 4 - .../getTevKAlphaSel__12J2DTevBlock8FUl.s | 4 - .../getTevKAlphaSel__13J2DTevBlock16FUl.s | 4 - .../getTevKColorSel__12J2DTevBlock1FUl.s | 4 - .../getTevKColorSel__12J2DTevBlock2FUl.s | 4 - .../getTevKColorSel__12J2DTevBlock4FUl.s | 4 - .../getTevKColorSel__12J2DTevBlock8FUl.s | 4 - .../getTevKColorSel__13J2DTevBlock16FUl.s | 4 - .../getTevKColor__12J2DTevBlock1FUl.s | 6 - .../getTevKColor__12J2DTevBlock2FUl.s | 6 - .../getTevKColor__12J2DTevBlock4FUl.s | 6 - .../getTevKColor__12J2DTevBlock8FUl.s | 6 - .../getTevKColor__13J2DTevBlock16FUl.s | 6 - .../getTevOrder__12J2DTevBlock1FUl.s | 6 - .../getTevOrder__12J2DTevBlock2FUl.s | 6 - .../getTevOrder__12J2DTevBlock4FUl.s | 6 - .../getTevOrder__12J2DTevBlock8FUl.s | 6 - .../getTevOrder__13J2DTevBlock16FUl.s | 6 - .../getTevStageNum__12J2DTevBlock2CFv.s | 3 - .../getTevStageNum__12J2DTevBlock4CFv.s | 3 - .../getTevStageNum__12J2DTevBlock8CFv.s | 3 - .../getTevStageNum__13J2DTevBlock16CFv.s | 3 - .../getTevStage__12J2DTevBlock1FUl.s | 6 - .../getTevStage__12J2DTevBlock2FUl.s | 6 - .../getTevStage__12J2DTevBlock4FUl.s | 6 - .../getTevStage__12J2DTevBlock8FUl.s | 6 - .../getTevStage__13J2DTevBlock16FUl.s | 6 - .../getTevSwapModeTable__12J2DTevBlock1FUl.s | 5 - .../getTevSwapModeTable__12J2DTevBlock2FUl.s | 5 - .../getTevSwapModeTable__12J2DTevBlock4FUl.s | 5 - .../getTevSwapModeTable__12J2DTevBlock8FUl.s | 5 - .../getTevSwapModeTable__13J2DTevBlock16FUl.s | 5 - .../getTexNo__12J2DTevBlock1CFUl.s | 5 - .../getTexNo__12J2DTevBlock2CFUl.s | 5 - .../getTexNo__12J2DTevBlock4CFUl.s | 5 - .../getTexNo__12J2DTevBlock8CFUl.s | 5 - .../getTexNo__13J2DTevBlock16CFUl.s | 5 - .../getTexture__12J2DTevBlock1FUl.s | 10 - .../getTexture__12J2DTevBlock2FUl.s | 10 - .../getTexture__12J2DTevBlock4FUl.s | 10 - .../getTexture__12J2DTevBlock8FUl.s | 10 - .../getTexture__13J2DTevBlock16FUl.s | 10 - .../J2DMatBlock/getType__12J2DTevBlock1Fv.s | 4 - .../J2DMatBlock/getType__12J2DTevBlock2Fv.s | 4 - .../J2DMatBlock/getType__12J2DTevBlock4Fv.s | 4 - .../J2DMatBlock/getType__12J2DTevBlock8Fv.s | 4 - .../J2DMatBlock/getType__13J2DTevBlock16Fv.s | 4 - .../getType__15J2DIndBlockFullFv.s | 4 - ...tTexture__12J2DTevBlock1FUlP10JUTTexture.s | 48 - ...sertTexture__12J2DTevBlock1FUlPC7ResTIMG.s | 13 - ...12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s | 83 - ...tTexture__12J2DTevBlock2FUlP10JUTTexture.s | 100 - ...sertTexture__12J2DTevBlock2FUlPC7ResTIMG.s | 13 - ...tTexture__12J2DTevBlock4FUlP10JUTTexture.s | 113 - ...sertTexture__12J2DTevBlock4FUlPC7ResTIMG.s | 13 - ...tTexture__12J2DTevBlock8FUlP10JUTTexture.s | 113 - ...sertTexture__12J2DTevBlock8FUlPC7ResTIMG.s | 13 - ...Texture__13J2DTevBlock16FUlP10JUTTexture.s | 113 - ...ertTexture__13J2DTevBlock16FUlPC7ResTIMG.s | 13 - ...dTexture__12J2DTevBlock1F11_GXTexMapIDUl.s | 20 - ...dTexture__12J2DTevBlock2F11_GXTexMapIDUl.s | 20 - ...dTexture__12J2DTevBlock4F11_GXTexMapIDUl.s | 20 - ...dTexture__12J2DTevBlock8F11_GXTexMapIDUl.s | 20 - ...Texture__13J2DTevBlock16F11_GXTexMapIDUl.s | 20 - .../prepareTexture__12J2DTevBlock1FUc.s | 51 - .../prepareTexture__12J2DTevBlock2FUc.s | 60 - .../prepareTexture__12J2DTevBlock4FUc.s | 60 - .../prepareTexture__12J2DTevBlock8FUc.s | 60 - .../prepareTexture__13J2DTevBlock16FUc.s | 60 - .../removeTexture__12J2DTevBlock1FUl.s | 35 - .../removeTexture__12J2DTevBlock2FUl.s | 58 - .../removeTexture__12J2DTevBlock4FUl.s | 68 - .../removeTexture__12J2DTevBlock8FUl.s | 68 - .../removeTexture__13J2DTevBlock16FUl.s | 68 - .../setFontUndeleteFlag__12J2DTevBlock1Fv.s | 5 - .../setFontUndeleteFlag__12J2DTevBlock2Fv.s | 5 - .../setFontUndeleteFlag__12J2DTevBlock4Fv.s | 5 - .../setFontUndeleteFlag__12J2DTevBlock8Fv.s | 4 - .../setFontUndeleteFlag__13J2DTevBlock16Fv.s | 4 - .../setFont__12J2DTevBlock1FP7JUTFont.s | 36 - .../setFont__12J2DTevBlock1FP7ResFONT.s | 51 - .../setFont__12J2DTevBlock2FP7JUTFont.s | 36 - .../setFont__12J2DTevBlock2FP7ResFONT.s | 51 - .../setFont__12J2DTevBlock4FP7JUTFont.s | 36 - .../setFont__12J2DTevBlock4FP7ResFONT.s | 51 - .../setFont__12J2DTevBlock8FP7JUTFont.s | 35 - .../setFont__12J2DTevBlock8FP7ResFONT.s | 49 - .../setFont__13J2DTevBlock16FP7JUTFont.s | 35 - .../setFont__13J2DTevBlock16FP7ResFONT.s | 49 - ...Stage__12J2DTevBlock1FUl14J2DIndTevStage.s | 6 - ...Stage__12J2DTevBlock2FUl14J2DIndTevStage.s | 6 - ...Stage__12J2DTevBlock4FUl14J2DIndTevStage.s | 6 - ...Stage__12J2DTevBlock8FUl14J2DIndTevStage.s | 6 - ...tage__13J2DTevBlock16FUl14J2DIndTevStage.s | 6 - .../setPalette__12J2DTevBlock1FUlPC7ResTLUT.s | 56 - .../setPalette__12J2DTevBlock2FUlPC7ResTLUT.s | 62 - .../setPalette__12J2DTevBlock4FUlPC7ResTLUT.s | 62 - .../setPalette__12J2DTevBlock8FUlPC7ResTLUT.s | 62 - ...setPalette__13J2DTevBlock16FUlPC7ResTLUT.s | 62 - ...vColor__12J2DTevBlock1FUl13J2DGXColorS10.s | 12 - ...vColor__12J2DTevBlock2FUl13J2DGXColorS10.s | 12 - ...vColor__12J2DTevBlock4FUl13J2DGXColorS10.s | 12 - ...vColor__12J2DTevBlock8FUl13J2DGXColorS10.s | 12 - ...Color__13J2DTevBlock16FUl13J2DGXColorS10.s | 12 - .../setTevKAlphaSel__12J2DTevBlock1FUlUc.s | 4 - .../setTevKAlphaSel__12J2DTevBlock2FUlUc.s | 4 - .../setTevKAlphaSel__12J2DTevBlock4FUlUc.s | 4 - .../setTevKAlphaSel__12J2DTevBlock8FUlUc.s | 4 - .../setTevKAlphaSel__13J2DTevBlock16FUlUc.s | 4 - .../setTevKColorSel__12J2DTevBlock1FUlUc.s | 4 - .../setTevKColorSel__12J2DTevBlock2FUlUc.s | 4 - .../setTevKColorSel__12J2DTevBlock4FUlUc.s | 4 - .../setTevKColorSel__12J2DTevBlock8FUlUc.s | 4 - .../setTevKColorSel__13J2DTevBlock16FUlUc.s | 4 - ...lor__12J2DTevBlock1FUlQ28JUtility6TColor.s | 12 - ...lor__12J2DTevBlock2FUlQ28JUtility6TColor.s | 12 - ...lor__12J2DTevBlock4FUlQ28JUtility6TColor.s | 12 - ...lor__12J2DTevBlock8FUlQ28JUtility6TColor.s | 12 - ...or__13J2DTevBlock16FUlQ28JUtility6TColor.s | 12 - ...TevOrder__12J2DTevBlock1FUl11J2DTevOrder.s | 10 - ...TevOrder__12J2DTevBlock2FUl11J2DTevOrder.s | 10 - ...TevOrder__12J2DTevBlock4FUl11J2DTevOrder.s | 10 - ...TevOrder__12J2DTevBlock8FUl11J2DTevOrder.s | 10 - ...evOrder__13J2DTevBlock16FUl11J2DTevOrder.s | 10 - ...TevStage__12J2DTevBlock1FUl11J2DTevStage.s | 16 - ...TevStage__12J2DTevBlock2FUl11J2DTevStage.s | 16 - ...TevStage__12J2DTevBlock4FUl11J2DTevStage.s | 16 - ...TevStage__12J2DTevBlock8FUl11J2DTevStage.s | 16 - ...evStage__13J2DTevBlock16FUl11J2DTevStage.s | 16 - ...o__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s | 15 - ...o__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s | 15 - ...o__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s | 15 - ...o__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s | 15 - ...__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s | 15 - ...__12J2DTevBlock1FUl19J2DTevSwapModeTable.s | 5 - ...__12J2DTevBlock2FUl19J2DTevSwapModeTable.s | 5 - ...__12J2DTevBlock4FUl19J2DTevSwapModeTable.s | 5 - ...__12J2DTevBlock8FUl19J2DTevSwapModeTable.s | 5 - ..._13J2DTevBlock16FUl19J2DTevSwapModeTable.s | 5 - .../setTexNo__12J2DTevBlock1FUlUs.s | 5 - .../setTexNo__12J2DTevBlock2FUlUs.s | 5 - .../setTexNo__12J2DTevBlock4FUlUs.s | 5 - .../setTexNo__12J2DTevBlock8FUlUs.s | 5 - .../setTexNo__13J2DTevBlock16FUlUs.s | 5 - ...tTexture__12J2DTevBlock1FUlP10JUTTexture.s | 39 - .../setTexture__12J2DTevBlock1FUlPC7ResTIMG.s | 112 - ...tTexture__12J2DTevBlock2FUlP10JUTTexture.s | 48 - ...tTexture__12J2DTevBlock4FUlP10JUTTexture.s | 48 - ...tTexture__12J2DTevBlock8FUlP10JUTTexture.s | 48 - ...Texture__13J2DTevBlock16FUlP10JUTTexture.s | 48 - .../setUndeleteFlag__12J2DTevBlock1FUc.s | 5 - .../setUndeleteFlag__12J2DTevBlock2FUc.s | 5 - .../setUndeleteFlag__12J2DTevBlock4FUc.s | 5 - .../setUndeleteFlag__12J2DTevBlock8FUc.s | 5 - .../setUndeleteFlag__13J2DTevBlock16FUc.s | 5 - .../shiftDeleteFlag__12J2DTevBlock1FUcb.s | 5 - ...tPriority__9J2DScreenFPCcUlP10JKRArchive.s | 68 - ...eP20JSURandomInputStreamUlP11J2DMaterial.s | 290 - .../J2DTextBox/__dt__10J2DTextBoxFv.s | 41 - .../drawSelf__10J2DTextBoxFffPA3_A4_f.s | 113 - .../J2DTextBox/draw__10J2DTextBoxFff.s | 114 - ...aw__10J2DTextBoxFfff18J2DTextBoxHBinding.s | 122 - ...18J2DTextBoxHBinding18J2DTextBoxVBinding.s | 148 - .../isUsed__10J2DTextBoxFPC7ResFONT.s | 30 - ...PaneP20JSURandomInputStreamP10JKRArchive.s | 223 - .../J2DTextBox/resize__10J2DTextBoxFff.s | 68 - .../setConnectParent__10J2DTextBoxFb.s | 34 - .../J2DTextBox/setString__10J2DTextBoxFPCce.s | 63 - .../setString__10J2DTextBoxFsPCce.s | 79 - ...eP20JSURandomInputStreamUlP11J2DMaterial.s | 212 - .../J2DTextBoxEx/__dt__12J2DTextBoxExFv.s | 39 - .../drawSelf__12J2DTextBoxExFffPA3_A4_f.s | 201 - .../J2DTextBoxEx/draw__12J2DTextBoxExFff.s | 158 - ...__12J2DTextBoxExFfff18J2DTextBoxHBinding.s | 168 - .../J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s | 22 - .../isUsed__12J2DTextBoxExFPC7ResFONT.s | 38 - .../isUsed__12J2DTextBoxExFPC7ResTIMG.s | 9 - .../rewriteAlpha__12J2DTextBoxExFv.s | 7 - .../setAlpha__12J2DTextBoxExFUc.s | 9 - ...tAnimation__12J2DTextBoxExFP10J2DAnmBase.s | 9 - ...Animation__12J2DTextBoxExFP11J2DAnmColor.s | 13 - ...ation__12J2DTextBoxExFP15J2DAnmTevRegKey.s | 13 - ...tion__12J2DTextBoxExFP16J2DAnmTexPattern.s | 13 - ...n__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s | 13 - ...Black__12J2DTextBoxExFQ28JUtility6TColor.s | 37 - ...etCullBack__12J2DTextBoxExF11_GXCullMode.s | 15 - .../setFont__12J2DTextBoxExFP7JUTFont.s | 27 - .../setTevStage__12J2DTextBoxExFb.s | 44 - ...White__12J2DTextBoxExFQ28JUtility6TColor.s | 37 - ...etAnimationFrameMax__Q26JStage6TActorCFv.s | 3 - ...SGGetAnimationFrame__Q26JStage6TActorCFv.s | 3 - ...AnimationTransition__Q26JStage6TActorCFv.s | 3 - ...reAnimationFrameMax__Q26JStage6TActorCFv.s | 3 - ...xtureAnimationFrame__Q26JStage6TActorCFv.s | 3 - .../JSGActor/__dt__Q26JStage6TActorFv.s | 26 - ...JSGGetColor__Q26JStage13TAmbientLightCFv.s | 6 - .../__dt__Q26JStage13TAmbientLightFv.s | 26 - ...etProjectionAspect__Q26JStage7TCameraCFv.s | 3 - ...SGGetProjectionFar__Q26JStage7TCameraCFv.s | 4 - ...GGetProjectionFovy__Q26JStage7TCameraCFv.s | 3 - ...GGetProjectionNear__Q26JStage7TCameraCFv.s | 3 - .../JSGGetViewRoll__Q26JStage7TCameraCFv.s | 3 - .../JSGCamera/__dt__Q26JStage7TCameraFv.s | 26 - .../JSGFog/JSGGetColor__Q26JStage4TFogCFv.s | 6 - .../JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s | 4 - .../JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s | 3 - .../JStage/JSGFog/__dt__Q26JStage4TFogFv.s | 26 - .../JSGGetColor__Q26JStage6TLightCFv.s | 6 - .../JSGLight/__dt__Q26JStage6TLightFv.s | 26 - ...ansformation__Q26JStage7TObjectCFUlPA4_f.s | 16 - .../JSGObject/__dt__Q26JStage7TObjectFv.s | 20 - .../JSGSystem/__dt__Q26JStage7TSystemFv.s | 26 - ...JUTConsoleCFQ210JUTConsole12EConsoleType.s | 365 - .../checkLv4BossRoom__9daAlink_cFv.s | 12 - .../checkSpinnerPathMove__9daAlink_cFv.s | 28 - .../getDirectionFromAngle__9daAlink_cFs.s | 31 - .../getSpinnerGravity__9daAlink_cCFv.s | 5 - .../getSpinnerJumpRate__9daAlink_cCFv.s | 5 - .../getSpinnerMaxFallSpeed__9daAlink_cCFv.s | 5 - ...getSpinnerRideDecSpeedMax__9daAlink_cCFv.s | 5 - ...getSpinnerRideDecSpeedMin__9daAlink_cCFv.s | 5 - ...etSpinnerRideDecSpeedRate__9daAlink_cCFv.s | 5 - .../getSpinnerRideMoveTime__9daAlink_cFv.s | 20 - ...getSpinnerRideRotAngleMax__9daAlink_cCFv.s | 5 - ...getSpinnerRideRotAngleMin__9daAlink_cCFv.s | 5 - .../getSpinnerRideSpeedF__9daAlink_cFv.s | 20 - .../a/d_a_alink/loadModelDVD__9daAlink_cFv.s | 111 - .../loadShieldModelDVD__9daAlink_cFv.s | 55 - .../onSpinnerPathForceRemove__9daAlink_cFv.s | 23 - .../procSpinnerReady__9daAlink_cFv.s | 44 - .../resetStatusWindow__9daAlink_cFv.s | 53 - asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s | 31 - .../setClothesChange__9daAlink_cFi.s | 12 - ...riginalHeap__9daAlink_cFPP10JKRExpHeapUl.s | 26 - .../setShieldArcName__9daAlink_cFv.s | 22 - .../d_a_alink/setShieldChange__9daAlink_cFv.s | 4 - .../d_a_alink/setShieldModel__9daAlink_cFv.s | 32 - .../a/d_a_alink/setSmellSave__9daAlink_cFv.s | 73 - .../setSpinnerStatus__9daAlink_cFUcUc.s | 6 - .../setSpinnerSyncPos__9daAlink_cFv.s | 40 - .../statusWindowDraw__9daAlink_cFv.s | 87 - ...statusWindowExecute__9daAlink_cFPC4cXyzs.s | 68 - ...iPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s | 47 - .../GroundCross__4cBgSFP11cBgS_GndChk.s | 57 - .../d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s | 62 - asm/d/bg/d_bg_s/Move__4dBgSFv.s | 27 - .../bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s | 76 - .../Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s | 49 - asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s | 42 - .../d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s | 53 - .../d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s | 30 - .../d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s | 64 - .../SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s | 77 - .../WallCorrectSort__4dBgSFP9dBgS_Acch.s | 79 - .../d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s | 79 - asm/d/d_attention/__sinit_d_attention_cpp.s | 16 - ...PPQ26JStage7TObjectPCcQ26JStage8TEObject.s | 96 - asm/d/d_demo/__ct__14dDemo_object_cFv.s | 8 - asm/d/d_demo/__dt__14dDemo_object_cFv.s | 22 - ...endActor__14dDemo_object_cFP10fopAc_ac_c.s | 57 - .../d_demo/appendLight__14dDemo_object_cFv.s | 45 - asm/d/d_demo/branchFile__FPCc.s | 18 - asm/d/d_demo/branch__7dDemo_cFv.s | 23 - .../createAmbient__14dDemo_object_cFv.s | 35 - .../d_demo/createCamera__14dDemo_object_cFv.s | 35 - asm/d/d_demo/createFog__14dDemo_object_cFv.s | 35 - asm/d/d_demo/end__7dDemo_cFv.s | 22 - .../getActiveCamera__14dDemo_object_cFv.s | 6 - asm/d/d_demo/getActor__14dDemo_object_cFUc.s | 12 - asm/d/d_demo/remove__14dDemo_object_cFv.s | 87 - asm/d/d_demo/reset__7dDemo_cFv.s | 7 - asm/d/d_demo/setBranchId__7dDemo_cFUss.s | 7 - asm/d/d_demo/setBranchType__7dDemo_cFUs.s | 5 - asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s | 105 - asm/d/d_demo/update__7dDemo_cFv.s | 89 - asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s | 20 - asm/d/d_drawlist/__sinit_d_drawlist_cpp.s | 11 - asm/d/d_drawlist/calcWipe__12dDlst_list_cFv.s | 4 +- .../newData__13dDlst_peekZ_cFssPUl.s | 29 - .../d_drawlist/peekData__13dDlst_peekZ_cFv.s | 31 - ...t_base_cRPP12dDlst_base_cP12dDlst_base_c.s | 14 - .../wipeIn__12dDlst_list_cFfR8_GXColor.s | 2 +- .../setPos__15dKantera_icon_cFff.s | 22 - .../setScale__15dKantera_icon_cFff.s | 21 - ...reate__Q28dMpath_n18dTexObjAggregate_cFv.s | 40 - .../d_map_path/drawPath__11dDrawPath_cFv.s | 32 - ...etDecoLineColor__18dRenderingFDAmap_cFii.s | 12 - ...orationLineWidth__18dRenderingFDAmap_cFi.s | 12 - ...15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s | 30 - ...postRenderingMap__18dRenderingFDAmap_cFv.s | 41 - ...emove__Q28dMpath_n18dTexObjAggregate_cFv.s | 24 - .../renderingMap__15dRenderingMap_cFv.s | 53 - ...DrawPath_cFPCQ211dDrawPath_c10line_class.s | 64 - ...DrawPath_cFPCQ211dDrawPath_c10poly_class.s | 51 - ...DrawPath_cFPCQ211dDrawPath_c10room_class.s | 45 - ...rawPath_cFPCQ211dDrawPath_c11floor_class.s | 30 - ...rawPath_cFPCQ211dDrawPath_c11group_class.s | 53 - ...sityTextureToCI__18dRenderingFDAmap_cCFv.s | 92 - ...tureDirectColor__18dRenderingFDAmap_cCFv.s | 51 - .../gx/GXDisplayList/GXCallDisplayList.s | 31 - include/JSystem/J2DGraph/J2DAnmLoader.h | 3 +- include/JSystem/J2DGraph/J2DMatBlock.h | 194 +- include/JSystem/J2DGraph/J2DMaterial.h | 6 +- include/JSystem/J2DGraph/J2DPane.h | 132 +- include/JSystem/J2DGraph/J2DPicture.h | 16 +- include/JSystem/J2DGraph/J2DPrint.h | 18 + include/JSystem/J2DGraph/J2DTevs.h | 60 +- include/JSystem/J2DGraph/J2DTextBox.h | 54 +- include/JSystem/J2DGraph/J2DTextBoxEx.h | 32 +- include/JSystem/J3DGraphBase/J3DDrawBuffer.h | 20 +- include/JSystem/JAudio2/JAISoundStarter.h | 8 + include/JSystem/JGadget/binary.h | 6 +- include/JSystem/JGadget/linklist.h | 6 +- include/JSystem/JKernel/JKRExpHeap.h | 82 +- include/JSystem/JKernel/JKRHeap.h | 12 +- include/JSystem/JMessage/control.h | 6 +- include/JSystem/JMessage/data.h | 6 +- include/JSystem/JMessage/locale.h | 6 +- include/JSystem/JMessage/processor.h | 6 +- include/JSystem/JMessage/resource.h | 6 +- include/JSystem/JStage/JSGActor.h | 28 + include/JSystem/JStage/JSGAmbientLight.h | 12 +- include/JSystem/JStage/JSGCamera.h | 35 +- include/JSystem/JStage/JSGFog.h | 18 +- include/JSystem/JStage/JSGLight.h | 24 +- include/JSystem/JStage/JSGObject.h | 19 + include/JSystem/JStage/JSGSystem.h | 23 + include/JSystem/JStudio/JStudio/ctb.h | 60 + include/JSystem/JStudio/JStudio/fvb-data.h | 2 +- include/JSystem/JStudio/JStudio/fvb.h | 9 +- .../JSystem/JStudio/JStudio/jstudio-control.h | 92 +- .../JSystem/JStudio/JStudio/jstudio-data.h | 6 + .../JSystem/JStudio/JStudio/jstudio-math.h | 9 + .../JSystem/JStudio/JStudio/jstudio-object.h | 233 +- include/JSystem/JStudio/JStudio/object-id.h | 4 +- include/JSystem/JStudio/JStudio/stb-data.h | 4 +- include/JSystem/JStudio/JStudio/stb.h | 8 +- .../JSystem/JStudio/JStudio_JAudio2/control.h | 81 +- .../JStudio/JStudio_JParticle/control.h | 69 +- .../JStudio_JParticle/object-particle.h | 2 +- .../JSystem/JStudio/JStudio_JStage/control.h | 176 +- .../JStudio/JStudio_JStage/object-actor.h | 2 +- .../JStudio_JStage/object-ambientlight.h | 2 +- .../JStudio/JStudio_JStage/object-camera.h | 2 +- .../JStudio/JStudio_JStage/object-fog.h | 2 +- .../JStudio/JStudio_JStage/object-light.h | 2 +- .../JSystem/JStudio/JStudio_JStage/object.h | 2 +- include/JSystem/JSupport/JSUInputStream.h | 18 + include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTFont.h | 2 +- include/JSystem/JUtility/JUTPalette.h | 5 + include/JSystem/JUtility/JUTResFont.h | 2 +- include/JSystem/JUtility/JUTTexture.h | 29 +- include/MSL_C/math.h | 4 + include/SSystem/SComponent/c_bg_s_gnd_chk.h | 3 + include/SSystem/SComponent/c_bg_s_poly_info.h | 2 +- include/SSystem/SComponent/c_bg_w.h | 2 + include/SSystem/SComponent/c_cc_d.h | 22 + include/Z2AudioLib/Z2SoundStarter.h | 5 +- include/d/a/d_a_alink.h | 1403 +- include/d/a/d_a_player.h | 5 +- include/d/bg/d_bg_s.h | 14 +- include/d/bg/d_bg_s_acch.h | 1 + include/d/bg/d_bg_s_roof_chk.h | 1 + include/d/bg/d_bg_s_sph_chk.h | 2 - include/d/bg/d_bg_s_spl_grp_chk.h | 2 + include/d/bg/d_bg_w.h | 38 +- include/d/bg/d_bg_w_base.h | 26 +- include/d/bg/d_bg_w_kcol.h | 24 +- include/d/cc/d_cc_mass_s.h | 21 +- include/d/cc/d_cc_uty.h | 9 + include/d/com/d_com_inf_game.h | 2 +- include/d/d_attention.h | 123 +- include/d/d_demo.h | 298 +- include/d/d_drawlist.h | 190 +- include/d/d_stage.h | 33 +- include/d/d_vibration.h | 68 +- include/d/event/d_event.h | 81 +- include/d/event/d_event_data.h | 18 +- include/d/event/d_event_manager.h | 80 +- include/d/map/d_map_path.h | 76 +- include/d/map/d_map_path_dmap.h | 10 +- include/d/menu/d_menu_window.h | 10 +- include/d/meter/d_meter2_draw.h | 132 + include/d/meter/d_meter2_info.h | 4 + include/d/meter/d_meter_map.h | 8 +- include/d/msg/d_msg_object.h | 6 +- include/dolphin/gx/GX.h | 942 +- include/dolphin/gx/GXDisplayList.h | 4 +- include/dolphin/gx/GXEnum.h | 779 + include/dolphin/gx/GXStruct.h | 89 + include/dolphin/os/OS.h | 273 +- include/dolphin/os/OSAlarm.h | 36 + include/dolphin/os/OSAlloc.h | 16 + include/dolphin/os/OSArena.h | 14 + include/dolphin/os/OSAudioSystem.h | 11 + include/dolphin/os/OSCache.h | 30 +- include/dolphin/os/OSContext.h | 41 + include/dolphin/os/OSError.h | 67 +- include/dolphin/os/OSExec.h | 17 + include/dolphin/os/OSFont.h | 12 + include/dolphin/os/OSInterrupt.h | 25 + include/dolphin/os/OSLink.h | 29 +- include/dolphin/os/OSMemory.h | 17 + include/dolphin/os/OSMessage.h | 25 + include/dolphin/os/OSMutex.h | 21 + include/dolphin/os/OSReboot.h | 12 + include/dolphin/os/OSReset.h | 25 + include/dolphin/os/OSResetSW.h | 12 + include/dolphin/os/OSRtc.h | 31 + include/dolphin/os/OSSync.h | 11 + include/dolphin/os/OSThread.h | 102 + include/dolphin/os/OSTime.h | 31 + include/f_op/f_op_actor.h | 6 +- include/f_op/f_op_actor_mng.h | 41 +- include/m_Do/m_Do_ext.h | 2 + include/m_Do/m_Do_lib.h | 3 + include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h | 186 +- .../d/a/d_a_movie_player/d_a_movie_player.h | 32 + include/rel/d/a/d_a_spinner/d_a_spinner.h | 96 + .../rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h | 30 +- .../rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h | 23 +- .../J2DGraph/J2DAnmLoader_nonmatching.cpp | 574 +- libs/JSystem/J2DGraph/J2DGrafContext.cpp | 6 +- libs/JSystem/J2DGraph/J2DManage.cpp | 10 +- libs/JSystem/J2DGraph/J2DMatBlock.cpp | 2996 ++- libs/JSystem/J2DGraph/J2DMaterial.cpp | 8 +- libs/JSystem/J2DGraph/J2DPane.cpp | 477 +- libs/JSystem/J2DGraph/J2DPicture.cpp | 154 +- libs/JSystem/J2DGraph/J2DScreen.cpp | 231 +- libs/JSystem/J2DGraph/J2DTextBox.cpp | 667 +- libs/JSystem/J2DGraph/J2DTextBoxEx.cpp | 604 +- libs/JSystem/J3DGraphBase/J3DSys.cpp | 4 +- libs/JSystem/JAudio2/JAISoundStarter.cpp | 21 - libs/JSystem/JAudio2/JASTaskThread.cpp | 3 - libs/JSystem/JFramework/JFWDisplay.cpp | 4 +- libs/JSystem/JKernel/JKRAramArchive.cpp | 6 +- libs/JSystem/JKernel/JKRAramStream.cpp | 2 +- libs/JSystem/JKernel/JKRDvdArchive.cpp | 2 +- libs/JSystem/JKernel/JKRExpHeap.cpp | 4 +- libs/JSystem/JKernel/JKRHeap.cpp | 18 +- libs/JSystem/JKernel/JKRMemArchive.cpp | 1 - libs/JSystem/JKernel/JKRThread.cpp | 2 +- libs/JSystem/JParticle/JPABaseShape.cpp | 2 +- libs/JSystem/JStage/JSGActor.cpp | 256 +- libs/JSystem/JStage/JSGAmbientLight.cpp | 122 +- libs/JSystem/JStage/JSGCamera.cpp | 280 +- libs/JSystem/JStage/JSGFog.cpp | 179 +- libs/JSystem/JStage/JSGLight.cpp | 197 +- libs/JSystem/JStage/JSGObject.cpp | 144 +- libs/JSystem/JStage/JSGSystem.cpp | 127 +- libs/JSystem/JStudio/JStudio/ctb-data.cpp | 41 +- libs/JSystem/JStudio/JStudio/ctb.cpp | 88 +- libs/JSystem/JStudio/JStudio/fvb-data.cpp | 11 +- .../JStudio/JStudio/jstudio-control.cpp | 76 +- libs/JSystem/JStudio/JStudio/jstudio-data.cpp | 8 +- libs/JSystem/JStudio/JStudio/jstudio-math.cpp | 25 +- .../JStudio/JStudio/jstudio-object.cpp | 233 +- libs/JSystem/JStudio/JStudio/object-id.cpp | 8 - libs/JSystem/JStudio/JStudio/stb-data.cpp | 13 +- libs/JSystem/JStudio/JStudio/stb.cpp | 2 +- .../JStudio/JStudio_JAudio2/control.cpp | 41 - .../JStudio/JStudio_JAudio2/object-sound.cpp | 128 +- .../JStudio/JStudio_JParticle/control.cpp | 57 - .../JStudio_JParticle/object-particle.cpp | 96 - .../JStudio/JStudio_JStage/control.cpp | 97 - .../JStudio/JStudio_JStage/object-actor.cpp | 126 +- .../JStudio_JStage/object-ambientlight.cpp | 46 - .../JStudio/JStudio_JStage/object-camera.cpp | 104 +- .../JStudio/JStudio_JStage/object-fog.cpp | 66 +- .../JStudio/JStudio_JStage/object-light.cpp | 78 - .../JSystem/JStudio/JStudio_JStage/object.cpp | 53 - libs/JSystem/JUtility/JUTCacheFont.cpp | 2 +- libs/JSystem/JUtility/JUTConsole.cpp | 98 +- libs/JSystem/JUtility/JUTException.cpp | 19 +- libs/JSystem/JUtility/JUTGamePad.cpp | 1 - libs/SSystem/SComponent/c_bg_s_poly_info.cpp | 32 +- libs/SSystem/SComponent/c_cc_d.cpp | 265 +- libs/SSystem/SComponent/c_cc_s.cpp | 2 +- libs/dolphin/gx/GXDisplayList.cpp | 37 +- libs/dolphin/gx/GXFifo.cpp | 152 +- libs/dolphin/gx/GXInit.cpp | 178 +- libs/dolphin/gx/Makefile | 3 +- libs/dolphin/os/Makefile | 3 +- libs/dolphin/os/OS.cpp | 508 +- libs/dolphin/os/OSAlarm.cpp | 34 +- libs/dolphin/os/OSAlloc.cpp | 24 +- libs/dolphin/os/OSArena.cpp | 36 +- libs/dolphin/os/OSAudioSystem.cpp | 11 +- libs/dolphin/os/OSCache.cpp | 57 +- libs/dolphin/os/OSContext.cpp | 53 +- libs/dolphin/os/OSError.cpp | 10 +- libs/dolphin/os/OSExec.cpp | 29 +- libs/dolphin/os/OSFont.cpp | 18 +- libs/dolphin/os/OSInterrupt.cpp | 41 +- libs/dolphin/os/OSLink.cpp | 32 +- libs/dolphin/os/OSMemory.cpp | 31 +- libs/dolphin/os/OSMessage.cpp | 20 +- libs/dolphin/os/OSMutex.cpp | 46 +- libs/dolphin/os/OSReboot.cpp | 14 +- libs/dolphin/os/OSReset.cpp | 26 +- libs/dolphin/os/OSResetSW.cpp | 14 +- libs/dolphin/os/OSRtc.cpp | 56 +- libs/dolphin/os/OSSync.cpp | 15 +- libs/dolphin/os/OSThread.cpp | 100 +- libs/dolphin/os/OSTime.cpp | 23 +- rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp | 2 +- rel/d/a/d_a_movie_player/d_a_movie_player.cpp | 103 +- rel/d/a/d_a_spinner/d_a_spinner.cpp | 2 +- rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp | 26 - rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp | 31 - src/DynamicLink.cpp | 6 +- src/d/a/d_a_alink.cpp | 19526 +--------------- src/d/a/d_a_alink_HIO.inc | 39 + src/d/a/d_a_alink_HIO_data.inc | 1593 ++ src/d/a/d_a_alink_bomb.inc | 69 + src/d/a/d_a_alink_boom.inc | 316 + src/d/a/d_a_alink_bottle.inc | 163 + src/d/a/d_a_alink_bow.inc | 314 + src/d/a/d_a_alink_canoe.inc | 747 + src/d/a/d_a_alink_copyrod.inc | 339 + src/d/a/d_a_alink_crawl.inc | 238 + src/d/a/d_a_alink_cut.inc | 985 + src/d/a/d_a_alink_damage.inc | 559 + src/d/a/d_a_alink_demo.inc | 1476 ++ src/d/a/d_a_alink_effect.inc | 776 + src/d/a/d_a_alink_grab.inc | 920 + src/d/a/d_a_alink_guard.inc | 282 + src/d/a/d_a_alink_hang.inc | 1001 + src/d/a/d_a_alink_hook.inc | 669 + src/d/a/d_a_alink_horse.inc | 1058 + src/d/a/d_a_alink_hvyboots.inc | 157 + src/d/a/d_a_alink_iceleaf.inc | 278 + src/d/a/d_a_alink_ironball.inc | 298 + src/d/a/d_a_alink_kandelaar.inc | 236 + src/d/a/d_a_alink_link.inc | 2570 ++ src/d/a/d_a_alink_spinner.inc | 357 + src/d/a/d_a_alink_sumou.inc | 170 + src/d/a/d_a_alink_swim.inc | 422 + src/d/a/d_a_alink_swindow.inc | 100 + src/d/a/d_a_alink_whistle.inc | 154 + src/d/a/d_a_alink_wolf.inc | 2647 +++ src/d/a/d_a_obj_item.cpp | 2 +- src/d/bg/d_bg_s.cpp | 445 +- src/d/bg/d_bg_w.cpp | 22 +- src/d/bg/d_bg_w_kcol.cpp | 24 +- src/d/bg/d_bg_w_sv.cpp | 18 +- src/d/cc/d_cc_d_nonmatching.cpp | 146 +- src/d/cc/d_cc_mass_s.cpp | 89 +- src/d/cc/d_cc_uty.cpp | 306 +- src/d/d_attention.cpp | 32 +- src/d/d_demo.cpp | 849 +- src/d/d_drawlist.cpp | 303 +- src/d/d_gameover.cpp | 17 +- src/d/d_kantera_icon_meter.cpp | 63 +- src/d/event/d_event.cpp | 259 +- src/d/event/d_event_data.cpp | 108 +- src/d/event/d_event_manager.cpp | 209 +- src/d/file/d_file_sel_warning.cpp | 2 +- src/d/map/d_map_path.cpp | 347 +- src/d/map/d_map_path_dmap.cpp | 21 +- src/d/meter/d_meter2_draw.cpp | 48 +- src/d/s/d_s_logo.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 36 +- src/m_Do/m_Do_DVDError.cpp | 2 +- src/m_Do/m_Do_dvd_thread.cpp | 1 - src/m_Do/m_Do_graphic.cpp | 8 +- src/m_Do/m_Do_lib.cpp | 2 +- src/m_Do/m_Do_printf.cpp | 26 +- 613 files changed, 30182 insertions(+), 40087 deletions(-) delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock1Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock2Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock4Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock8Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__ct__13J2DTevBlock16Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock1Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock2Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock4Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock8Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__13J2DTevBlock16Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__14J2DTexGenBlockFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/__dt__15J2DIndBlockFullFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock1Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock2Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock4Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock8Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__13J2DTevBlock16Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/getType__15J2DIndBlockFullFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock1F11_GXTexMapIDUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock2F11_GXTexMapIDUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock4F11_GXTexMapIDUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock8F11_GXTexMapIDUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__13J2DTevBlock16F11_GXTexMapIDUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock1Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock2Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock4Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock8Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__13J2DTevBlock16Fv.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock1FUl13J2DGXColorS10.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock2FUl13J2DGXColorS10.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock4FUl13J2DGXColorS10.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock8FUl13J2DGXColorS10.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__13J2DTevBlock16FUl13J2DGXColorS10.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock1FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock2FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock4FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock8FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__13J2DTevBlock16FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock1FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock2FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock4FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock8FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__13J2DTevBlock16FUlUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock1FUl11J2DTevOrder.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock2FUl11J2DTevOrder.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock4FUl11J2DTevOrder.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock8FUl11J2DTevOrder.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__13J2DTevBlock16FUl11J2DTevOrder.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock1FUl11J2DTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock2FUl11J2DTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock4FUl11J2DTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock8FUl11J2DTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__13J2DTevBlock16FUl11J2DTevStage.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock1FUlUs.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock2FUlUs.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock4FUlUs.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock8FUlUs.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__13J2DTevBlock16FUlUs.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock1FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock2FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock4FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock8FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__13J2DTevBlock16FUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock1FUcb.s delete mode 100644 asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFffPA3_A4_f.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFff.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFfff18J2DTextBoxHBinding.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/resize__10J2DTextBoxFff.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/__dt__12J2DTextBoxExFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/drawSelf__12J2DTextBoxExFffPA3_A4_f.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFff.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFfff18J2DTextBoxHBinding.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResFONT.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResTIMG.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/rewriteAlpha__12J2DTextBoxExFv.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAlpha__12J2DTextBoxExFUc.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP10J2DAnmBase.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP11J2DAnmColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setBlack__12J2DTextBoxExFQ28JUtility6TColor.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setCullBack__12J2DTextBoxExF11_GXCullMode.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setFont__12J2DTextBoxExFP7JUTFont.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setTevStage__12J2DTextBoxExFb.s delete mode 100644 asm/JSystem/J2DGraph/J2DTextBoxEx/setWhite__12J2DTextBoxExFQ28JUtility6TColor.s delete mode 100644 asm/JSystem/JStage/JSGActor/JSGGetAnimationFrameMax__Q26JStage6TActorCFv.s delete mode 100644 asm/JSystem/JStage/JSGActor/JSGGetAnimationFrame__Q26JStage6TActorCFv.s delete mode 100644 asm/JSystem/JStage/JSGActor/JSGGetAnimationTransition__Q26JStage6TActorCFv.s delete mode 100644 asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv.s delete mode 100644 asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrame__Q26JStage6TActorCFv.s delete mode 100644 asm/JSystem/JStage/JSGActor/__dt__Q26JStage6TActorFv.s delete mode 100644 asm/JSystem/JStage/JSGAmbientLight/JSGGetColor__Q26JStage13TAmbientLightCFv.s delete mode 100644 asm/JSystem/JStage/JSGAmbientLight/__dt__Q26JStage13TAmbientLightFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/JSGGetProjectionAspect__Q26JStage7TCameraCFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/JSGGetProjectionFar__Q26JStage7TCameraCFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/JSGGetProjectionFovy__Q26JStage7TCameraCFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/JSGGetProjectionNear__Q26JStage7TCameraCFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/JSGGetViewRoll__Q26JStage7TCameraCFv.s delete mode 100644 asm/JSystem/JStage/JSGCamera/__dt__Q26JStage7TCameraFv.s delete mode 100644 asm/JSystem/JStage/JSGFog/JSGGetColor__Q26JStage4TFogCFv.s delete mode 100644 asm/JSystem/JStage/JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s delete mode 100644 asm/JSystem/JStage/JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s delete mode 100644 asm/JSystem/JStage/JSGFog/__dt__Q26JStage4TFogFv.s delete mode 100644 asm/JSystem/JStage/JSGLight/JSGGetColor__Q26JStage6TLightCFv.s delete mode 100644 asm/JSystem/JStage/JSGLight/__dt__Q26JStage6TLightFv.s delete mode 100644 asm/JSystem/JStage/JSGObject/JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f.s delete mode 100644 asm/JSystem/JStage/JSGObject/__dt__Q26JStage7TObjectFv.s delete mode 100644 asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s delete mode 100644 asm/JSystem/JUtility/JUTConsole/doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType.s delete mode 100644 asm/d/a/d_a_alink/checkLv4BossRoom__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getDirectionFromAngle__9daAlink_cFs.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerGravity__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerJumpRate__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerMaxFallSpeed__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideDecSpeedMax__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideDecSpeedMin__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideDecSpeedRate__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideMoveTime__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideRotAngleMax__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideRotAngleMin__9daAlink_cCFv.s delete mode 100644 asm/d/a/d_a_alink/getSpinnerRideSpeedF__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/loadModelDVD__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/loadShieldModelDVD__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/onSpinnerPathForceRemove__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/procSpinnerReady__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/resetStatusWindow__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setClothesChange__9daAlink_cFi.s delete mode 100644 asm/d/a/d_a_alink/setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl.s delete mode 100644 asm/d/a/d_a_alink/setShieldArcName__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setShieldChange__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setShieldModel__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setSmellSave__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/setSpinnerStatus__9daAlink_cFUcUc.s delete mode 100644 asm/d/a/d_a_alink/setSpinnerSyncPos__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/statusWindowDraw__9daAlink_cFv.s delete mode 100644 asm/d/a/d_a_alink/statusWindowExecute__9daAlink_cFPC4cXyzs.s delete mode 100644 asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s delete mode 100644 asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s delete mode 100644 asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s delete mode 100644 asm/d/bg/d_bg_s/Move__4dBgSFv.s delete mode 100644 asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s delete mode 100644 asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s delete mode 100644 asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s delete mode 100644 asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s delete mode 100644 asm/d/bg/d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s delete mode 100644 asm/d/bg/d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s delete mode 100644 asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s delete mode 100644 asm/d/bg/d_bg_s/WallCorrectSort__4dBgSFP9dBgS_Acch.s delete mode 100644 asm/d/bg/d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s delete mode 100644 asm/d/d_attention/__sinit_d_attention_cpp.s delete mode 100644 asm/d/d_demo/JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject.s delete mode 100644 asm/d/d_demo/__ct__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/__dt__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/appendActor__14dDemo_object_cFP10fopAc_ac_c.s delete mode 100644 asm/d/d_demo/appendLight__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/branchFile__FPCc.s delete mode 100644 asm/d/d_demo/branch__7dDemo_cFv.s delete mode 100644 asm/d/d_demo/createAmbient__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/createCamera__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/createFog__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/end__7dDemo_cFv.s delete mode 100644 asm/d/d_demo/getActiveCamera__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/getActor__14dDemo_object_cFUc.s delete mode 100644 asm/d/d_demo/remove__14dDemo_object_cFv.s delete mode 100644 asm/d/d_demo/reset__7dDemo_cFv.s delete mode 100644 asm/d/d_demo/setBranchId__7dDemo_cFUss.s delete mode 100644 asm/d/d_demo/setBranchType__7dDemo_cFUs.s delete mode 100644 asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s delete mode 100644 asm/d/d_demo/update__7dDemo_cFv.s delete mode 100644 asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s delete mode 100644 asm/d/d_drawlist/__sinit_d_drawlist_cpp.s delete mode 100644 asm/d/d_drawlist/newData__13dDlst_peekZ_cFssPUl.s delete mode 100644 asm/d/d_drawlist/peekData__13dDlst_peekZ_cFv.s delete mode 100644 asm/d/d_drawlist/set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c.s delete mode 100644 asm/d/d_kantera_icon_meter/setPos__15dKantera_icon_cFff.s delete mode 100644 asm/d/d_kantera_icon_meter/setScale__15dKantera_icon_cFff.s delete mode 100644 asm/d/map/d_map_path/create__Q28dMpath_n18dTexObjAggregate_cFv.s delete mode 100644 asm/d/map/d_map_path/drawPath__11dDrawPath_cFv.s delete mode 100644 asm/d/map/d_map_path/getDecoLineColor__18dRenderingFDAmap_cFii.s delete mode 100644 asm/d/map/d_map_path/getDecorationLineWidth__18dRenderingFDAmap_cFi.s delete mode 100644 asm/d/map/d_map_path/makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s delete mode 100644 asm/d/map/d_map_path/postRenderingMap__18dRenderingFDAmap_cFv.s delete mode 100644 asm/d/map/d_map_path/remove__Q28dMpath_n18dTexObjAggregate_cFv.s delete mode 100644 asm/d/map/d_map_path/renderingMap__15dRenderingMap_cFv.s delete mode 100644 asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class.s delete mode 100644 asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class.s delete mode 100644 asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class.s delete mode 100644 asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class.s delete mode 100644 asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class.s delete mode 100644 asm/d/map/d_map_path/setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv.s delete mode 100644 asm/d/map/d_map_path/setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv.s delete mode 100644 asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s create mode 100644 include/dolphin/gx/GXEnum.h create mode 100644 include/dolphin/gx/GXStruct.h create mode 100644 src/d/a/d_a_alink_HIO.inc create mode 100644 src/d/a/d_a_alink_HIO_data.inc create mode 100644 src/d/a/d_a_alink_bomb.inc create mode 100644 src/d/a/d_a_alink_boom.inc create mode 100644 src/d/a/d_a_alink_bottle.inc create mode 100644 src/d/a/d_a_alink_bow.inc create mode 100644 src/d/a/d_a_alink_canoe.inc create mode 100644 src/d/a/d_a_alink_copyrod.inc create mode 100644 src/d/a/d_a_alink_crawl.inc create mode 100644 src/d/a/d_a_alink_cut.inc create mode 100644 src/d/a/d_a_alink_damage.inc create mode 100644 src/d/a/d_a_alink_demo.inc create mode 100644 src/d/a/d_a_alink_effect.inc create mode 100644 src/d/a/d_a_alink_grab.inc create mode 100644 src/d/a/d_a_alink_guard.inc create mode 100644 src/d/a/d_a_alink_hang.inc create mode 100644 src/d/a/d_a_alink_hook.inc create mode 100644 src/d/a/d_a_alink_horse.inc create mode 100644 src/d/a/d_a_alink_hvyboots.inc create mode 100644 src/d/a/d_a_alink_iceleaf.inc create mode 100644 src/d/a/d_a_alink_ironball.inc create mode 100644 src/d/a/d_a_alink_kandelaar.inc create mode 100644 src/d/a/d_a_alink_link.inc create mode 100644 src/d/a/d_a_alink_spinner.inc create mode 100644 src/d/a/d_a_alink_sumou.inc create mode 100644 src/d/a/d_a_alink_swim.inc create mode 100644 src/d/a/d_a_alink_swindow.inc create mode 100644 src/d/a/d_a_alink_whistle.inc create mode 100644 src/d/a/d_a_alink_wolf.inc diff --git a/Progress.md b/Progress.md index d63bf8a74a7..8b6a227cc81 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 91.849662% | 8700 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 14.988834% | 539080 | 3596544 +.text | 16.039620% | 576872 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 23.937193% | 962436 | 4020672 +Total | 24.877135% | 1000228 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 23.937193% | 962436 | 4020672 +main.dol | 24.877135% | 1000228 | 4020672 RELs | 33.183726% | 3816236 | 11500324 -Total | 30.788437% | 4778672 | 15520996 +Total | 31.031926% | 4816464 | 15520996 ## RELs diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock1Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock1Fv.s deleted file mode 100644 index 54b42a574a7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock1Fv.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802EB88C: -/* 802EB88C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EB890 7C 08 02 A6 */ mflr r0 -/* 802EB894 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EB898 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EB89C 7C 7F 1B 78 */ mr r31, r3 -/* 802EB8A0 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EB8A4 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EB8A8 90 1F 00 00 */ stw r0, 0(r31) -/* 802EB8AC 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock1@ha /* 0x803CCDB8@ha */ -/* 802EB8B0 38 03 CD B8 */ addi r0, r3, __vt__12J2DTevBlock1@l /* 0x803CCDB8@l */ -/* 802EB8B4 90 1F 00 00 */ stw r0, 0(r31) -/* 802EB8B8 38 7F 00 08 */ addi r3, r31, 8 -/* 802EB8BC 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha /* 0x802F1B70@ha */ -/* 802EB8C0 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 0x802F1B70@l */ -/* 802EB8C4 38 A0 00 00 */ li r5, 0 -/* 802EB8C8 38 C0 00 04 */ li r6, 4 -/* 802EB8CC 38 E0 00 01 */ li r7, 1 -/* 802EB8D0 48 07 64 91 */ bl __construct_array -/* 802EB8D4 38 7F 00 0C */ addi r3, r31, 0xc -/* 802EB8D8 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha /* 0x802F1B90@ha */ -/* 802EB8DC 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 0x802F1B90@l */ -/* 802EB8E0 38 A0 00 00 */ li r5, 0 -/* 802EB8E4 38 C0 00 08 */ li r6, 8 -/* 802EB8E8 38 E0 00 04 */ li r7, 4 -/* 802EB8EC 48 07 64 75 */ bl __construct_array -/* 802EB8F0 38 7F 00 2C */ addi r3, r31, 0x2c -/* 802EB8F4 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha /* 0x802F1940@ha */ -/* 802EB8F8 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 0x802F1940@l */ -/* 802EB8FC 38 A0 00 00 */ li r5, 0 -/* 802EB900 38 C0 00 08 */ li r6, 8 -/* 802EB904 38 E0 00 01 */ li r7, 1 -/* 802EB908 48 07 64 59 */ bl __construct_array -/* 802EB90C 38 7F 00 34 */ addi r3, r31, 0x34 -/* 802EB910 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 802EB914 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 802EB918 38 A0 00 00 */ li r5, 0 -/* 802EB91C 38 C0 00 04 */ li r6, 4 -/* 802EB920 38 E0 00 04 */ li r7, 4 -/* 802EB924 48 07 64 3D */ bl __construct_array -/* 802EB928 38 7F 00 46 */ addi r3, r31, 0x46 -/* 802EB92C 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha /* 0x802F1934@ha */ -/* 802EB930 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 0x802F1934@l */ -/* 802EB934 38 A0 00 00 */ li r5, 0 -/* 802EB938 38 C0 00 01 */ li r6, 1 -/* 802EB93C 38 E0 00 04 */ li r7, 4 -/* 802EB940 48 07 64 21 */ bl __construct_array -/* 802EB944 38 7F 00 4C */ addi r3, r31, 0x4c -/* 802EB948 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha /* 0x802F18A0@ha */ -/* 802EB94C 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 0x802F18A0@l */ -/* 802EB950 38 A0 00 00 */ li r5, 0 -/* 802EB954 38 C0 00 04 */ li r6, 4 -/* 802EB958 38 E0 00 01 */ li r7, 1 -/* 802EB95C 48 07 64 05 */ bl __construct_array -/* 802EB960 38 00 00 00 */ li r0, 0 -/* 802EB964 90 1F 00 50 */ stw r0, 0x50(r31) -/* 802EB968 98 1F 00 5C */ stb r0, 0x5c(r31) -/* 802EB96C 7F E3 FB 78 */ mr r3, r31 -/* 802EB970 81 9F 00 00 */ lwz r12, 0(r31) -/* 802EB974 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EB978 7D 89 03 A6 */ mtctr r12 -/* 802EB97C 4E 80 04 21 */ bctrl -/* 802EB980 7F E3 FB 78 */ mr r3, r31 -/* 802EB984 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EB988 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EB98C 7C 08 03 A6 */ mtlr r0 -/* 802EB990 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EB994 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock2Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock2Fv.s deleted file mode 100644 index 6bcb1b48baf..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock2Fv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_802EC5B8: -/* 802EC5B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC5BC 7C 08 02 A6 */ mflr r0 -/* 802EC5C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC5C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EC5C8 7C 7F 1B 78 */ mr r31, r3 -/* 802EC5CC 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EC5D0 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EC5D4 90 1F 00 00 */ stw r0, 0(r31) -/* 802EC5D8 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock2@ha /* 0x803CCCFC@ha */ -/* 802EC5DC 38 03 CC FC */ addi r0, r3, __vt__12J2DTevBlock2@l /* 0x803CCCFC@l */ -/* 802EC5E0 90 1F 00 00 */ stw r0, 0(r31) -/* 802EC5E4 38 7F 00 0A */ addi r3, r31, 0xa -/* 802EC5E8 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha /* 0x802F1B70@ha */ -/* 802EC5EC 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 0x802F1B70@l */ -/* 802EC5F0 38 A0 00 00 */ li r5, 0 -/* 802EC5F4 38 C0 00 04 */ li r6, 4 -/* 802EC5F8 38 E0 00 02 */ li r7, 2 -/* 802EC5FC 48 07 57 65 */ bl __construct_array -/* 802EC600 38 7F 00 12 */ addi r3, r31, 0x12 -/* 802EC604 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha /* 0x802F1B90@ha */ -/* 802EC608 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 0x802F1B90@l */ -/* 802EC60C 38 A0 00 00 */ li r5, 0 -/* 802EC610 38 C0 00 08 */ li r6, 8 -/* 802EC614 38 E0 00 04 */ li r7, 4 -/* 802EC618 48 07 57 49 */ bl __construct_array -/* 802EC61C 38 7F 00 33 */ addi r3, r31, 0x33 -/* 802EC620 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha /* 0x802F1940@ha */ -/* 802EC624 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 0x802F1940@l */ -/* 802EC628 38 A0 00 00 */ li r5, 0 -/* 802EC62C 38 C0 00 08 */ li r6, 8 -/* 802EC630 38 E0 00 02 */ li r7, 2 -/* 802EC634 48 07 57 2D */ bl __construct_array -/* 802EC638 38 7F 00 44 */ addi r3, r31, 0x44 -/* 802EC63C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 802EC640 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 802EC644 38 A0 00 00 */ li r5, 0 -/* 802EC648 38 C0 00 04 */ li r6, 4 -/* 802EC64C 38 E0 00 04 */ li r7, 4 -/* 802EC650 48 07 57 11 */ bl __construct_array -/* 802EC654 38 7F 00 58 */ addi r3, r31, 0x58 -/* 802EC658 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha /* 0x802F1934@ha */ -/* 802EC65C 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 0x802F1934@l */ -/* 802EC660 38 A0 00 00 */ li r5, 0 -/* 802EC664 38 C0 00 01 */ li r6, 1 -/* 802EC668 38 E0 00 04 */ li r7, 4 -/* 802EC66C 48 07 56 F5 */ bl __construct_array -/* 802EC670 38 7F 00 5C */ addi r3, r31, 0x5c -/* 802EC674 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha /* 0x802F18A0@ha */ -/* 802EC678 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 0x802F18A0@l */ -/* 802EC67C 38 A0 00 00 */ li r5, 0 -/* 802EC680 38 C0 00 04 */ li r6, 4 -/* 802EC684 38 E0 00 02 */ li r7, 2 -/* 802EC688 48 07 56 D9 */ bl __construct_array -/* 802EC68C 38 00 00 00 */ li r0, 0 -/* 802EC690 90 1F 00 64 */ stw r0, 0x64(r31) -/* 802EC694 90 1F 00 68 */ stw r0, 0x68(r31) -/* 802EC698 98 1F 00 78 */ stb r0, 0x78(r31) -/* 802EC69C 7F E3 FB 78 */ mr r3, r31 -/* 802EC6A0 81 9F 00 00 */ lwz r12, 0(r31) -/* 802EC6A4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EC6A8 7D 89 03 A6 */ mtctr r12 -/* 802EC6AC 4E 80 04 21 */ bctrl -/* 802EC6B0 7F E3 FB 78 */ mr r3, r31 -/* 802EC6B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EC6B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC6BC 7C 08 03 A6 */ mtlr r0 -/* 802EC6C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC6C4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock4Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock4Fv.s deleted file mode 100644 index c4270800ecc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock4Fv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_802ED8BC: -/* 802ED8BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802ED8C0 7C 08 02 A6 */ mflr r0 -/* 802ED8C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802ED8C8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ED8CC 7C 7F 1B 78 */ mr r31, r3 -/* 802ED8D0 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802ED8D4 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802ED8D8 90 1F 00 00 */ stw r0, 0(r31) -/* 802ED8DC 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock4@ha /* 0x803CCC40@ha */ -/* 802ED8E0 38 03 CC 40 */ addi r0, r3, __vt__12J2DTevBlock4@l /* 0x803CCC40@l */ -/* 802ED8E4 90 1F 00 00 */ stw r0, 0(r31) -/* 802ED8E8 38 7F 00 0E */ addi r3, r31, 0xe -/* 802ED8EC 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha /* 0x802F1B70@ha */ -/* 802ED8F0 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 0x802F1B70@l */ -/* 802ED8F4 38 A0 00 00 */ li r5, 0 -/* 802ED8F8 38 C0 00 04 */ li r6, 4 -/* 802ED8FC 38 E0 00 04 */ li r7, 4 -/* 802ED900 48 07 44 61 */ bl __construct_array -/* 802ED904 38 7F 00 1E */ addi r3, r31, 0x1e -/* 802ED908 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha /* 0x802F1B90@ha */ -/* 802ED90C 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 0x802F1B90@l */ -/* 802ED910 38 A0 00 00 */ li r5, 0 -/* 802ED914 38 C0 00 08 */ li r6, 8 -/* 802ED918 38 E0 00 04 */ li r7, 4 -/* 802ED91C 48 07 44 45 */ bl __construct_array -/* 802ED920 38 7F 00 3F */ addi r3, r31, 0x3f -/* 802ED924 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha /* 0x802F1940@ha */ -/* 802ED928 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 0x802F1940@l */ -/* 802ED92C 38 A0 00 00 */ li r5, 0 -/* 802ED930 38 C0 00 08 */ li r6, 8 -/* 802ED934 38 E0 00 04 */ li r7, 4 -/* 802ED938 48 07 44 29 */ bl __construct_array -/* 802ED93C 38 7F 00 60 */ addi r3, r31, 0x60 -/* 802ED940 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 802ED944 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 802ED948 38 A0 00 00 */ li r5, 0 -/* 802ED94C 38 C0 00 04 */ li r6, 4 -/* 802ED950 38 E0 00 04 */ li r7, 4 -/* 802ED954 48 07 44 0D */ bl __construct_array -/* 802ED958 38 7F 00 78 */ addi r3, r31, 0x78 -/* 802ED95C 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha /* 0x802F1934@ha */ -/* 802ED960 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 0x802F1934@l */ -/* 802ED964 38 A0 00 00 */ li r5, 0 -/* 802ED968 38 C0 00 01 */ li r6, 1 -/* 802ED96C 38 E0 00 04 */ li r7, 4 -/* 802ED970 48 07 43 F1 */ bl __construct_array -/* 802ED974 38 7F 00 7C */ addi r3, r31, 0x7c -/* 802ED978 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha /* 0x802F18A0@ha */ -/* 802ED97C 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 0x802F18A0@l */ -/* 802ED980 38 A0 00 00 */ li r5, 0 -/* 802ED984 38 C0 00 04 */ li r6, 4 -/* 802ED988 38 E0 00 04 */ li r7, 4 -/* 802ED98C 48 07 43 D5 */ bl __construct_array -/* 802ED990 38 60 00 00 */ li r3, 0 -/* 802ED994 7C 64 1B 78 */ mr r4, r3 -/* 802ED998 38 00 00 04 */ li r0, 4 -/* 802ED99C 7C 09 03 A6 */ mtctr r0 -lbl_802ED9A0: -/* 802ED9A0 38 03 00 8C */ addi r0, r3, 0x8c -/* 802ED9A4 7C 9F 01 2E */ stwx r4, r31, r0 -/* 802ED9A8 38 63 00 04 */ addi r3, r3, 4 -/* 802ED9AC 42 00 FF F4 */ bdnz lbl_802ED9A0 -/* 802ED9B0 38 00 00 00 */ li r0, 0 -/* 802ED9B4 98 1F 00 B0 */ stb r0, 0xb0(r31) -/* 802ED9B8 7F E3 FB 78 */ mr r3, r31 -/* 802ED9BC 81 9F 00 00 */ lwz r12, 0(r31) -/* 802ED9C0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802ED9C4 7D 89 03 A6 */ mtctr r12 -/* 802ED9C8 4E 80 04 21 */ bctrl -/* 802ED9CC 7F E3 FB 78 */ mr r3, r31 -/* 802ED9D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802ED9D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802ED9D8 7C 08 03 A6 */ mtlr r0 -/* 802ED9DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ED9E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock8Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock8Fv.s deleted file mode 100644 index a4b7b288d4f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock8Fv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_802EED64: -/* 802EED64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EED68 7C 08 02 A6 */ mflr r0 -/* 802EED6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EED70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EED74 7C 7F 1B 78 */ mr r31, r3 -/* 802EED78 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EED7C 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EED80 90 1F 00 00 */ stw r0, 0(r31) -/* 802EED84 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock8@ha /* 0x803CCB84@ha */ -/* 802EED88 38 03 CB 84 */ addi r0, r3, __vt__12J2DTevBlock8@l /* 0x803CCB84@l */ -/* 802EED8C 90 1F 00 00 */ stw r0, 0(r31) -/* 802EED90 38 7F 00 16 */ addi r3, r31, 0x16 -/* 802EED94 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha /* 0x802F1B70@ha */ -/* 802EED98 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 0x802F1B70@l */ -/* 802EED9C 38 A0 00 00 */ li r5, 0 -/* 802EEDA0 38 C0 00 04 */ li r6, 4 -/* 802EEDA4 38 E0 00 08 */ li r7, 8 -/* 802EEDA8 48 07 2F B9 */ bl __construct_array -/* 802EEDAC 38 7F 00 36 */ addi r3, r31, 0x36 -/* 802EEDB0 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha /* 0x802F1B90@ha */ -/* 802EEDB4 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 0x802F1B90@l */ -/* 802EEDB8 38 A0 00 00 */ li r5, 0 -/* 802EEDBC 38 C0 00 08 */ li r6, 8 -/* 802EEDC0 38 E0 00 04 */ li r7, 4 -/* 802EEDC4 48 07 2F 9D */ bl __construct_array -/* 802EEDC8 38 7F 00 57 */ addi r3, r31, 0x57 -/* 802EEDCC 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha /* 0x802F1940@ha */ -/* 802EEDD0 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 0x802F1940@l */ -/* 802EEDD4 38 A0 00 00 */ li r5, 0 -/* 802EEDD8 38 C0 00 08 */ li r6, 8 -/* 802EEDDC 38 E0 00 08 */ li r7, 8 -/* 802EEDE0 48 07 2F 81 */ bl __construct_array -/* 802EEDE4 38 7F 00 98 */ addi r3, r31, 0x98 -/* 802EEDE8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 802EEDEC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 802EEDF0 38 A0 00 00 */ li r5, 0 -/* 802EEDF4 38 C0 00 04 */ li r6, 4 -/* 802EEDF8 38 E0 00 04 */ li r7, 4 -/* 802EEDFC 48 07 2F 65 */ bl __construct_array -/* 802EEE00 38 7F 00 B8 */ addi r3, r31, 0xb8 -/* 802EEE04 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha /* 0x802F1934@ha */ -/* 802EEE08 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 0x802F1934@l */ -/* 802EEE0C 38 A0 00 00 */ li r5, 0 -/* 802EEE10 38 C0 00 01 */ li r6, 1 -/* 802EEE14 38 E0 00 04 */ li r7, 4 -/* 802EEE18 48 07 2F 49 */ bl __construct_array -/* 802EEE1C 38 7F 00 BC */ addi r3, r31, 0xbc -/* 802EEE20 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha /* 0x802F18A0@ha */ -/* 802EEE24 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 0x802F18A0@l */ -/* 802EEE28 38 A0 00 00 */ li r5, 0 -/* 802EEE2C 38 C0 00 04 */ li r6, 4 -/* 802EEE30 38 E0 00 08 */ li r7, 8 -/* 802EEE34 48 07 2F 2D */ bl __construct_array -/* 802EEE38 38 60 00 00 */ li r3, 0 -/* 802EEE3C 7C 64 1B 78 */ mr r4, r3 -/* 802EEE40 38 00 00 08 */ li r0, 8 -/* 802EEE44 7C 09 03 A6 */ mtctr r0 -lbl_802EEE48: -/* 802EEE48 38 03 00 DC */ addi r0, r3, 0xdc -/* 802EEE4C 7C 9F 01 2E */ stwx r4, r31, r0 -/* 802EEE50 38 63 00 04 */ addi r3, r3, 4 -/* 802EEE54 42 00 FF F4 */ bdnz lbl_802EEE48 -/* 802EEE58 38 00 00 00 */ li r0, 0 -/* 802EEE5C 98 1F 01 20 */ stb r0, 0x120(r31) -/* 802EEE60 7F E3 FB 78 */ mr r3, r31 -/* 802EEE64 81 9F 00 00 */ lwz r12, 0(r31) -/* 802EEE68 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EEE6C 7D 89 03 A6 */ mtctr r12 -/* 802EEE70 4E 80 04 21 */ bctrl -/* 802EEE74 7F E3 FB 78 */ mr r3, r31 -/* 802EEE78 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EEE7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EEE80 7C 08 03 A6 */ mtlr r0 -/* 802EEE84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EEE88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__13J2DTevBlock16Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__ct__13J2DTevBlock16Fv.s deleted file mode 100644 index 89376b8994f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__ct__13J2DTevBlock16Fv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_802F01E4: -/* 802F01E4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F01E8 7C 08 02 A6 */ mflr r0 -/* 802F01EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F01F0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F01F4 7C 7F 1B 78 */ mr r31, r3 -/* 802F01F8 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802F01FC 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802F0200 90 1F 00 00 */ stw r0, 0(r31) -/* 802F0204 3C 60 80 3D */ lis r3, __vt__13J2DTevBlock16@ha /* 0x803CCAC8@ha */ -/* 802F0208 38 03 CA C8 */ addi r0, r3, __vt__13J2DTevBlock16@l /* 0x803CCAC8@l */ -/* 802F020C 90 1F 00 00 */ stw r0, 0(r31) -/* 802F0210 38 7F 00 16 */ addi r3, r31, 0x16 -/* 802F0214 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha /* 0x802F1B70@ha */ -/* 802F0218 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 0x802F1B70@l */ -/* 802F021C 38 A0 00 00 */ li r5, 0 -/* 802F0220 38 C0 00 04 */ li r6, 4 -/* 802F0224 38 E0 00 10 */ li r7, 0x10 -/* 802F0228 48 07 1B 39 */ bl __construct_array -/* 802F022C 38 7F 00 56 */ addi r3, r31, 0x56 -/* 802F0230 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha /* 0x802F1B90@ha */ -/* 802F0234 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 0x802F1B90@l */ -/* 802F0238 38 A0 00 00 */ li r5, 0 -/* 802F023C 38 C0 00 08 */ li r6, 8 -/* 802F0240 38 E0 00 04 */ li r7, 4 -/* 802F0244 48 07 1B 1D */ bl __construct_array -/* 802F0248 38 7F 00 77 */ addi r3, r31, 0x77 -/* 802F024C 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha /* 0x802F1940@ha */ -/* 802F0250 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 0x802F1940@l */ -/* 802F0254 38 A0 00 00 */ li r5, 0 -/* 802F0258 38 C0 00 08 */ li r6, 8 -/* 802F025C 38 E0 00 10 */ li r7, 0x10 -/* 802F0260 48 07 1B 01 */ bl __construct_array -/* 802F0264 38 7F 00 F8 */ addi r3, r31, 0xf8 -/* 802F0268 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha /* 0x80193960@ha */ -/* 802F026C 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 0x80193960@l */ -/* 802F0270 38 A0 00 00 */ li r5, 0 -/* 802F0274 38 C0 00 04 */ li r6, 4 -/* 802F0278 38 E0 00 04 */ li r7, 4 -/* 802F027C 48 07 1A E5 */ bl __construct_array -/* 802F0280 38 7F 01 28 */ addi r3, r31, 0x128 -/* 802F0284 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha /* 0x802F1934@ha */ -/* 802F0288 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 0x802F1934@l */ -/* 802F028C 38 A0 00 00 */ li r5, 0 -/* 802F0290 38 C0 00 01 */ li r6, 1 -/* 802F0294 38 E0 00 04 */ li r7, 4 -/* 802F0298 48 07 1A C9 */ bl __construct_array -/* 802F029C 38 7F 01 2C */ addi r3, r31, 0x12c -/* 802F02A0 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha /* 0x802F18A0@ha */ -/* 802F02A4 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 0x802F18A0@l */ -/* 802F02A8 38 A0 00 00 */ li r5, 0 -/* 802F02AC 38 C0 00 04 */ li r6, 4 -/* 802F02B0 38 E0 00 10 */ li r7, 0x10 -/* 802F02B4 48 07 1A AD */ bl __construct_array -/* 802F02B8 38 60 00 00 */ li r3, 0 -/* 802F02BC 7C 64 1B 78 */ mr r4, r3 -/* 802F02C0 38 00 00 08 */ li r0, 8 -/* 802F02C4 7C 09 03 A6 */ mtctr r0 -lbl_802F02C8: -/* 802F02C8 38 03 01 6C */ addi r0, r3, 0x16c -/* 802F02CC 7C 9F 01 2E */ stwx r4, r31, r0 -/* 802F02D0 38 63 00 04 */ addi r3, r3, 4 -/* 802F02D4 42 00 FF F4 */ bdnz lbl_802F02C8 -/* 802F02D8 38 00 00 00 */ li r0, 0 -/* 802F02DC 98 1F 01 B0 */ stb r0, 0x1b0(r31) -/* 802F02E0 7F E3 FB 78 */ mr r3, r31 -/* 802F02E4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F02E8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F02EC 7D 89 03 A6 */ mtctr r12 -/* 802F02F0 4E 80 04 21 */ bctrl -/* 802F02F4 7F E3 FB 78 */ mr r3, r31 -/* 802F02F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F02FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F0300 7C 08 03 A6 */ mtlr r0 -/* 802F0304 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F0308 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock1Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock1Fv.s deleted file mode 100644 index bf4b674ef42..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock1Fv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802EB998: -/* 802EB998 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EB99C 7C 08 02 A6 */ mflr r0 -/* 802EB9A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EB9A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EB9A8 93 C1 00 08 */ stw r30, 8(r1) -/* 802EB9AC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802EB9B0 7C 9F 23 78 */ mr r31, r4 -/* 802EB9B4 41 82 00 80 */ beq lbl_802EBA34 -/* 802EB9B8 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock1@ha /* 0x803CCDB8@ha */ -/* 802EB9BC 38 03 CD B8 */ addi r0, r3, __vt__12J2DTevBlock1@l /* 0x803CCDB8@l */ -/* 802EB9C0 90 1E 00 00 */ stw r0, 0(r30) -/* 802EB9C4 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EB9C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EB9CC 41 82 00 10 */ beq lbl_802EB9DC -/* 802EB9D0 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 802EB9D4 38 80 00 01 */ li r4, 1 -/* 802EB9D8 4B FF 28 5D */ bl __dt__10JUTTextureFv -lbl_802EB9DC: -/* 802EB9DC 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 802EB9E0 4B FE 33 5D */ bl __dl__FPv -/* 802EB9E4 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EB9E8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EB9EC 41 82 00 24 */ beq lbl_802EBA10 -/* 802EB9F0 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 802EB9F4 28 03 00 00 */ cmplwi r3, 0 -/* 802EB9F8 41 82 00 18 */ beq lbl_802EBA10 -/* 802EB9FC 38 80 00 01 */ li r4, 1 -/* 802EBA00 81 83 00 00 */ lwz r12, 0(r3) -/* 802EBA04 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EBA08 7D 89 03 A6 */ mtctr r12 -/* 802EBA0C 4E 80 04 21 */ bctrl -lbl_802EBA10: -/* 802EBA10 28 1E 00 00 */ cmplwi r30, 0 -/* 802EBA14 41 82 00 10 */ beq lbl_802EBA24 -/* 802EBA18 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EBA1C 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EBA20 90 1E 00 00 */ stw r0, 0(r30) -lbl_802EBA24: -/* 802EBA24 7F E0 07 35 */ extsh. r0, r31 -/* 802EBA28 40 81 00 0C */ ble lbl_802EBA34 -/* 802EBA2C 7F C3 F3 78 */ mr r3, r30 -/* 802EBA30 4B FE 33 0D */ bl __dl__FPv -lbl_802EBA34: -/* 802EBA34 7F C3 F3 78 */ mr r3, r30 -/* 802EBA38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EBA3C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EBA40 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EBA44 7C 08 03 A6 */ mtlr r0 -/* 802EBA48 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBA4C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock2Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock2Fv.s deleted file mode 100644 index 65e813b13ab..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock2Fv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802EC6C8: -/* 802EC6C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC6CC 7C 08 02 A6 */ mflr r0 -/* 802EC6D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC6D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EC6D8 93 C1 00 08 */ stw r30, 8(r1) -/* 802EC6DC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802EC6E0 7C 9F 23 78 */ mr r31, r4 -/* 802EC6E4 41 82 00 A0 */ beq lbl_802EC784 -/* 802EC6E8 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock2@ha /* 0x803CCCFC@ha */ -/* 802EC6EC 38 03 CC FC */ addi r0, r3, __vt__12J2DTevBlock2@l /* 0x803CCCFC@l */ -/* 802EC6F0 90 1E 00 00 */ stw r0, 0(r30) -/* 802EC6F4 88 1E 00 78 */ lbz r0, 0x78(r30) -/* 802EC6F8 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EC6FC 41 82 00 10 */ beq lbl_802EC70C -/* 802EC700 80 7E 00 64 */ lwz r3, 0x64(r30) -/* 802EC704 38 80 00 01 */ li r4, 1 -/* 802EC708 4B FF 1B 2D */ bl __dt__10JUTTextureFv -lbl_802EC70C: -/* 802EC70C 88 1E 00 78 */ lbz r0, 0x78(r30) -/* 802EC710 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802EC714 41 82 00 10 */ beq lbl_802EC724 -/* 802EC718 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 802EC71C 38 80 00 01 */ li r4, 1 -/* 802EC720 4B FF 1B 15 */ bl __dt__10JUTTextureFv -lbl_802EC724: -/* 802EC724 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 802EC728 4B FE 26 15 */ bl __dl__FPv -/* 802EC72C 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802EC730 4B FE 26 0D */ bl __dl__FPv -/* 802EC734 88 1E 00 78 */ lbz r0, 0x78(r30) -/* 802EC738 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EC73C 41 82 00 24 */ beq lbl_802EC760 -/* 802EC740 80 7E 00 74 */ lwz r3, 0x74(r30) -/* 802EC744 28 03 00 00 */ cmplwi r3, 0 -/* 802EC748 41 82 00 18 */ beq lbl_802EC760 -/* 802EC74C 38 80 00 01 */ li r4, 1 -/* 802EC750 81 83 00 00 */ lwz r12, 0(r3) -/* 802EC754 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EC758 7D 89 03 A6 */ mtctr r12 -/* 802EC75C 4E 80 04 21 */ bctrl -lbl_802EC760: -/* 802EC760 28 1E 00 00 */ cmplwi r30, 0 -/* 802EC764 41 82 00 10 */ beq lbl_802EC774 -/* 802EC768 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EC76C 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EC770 90 1E 00 00 */ stw r0, 0(r30) -lbl_802EC774: -/* 802EC774 7F E0 07 35 */ extsh. r0, r31 -/* 802EC778 40 81 00 0C */ ble lbl_802EC784 -/* 802EC77C 7F C3 F3 78 */ mr r3, r30 -/* 802EC780 4B FE 25 BD */ bl __dl__FPv -lbl_802EC784: -/* 802EC784 7F C3 F3 78 */ mr r3, r30 -/* 802EC788 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EC78C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EC790 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC794 7C 08 03 A6 */ mtlr r0 -/* 802EC798 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC79C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock4Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock4Fv.s deleted file mode 100644 index aa0f3db66bc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock4Fv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802ED9E4: -/* 802ED9E4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ED9E8 7C 08 02 A6 */ mflr r0 -/* 802ED9EC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ED9F0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED9F4 48 07 47 E1 */ bl _savegpr_27 -/* 802ED9F8 7C 7B 1B 79 */ or. r27, r3, r3 -/* 802ED9FC 7C 9C 23 78 */ mr r28, r4 -/* 802EDA00 41 82 00 A8 */ beq lbl_802EDAA8 -/* 802EDA04 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock4@ha /* 0x803CCC40@ha */ -/* 802EDA08 38 03 CC 40 */ addi r0, r3, __vt__12J2DTevBlock4@l /* 0x803CCC40@l */ -/* 802EDA0C 90 1B 00 00 */ stw r0, 0(r27) -/* 802EDA10 3B A0 00 00 */ li r29, 0 -/* 802EDA14 3B E0 00 00 */ li r31, 0 -/* 802EDA18 3B C0 00 01 */ li r30, 1 -lbl_802EDA1C: -/* 802EDA1C 88 7B 00 B0 */ lbz r3, 0xb0(r27) -/* 802EDA20 7F C0 E8 30 */ slw r0, r30, r29 -/* 802EDA24 7C 60 00 39 */ and. r0, r3, r0 -/* 802EDA28 41 82 00 14 */ beq lbl_802EDA3C -/* 802EDA2C 38 1F 00 8C */ addi r0, r31, 0x8c -/* 802EDA30 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EDA34 38 80 00 01 */ li r4, 1 -/* 802EDA38 4B FF 07 FD */ bl __dt__10JUTTextureFv -lbl_802EDA3C: -/* 802EDA3C 38 1F 00 9C */ addi r0, r31, 0x9c -/* 802EDA40 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EDA44 4B FE 12 F9 */ bl __dl__FPv -/* 802EDA48 3B BD 00 01 */ addi r29, r29, 1 -/* 802EDA4C 2C 1D 00 04 */ cmpwi r29, 4 -/* 802EDA50 3B FF 00 04 */ addi r31, r31, 4 -/* 802EDA54 41 80 FF C8 */ blt lbl_802EDA1C -/* 802EDA58 88 1B 00 B0 */ lbz r0, 0xb0(r27) -/* 802EDA5C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EDA60 41 82 00 24 */ beq lbl_802EDA84 -/* 802EDA64 80 7B 00 AC */ lwz r3, 0xac(r27) -/* 802EDA68 28 03 00 00 */ cmplwi r3, 0 -/* 802EDA6C 41 82 00 18 */ beq lbl_802EDA84 -/* 802EDA70 38 80 00 01 */ li r4, 1 -/* 802EDA74 81 83 00 00 */ lwz r12, 0(r3) -/* 802EDA78 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EDA7C 7D 89 03 A6 */ mtctr r12 -/* 802EDA80 4E 80 04 21 */ bctrl -lbl_802EDA84: -/* 802EDA84 28 1B 00 00 */ cmplwi r27, 0 -/* 802EDA88 41 82 00 10 */ beq lbl_802EDA98 -/* 802EDA8C 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EDA90 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EDA94 90 1B 00 00 */ stw r0, 0(r27) -lbl_802EDA98: -/* 802EDA98 7F 80 07 35 */ extsh. r0, r28 -/* 802EDA9C 40 81 00 0C */ ble lbl_802EDAA8 -/* 802EDAA0 7F 63 DB 78 */ mr r3, r27 -/* 802EDAA4 4B FE 12 99 */ bl __dl__FPv -lbl_802EDAA8: -/* 802EDAA8 7F 63 DB 78 */ mr r3, r27 -/* 802EDAAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDAB0 48 07 47 71 */ bl _restgpr_27 -/* 802EDAB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EDAB8 7C 08 03 A6 */ mtlr r0 -/* 802EDABC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EDAC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock8Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock8Fv.s deleted file mode 100644 index 9479d307213..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock8Fv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802EEE8C: -/* 802EEE8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EEE90 7C 08 02 A6 */ mflr r0 -/* 802EEE94 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EEE98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EEE9C 48 07 33 39 */ bl _savegpr_27 -/* 802EEEA0 7C 7B 1B 79 */ or. r27, r3, r3 -/* 802EEEA4 7C 9C 23 78 */ mr r28, r4 -/* 802EEEA8 41 82 00 A8 */ beq lbl_802EEF50 -/* 802EEEAC 3C 60 80 3D */ lis r3, __vt__12J2DTevBlock8@ha /* 0x803CCB84@ha */ -/* 802EEEB0 38 03 CB 84 */ addi r0, r3, __vt__12J2DTevBlock8@l /* 0x803CCB84@l */ -/* 802EEEB4 90 1B 00 00 */ stw r0, 0(r27) -/* 802EEEB8 3B A0 00 00 */ li r29, 0 -/* 802EEEBC 3B E0 00 00 */ li r31, 0 -/* 802EEEC0 3B C0 00 01 */ li r30, 1 -lbl_802EEEC4: -/* 802EEEC4 88 7B 01 20 */ lbz r3, 0x120(r27) -/* 802EEEC8 7F C0 E8 30 */ slw r0, r30, r29 -/* 802EEECC 7C 60 00 39 */ and. r0, r3, r0 -/* 802EEED0 41 82 00 14 */ beq lbl_802EEEE4 -/* 802EEED4 38 1F 00 DC */ addi r0, r31, 0xdc -/* 802EEED8 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EEEDC 38 80 00 01 */ li r4, 1 -/* 802EEEE0 4B FE F3 55 */ bl __dt__10JUTTextureFv -lbl_802EEEE4: -/* 802EEEE4 38 1F 00 FC */ addi r0, r31, 0xfc -/* 802EEEE8 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802EEEEC 4B FD FE 51 */ bl __dl__FPv -/* 802EEEF0 3B BD 00 01 */ addi r29, r29, 1 -/* 802EEEF4 2C 1D 00 08 */ cmpwi r29, 8 -/* 802EEEF8 3B FF 00 04 */ addi r31, r31, 4 -/* 802EEEFC 41 80 FF C8 */ blt lbl_802EEEC4 -/* 802EEF00 88 1B 01 21 */ lbz r0, 0x121(r27) -/* 802EEF04 28 00 00 00 */ cmplwi r0, 0 -/* 802EEF08 41 82 00 24 */ beq lbl_802EEF2C -/* 802EEF0C 80 7B 01 1C */ lwz r3, 0x11c(r27) -/* 802EEF10 28 03 00 00 */ cmplwi r3, 0 -/* 802EEF14 41 82 00 18 */ beq lbl_802EEF2C -/* 802EEF18 38 80 00 01 */ li r4, 1 -/* 802EEF1C 81 83 00 00 */ lwz r12, 0(r3) -/* 802EEF20 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EEF24 7D 89 03 A6 */ mtctr r12 -/* 802EEF28 4E 80 04 21 */ bctrl -lbl_802EEF2C: -/* 802EEF2C 28 1B 00 00 */ cmplwi r27, 0 -/* 802EEF30 41 82 00 10 */ beq lbl_802EEF40 -/* 802EEF34 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802EEF38 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802EEF3C 90 1B 00 00 */ stw r0, 0(r27) -lbl_802EEF40: -/* 802EEF40 7F 80 07 35 */ extsh. r0, r28 -/* 802EEF44 40 81 00 0C */ ble lbl_802EEF50 -/* 802EEF48 7F 63 DB 78 */ mr r3, r27 -/* 802EEF4C 4B FD FD F1 */ bl __dl__FPv -lbl_802EEF50: -/* 802EEF50 7F 63 DB 78 */ mr r3, r27 -/* 802EEF54 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EEF58 48 07 32 C9 */ bl _restgpr_27 -/* 802EEF5C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EEF60 7C 08 03 A6 */ mtlr r0 -/* 802EEF64 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EEF68 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__13J2DTevBlock16Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__13J2DTevBlock16Fv.s deleted file mode 100644 index 9d09ce820c3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__13J2DTevBlock16Fv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802F030C: -/* 802F030C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F0310 7C 08 02 A6 */ mflr r0 -/* 802F0314 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F0318 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F031C 48 07 1E B9 */ bl _savegpr_27 -/* 802F0320 7C 7B 1B 79 */ or. r27, r3, r3 -/* 802F0324 7C 9C 23 78 */ mr r28, r4 -/* 802F0328 41 82 00 A8 */ beq lbl_802F03D0 -/* 802F032C 3C 60 80 3D */ lis r3, __vt__13J2DTevBlock16@ha /* 0x803CCAC8@ha */ -/* 802F0330 38 03 CA C8 */ addi r0, r3, __vt__13J2DTevBlock16@l /* 0x803CCAC8@l */ -/* 802F0334 90 1B 00 00 */ stw r0, 0(r27) -/* 802F0338 3B A0 00 00 */ li r29, 0 -/* 802F033C 3B E0 00 00 */ li r31, 0 -/* 802F0340 3B C0 00 01 */ li r30, 1 -lbl_802F0344: -/* 802F0344 88 7B 01 B0 */ lbz r3, 0x1b0(r27) -/* 802F0348 7F C0 E8 30 */ slw r0, r30, r29 -/* 802F034C 7C 60 00 39 */ and. r0, r3, r0 -/* 802F0350 41 82 00 14 */ beq lbl_802F0364 -/* 802F0354 38 1F 01 6C */ addi r0, r31, 0x16c -/* 802F0358 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802F035C 38 80 00 01 */ li r4, 1 -/* 802F0360 4B FE DE D5 */ bl __dt__10JUTTextureFv -lbl_802F0364: -/* 802F0364 38 1F 01 8C */ addi r0, r31, 0x18c -/* 802F0368 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 802F036C 4B FD E9 D1 */ bl __dl__FPv -/* 802F0370 3B BD 00 01 */ addi r29, r29, 1 -/* 802F0374 2C 1D 00 08 */ cmpwi r29, 8 -/* 802F0378 3B FF 00 04 */ addi r31, r31, 4 -/* 802F037C 41 80 FF C8 */ blt lbl_802F0344 -/* 802F0380 88 1B 01 B1 */ lbz r0, 0x1b1(r27) -/* 802F0384 28 00 00 00 */ cmplwi r0, 0 -/* 802F0388 41 82 00 24 */ beq lbl_802F03AC -/* 802F038C 80 7B 01 AC */ lwz r3, 0x1ac(r27) -/* 802F0390 28 03 00 00 */ cmplwi r3, 0 -/* 802F0394 41 82 00 18 */ beq lbl_802F03AC -/* 802F0398 38 80 00 01 */ li r4, 1 -/* 802F039C 81 83 00 00 */ lwz r12, 0(r3) -/* 802F03A0 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F03A4 7D 89 03 A6 */ mtctr r12 -/* 802F03A8 4E 80 04 21 */ bctrl -lbl_802F03AC: -/* 802F03AC 28 1B 00 00 */ cmplwi r27, 0 -/* 802F03B0 41 82 00 10 */ beq lbl_802F03C0 -/* 802F03B4 3C 60 80 3D */ lis r3, __vt__11J2DTevBlock@ha /* 0x803CCE74@ha */ -/* 802F03B8 38 03 CE 74 */ addi r0, r3, __vt__11J2DTevBlock@l /* 0x803CCE74@l */ -/* 802F03BC 90 1B 00 00 */ stw r0, 0(r27) -lbl_802F03C0: -/* 802F03C0 7F 80 07 35 */ extsh. r0, r28 -/* 802F03C4 40 81 00 0C */ ble lbl_802F03D0 -/* 802F03C8 7F 63 DB 78 */ mr r3, r27 -/* 802F03CC 4B FD E9 71 */ bl __dl__FPv -lbl_802F03D0: -/* 802F03D0 7F 63 DB 78 */ mr r3, r27 -/* 802F03D4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F03D8 48 07 1E 49 */ bl _restgpr_27 -/* 802F03DC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F03E0 7C 08 03 A6 */ mtlr r0 -/* 802F03E4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F03E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__14J2DTexGenBlockFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__14J2DTexGenBlockFv.s deleted file mode 100644 index f769b447c89..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__14J2DTexGenBlockFv.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_802EB620: -/* 802EB620 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EB624 7C 08 02 A6 */ mflr r0 -/* 802EB628 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EB62C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB630 48 07 6B A9 */ bl _savegpr_28 -/* 802EB634 7C 7C 1B 79 */ or. r28, r3, r3 -/* 802EB638 7C 9D 23 78 */ mr r29, r4 -/* 802EB63C 41 82 00 4C */ beq lbl_802EB688 -/* 802EB640 3C 60 80 3D */ lis r3, __vt__14J2DTexGenBlock@ha /* 0x803CCF30@ha */ -/* 802EB644 38 03 CF 30 */ addi r0, r3, __vt__14J2DTexGenBlock@l /* 0x803CCF30@l */ -/* 802EB648 90 1C 00 44 */ stw r0, 0x44(r28) -/* 802EB64C 3B C0 00 00 */ li r30, 0 -/* 802EB650 3B E0 00 00 */ li r31, 0 -lbl_802EB654: -/* 802EB654 38 1F 00 24 */ addi r0, r31, 0x24 -/* 802EB658 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 802EB65C 28 03 00 00 */ cmplwi r3, 0 -/* 802EB660 41 82 00 08 */ beq lbl_802EB668 -/* 802EB664 4B FE 36 D9 */ bl __dl__FPv -lbl_802EB668: -/* 802EB668 3B DE 00 01 */ addi r30, r30, 1 -/* 802EB66C 2C 1E 00 08 */ cmpwi r30, 8 -/* 802EB670 3B FF 00 04 */ addi r31, r31, 4 -/* 802EB674 41 80 FF E0 */ blt lbl_802EB654 -/* 802EB678 7F A0 07 35 */ extsh. r0, r29 -/* 802EB67C 40 81 00 0C */ ble lbl_802EB688 -/* 802EB680 7F 83 E3 78 */ mr r3, r28 -/* 802EB684 4B FE 36 B9 */ bl __dl__FPv -lbl_802EB688: -/* 802EB688 7F 83 E3 78 */ mr r3, r28 -/* 802EB68C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EB690 48 07 6B 95 */ bl _restgpr_28 -/* 802EB694 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EB698 7C 08 03 A6 */ mtlr r0 -/* 802EB69C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EB6A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__15J2DIndBlockFullFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/__dt__15J2DIndBlockFullFv.s deleted file mode 100644 index c857b5aadc4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/__dt__15J2DIndBlockFullFv.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_802F1C7C: -/* 802F1C7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F1C80 7C 08 02 A6 */ mflr r0 -/* 802F1C84 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F1C88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F1C8C 93 C1 00 08 */ stw r30, 8(r1) -/* 802F1C90 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802F1C94 7C 9F 23 78 */ mr r31, r4 -/* 802F1C98 41 82 00 64 */ beq lbl_802F1CFC -/* 802F1C9C 3C 60 80 3D */ lis r3, __vt__15J2DIndBlockFull@ha /* 0x803CCA90@ha */ -/* 802F1CA0 38 03 CA 90 */ addi r0, r3, __vt__15J2DIndBlockFull@l /* 0x803CCA90@l */ -/* 802F1CA4 90 1E 00 00 */ stw r0, 0(r30) -/* 802F1CA8 38 7E 00 64 */ addi r3, r30, 0x64 -/* 802F1CAC 3C 80 80 2F */ lis r4, __dt__19J2DIndTexCoordScaleFv@ha /* 0x802EB290@ha */ -/* 802F1CB0 38 84 B2 90 */ addi r4, r4, __dt__19J2DIndTexCoordScaleFv@l /* 0x802EB290@l */ -/* 802F1CB4 38 A0 00 02 */ li r5, 2 -/* 802F1CB8 38 C0 00 04 */ li r6, 4 -/* 802F1CBC 48 07 00 2D */ bl __destroy_arr -/* 802F1CC0 38 7E 00 10 */ addi r3, r30, 0x10 -/* 802F1CC4 3C 80 80 2F */ lis r4, __dt__12J2DIndTexMtxFv@ha /* 0x802EB2E4@ha */ -/* 802F1CC8 38 84 B2 E4 */ addi r4, r4, __dt__12J2DIndTexMtxFv@l /* 0x802EB2E4@l */ -/* 802F1CCC 38 A0 00 1C */ li r5, 0x1c -/* 802F1CD0 38 C0 00 03 */ li r6, 3 -/* 802F1CD4 48 07 00 15 */ bl __destroy_arr -/* 802F1CD8 28 1E 00 00 */ cmplwi r30, 0 -/* 802F1CDC 41 82 00 10 */ beq lbl_802F1CEC -/* 802F1CE0 3C 60 80 3D */ lis r3, __vt__11J2DIndBlock@ha /* 0x803CCA40@ha */ -/* 802F1CE4 38 03 CA 40 */ addi r0, r3, __vt__11J2DIndBlock@l /* 0x803CCA40@l */ -/* 802F1CE8 90 1E 00 00 */ stw r0, 0(r30) -lbl_802F1CEC: -/* 802F1CEC 7F E0 07 35 */ extsh. r0, r31 -/* 802F1CF0 40 81 00 0C */ ble lbl_802F1CFC -/* 802F1CF4 7F C3 F3 78 */ mr r3, r30 -/* 802F1CF8 4B FD D0 45 */ bl __dl__FPv -lbl_802F1CFC: -/* 802F1CFC 7F C3 F3 78 */ mr r3, r30 -/* 802F1D00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F1D04 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F1D08 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F1D0C 7C 08 03 A6 */ mtlr r0 -/* 802F1D10 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1D14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s deleted file mode 100644 index 95916d9ab5f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F27DC: -/* 802F27DC A0 63 00 06 */ lhz r3, 6(r3) -/* 802F27E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s deleted file mode 100644 index 66dc1ea712c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2538: -/* 802F2538 A0 63 00 08 */ lhz r3, 8(r3) -/* 802F253C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s deleted file mode 100644 index 0e39c21887c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2294: -/* 802F2294 A0 63 00 0C */ lhz r3, 0xc(r3) -/* 802F2298 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s deleted file mode 100644 index 90e7322cbea..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1FF4: -/* 802F1FF4 A0 63 00 14 */ lhz r3, 0x14(r3) -/* 802F1FF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s deleted file mode 100644 index 66022b9670e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1D54: -/* 802F1D54 A0 63 00 14 */ lhz r3, 0x14(r3) -/* 802F1D58 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s deleted file mode 100644 index 029eb8b2ca2..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2A18: -/* 802F2A18 80 63 00 58 */ lwz r3, 0x58(r3) -/* 802F2A1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s deleted file mode 100644 index a7e9b8a15b8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2778: -/* 802F2778 80 63 00 74 */ lwz r3, 0x74(r3) -/* 802F277C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s deleted file mode 100644 index cf3c2455419..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F24D4: -/* 802F24D4 80 63 00 AC */ lwz r3, 0xac(r3) -/* 802F24D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s deleted file mode 100644 index 2ff48b61037..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2234: -/* 802F2234 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 802F2238 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s deleted file mode 100644 index c3e469eca3e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1F94: -/* 802F1F94 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 802F1F98 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s deleted file mode 100644 index e855307c1b3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2994: -/* 802F2994 7C 60 1B 78 */ mr r0, r3 -/* 802F2998 54 83 10 3A */ slwi r3, r4, 2 -/* 802F299C 38 63 00 4C */ addi r3, r3, 0x4c -/* 802F29A0 7C 60 1A 14 */ add r3, r0, r3 -/* 802F29A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s deleted file mode 100644 index 94dc99052f9..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F26F4: -/* 802F26F4 7C 60 1B 78 */ mr r0, r3 -/* 802F26F8 54 83 10 3A */ slwi r3, r4, 2 -/* 802F26FC 38 63 00 5C */ addi r3, r3, 0x5c -/* 802F2700 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2704 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s deleted file mode 100644 index 8659641239c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2450: -/* 802F2450 7C 60 1B 78 */ mr r0, r3 -/* 802F2454 54 83 10 3A */ slwi r3, r4, 2 -/* 802F2458 38 63 00 7C */ addi r3, r3, 0x7c -/* 802F245C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2460 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s deleted file mode 100644 index ccd897adc23..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F21B0: -/* 802F21B0 7C 60 1B 78 */ mr r0, r3 -/* 802F21B4 54 83 10 3A */ slwi r3, r4, 2 -/* 802F21B8 38 63 00 BC */ addi r3, r3, 0xbc -/* 802F21BC 7C 60 1A 14 */ add r3, r0, r3 -/* 802F21C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s deleted file mode 100644 index 57efab1d422..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1F10: -/* 802F1F10 7C 60 1B 78 */ mr r0, r3 -/* 802F1F14 54 83 10 3A */ slwi r3, r4, 2 -/* 802F1F18 38 63 01 2C */ addi r3, r3, 0x12c -/* 802F1F1C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1F20 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s deleted file mode 100644 index 05c85d293d5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1C68: -/* 802F1C68 7C 60 1B 78 */ mr r0, r3 -/* 802F1C6C 54 83 08 3C */ slwi r3, r4, 1 -/* 802F1C70 38 63 00 64 */ addi r3, r3, 0x64 -/* 802F1C74 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1C78 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s deleted file mode 100644 index b3001338b8a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1C38: -/* 802F1C38 7C 60 1B 78 */ mr r0, r3 -/* 802F1C3C 1C 64 00 1C */ mulli r3, r4, 0x1c -/* 802F1C40 38 63 00 10 */ addi r3, r3, 0x10 -/* 802F1C44 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1C48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s deleted file mode 100644 index 902474cc8c5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1BCC: -/* 802F1BCC 7C 60 1B 78 */ mr r0, r3 -/* 802F1BD0 54 83 08 3C */ slwi r3, r4, 1 -/* 802F1BD4 38 63 00 05 */ addi r3, r3, 5 -/* 802F1BD8 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1BDC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s deleted file mode 100644 index 9c09b92efd9..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1BA8: -/* 802F1BA8 88 63 00 04 */ lbz r3, 4(r3) -/* 802F1BAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s deleted file mode 100644 index 7101ee554d6..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F29F8: -/* 802F29F8 28 04 00 01 */ cmplwi r4, 1 -/* 802F29FC 41 80 00 0C */ blt lbl_802F2A08 -/* 802F2A00 38 60 00 00 */ li r3, 0 -/* 802F2A04 4E 80 00 20 */ blr -lbl_802F2A08: -/* 802F2A08 54 80 10 3A */ slwi r0, r4, 2 -/* 802F2A0C 7C 63 02 14 */ add r3, r3, r0 -/* 802F2A10 80 63 00 54 */ lwz r3, 0x54(r3) -/* 802F2A14 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s deleted file mode 100644 index 825220aeb7f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F2758: -/* 802F2758 28 04 00 02 */ cmplwi r4, 2 -/* 802F275C 41 80 00 0C */ blt lbl_802F2768 -/* 802F2760 38 60 00 00 */ li r3, 0 -/* 802F2764 4E 80 00 20 */ blr -lbl_802F2768: -/* 802F2768 54 80 10 3A */ slwi r0, r4, 2 -/* 802F276C 7C 63 02 14 */ add r3, r3, r0 -/* 802F2770 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 802F2774 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s deleted file mode 100644 index 79754df7bb8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F24B4: -/* 802F24B4 28 04 00 04 */ cmplwi r4, 4 -/* 802F24B8 41 80 00 0C */ blt lbl_802F24C4 -/* 802F24BC 38 60 00 00 */ li r3, 0 -/* 802F24C0 4E 80 00 20 */ blr -lbl_802F24C4: -/* 802F24C4 54 80 10 3A */ slwi r0, r4, 2 -/* 802F24C8 7C 63 02 14 */ add r3, r3, r0 -/* 802F24CC 80 63 00 9C */ lwz r3, 0x9c(r3) -/* 802F24D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s deleted file mode 100644 index 2abe131c9be..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F2214: -/* 802F2214 28 04 00 08 */ cmplwi r4, 8 -/* 802F2218 41 80 00 0C */ blt lbl_802F2224 -/* 802F221C 38 60 00 00 */ li r3, 0 -/* 802F2220 4E 80 00 20 */ blr -lbl_802F2224: -/* 802F2224 54 80 10 3A */ slwi r0, r4, 2 -/* 802F2228 7C 63 02 14 */ add r3, r3, r0 -/* 802F222C 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 802F2230 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s deleted file mode 100644 index eb065b51413..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F1F74: -/* 802F1F74 28 04 00 08 */ cmplwi r4, 8 -/* 802F1F78 41 80 00 0C */ blt lbl_802F1F84 -/* 802F1F7C 38 60 00 00 */ li r3, 0 -/* 802F1F80 4E 80 00 20 */ blr -lbl_802F1F84: -/* 802F1F84 54 80 10 3A */ slwi r0, r4, 2 -/* 802F1F88 7C 63 02 14 */ add r3, r3, r0 -/* 802F1F8C 80 63 01 8C */ lwz r3, 0x18c(r3) -/* 802F1F90 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s deleted file mode 100644 index f1c0636db2a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2848: -/* 802F2848 7C 60 1B 78 */ mr r0, r3 -/* 802F284C 54 83 18 38 */ slwi r3, r4, 3 -/* 802F2850 38 63 00 0C */ addi r3, r3, 0xc -/* 802F2854 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2858 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s deleted file mode 100644 index 206c5084607..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F25A4: -/* 802F25A4 7C 60 1B 78 */ mr r0, r3 -/* 802F25A8 54 83 18 38 */ slwi r3, r4, 3 -/* 802F25AC 38 63 00 12 */ addi r3, r3, 0x12 -/* 802F25B0 7C 60 1A 14 */ add r3, r0, r3 -/* 802F25B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s deleted file mode 100644 index 03dcfd5d95c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2300: -/* 802F2300 7C 60 1B 78 */ mr r0, r3 -/* 802F2304 54 83 18 38 */ slwi r3, r4, 3 -/* 802F2308 38 63 00 1E */ addi r3, r3, 0x1e -/* 802F230C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2310 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s deleted file mode 100644 index 2355743093a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2060: -/* 802F2060 7C 60 1B 78 */ mr r0, r3 -/* 802F2064 54 83 18 38 */ slwi r3, r4, 3 -/* 802F2068 38 63 00 36 */ addi r3, r3, 0x36 -/* 802F206C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2070 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s deleted file mode 100644 index 82638f973c4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1DC0: -/* 802F1DC0 7C 60 1B 78 */ mr r0, r3 -/* 802F1DC4 54 83 18 38 */ slwi r3, r4, 3 -/* 802F1DC8 38 63 00 56 */ addi r3, r3, 0x56 -/* 802F1DCC 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1DD0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s deleted file mode 100644 index 861faf8ea1d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F28C0: -/* 802F28C0 7C 63 22 14 */ add r3, r3, r4 -/* 802F28C4 88 63 00 45 */ lbz r3, 0x45(r3) -/* 802F28C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s deleted file mode 100644 index 85d9a95e9b4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F261C: -/* 802F261C 7C 63 22 14 */ add r3, r3, r4 -/* 802F2620 88 63 00 56 */ lbz r3, 0x56(r3) -/* 802F2624 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s deleted file mode 100644 index c9998b52da0..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2378: -/* 802F2378 7C 63 22 14 */ add r3, r3, r4 -/* 802F237C 88 63 00 74 */ lbz r3, 0x74(r3) -/* 802F2380 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s deleted file mode 100644 index 04ea548739d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F20D8: -/* 802F20D8 7C 63 22 14 */ add r3, r3, r4 -/* 802F20DC 88 63 00 B0 */ lbz r3, 0xb0(r3) -/* 802F20E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s deleted file mode 100644 index 30d66e8d795..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1E38: -/* 802F1E38 7C 63 22 14 */ add r3, r3, r4 -/* 802F1E3C 88 63 01 18 */ lbz r3, 0x118(r3) -/* 802F1E40 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s deleted file mode 100644 index d81326a9279..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F28A8: -/* 802F28A8 7C 63 22 14 */ add r3, r3, r4 -/* 802F28AC 88 63 00 44 */ lbz r3, 0x44(r3) -/* 802F28B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s deleted file mode 100644 index 5dd77bfd054..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2604: -/* 802F2604 7C 63 22 14 */ add r3, r3, r4 -/* 802F2608 88 63 00 54 */ lbz r3, 0x54(r3) -/* 802F260C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s deleted file mode 100644 index 9afc33ff466..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2360: -/* 802F2360 7C 63 22 14 */ add r3, r3, r4 -/* 802F2364 88 63 00 70 */ lbz r3, 0x70(r3) -/* 802F2368 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s deleted file mode 100644 index 004579f7876..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F20C0: -/* 802F20C0 7C 63 22 14 */ add r3, r3, r4 -/* 802F20C4 88 63 00 A8 */ lbz r3, 0xa8(r3) -/* 802F20C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s deleted file mode 100644 index 59caf52d5f8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1E20: -/* 802F1E20 7C 63 22 14 */ add r3, r3, r4 -/* 802F1E24 88 63 01 08 */ lbz r3, 0x108(r3) -/* 802F1E28 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s deleted file mode 100644 index 4601eb7e507..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2888: -/* 802F2888 7C 60 1B 78 */ mr r0, r3 -/* 802F288C 54 83 10 3A */ slwi r3, r4, 2 -/* 802F2890 38 63 00 34 */ addi r3, r3, 0x34 -/* 802F2894 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2898 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s deleted file mode 100644 index 2d79fefdf7d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F25E4: -/* 802F25E4 7C 60 1B 78 */ mr r0, r3 -/* 802F25E8 54 83 10 3A */ slwi r3, r4, 2 -/* 802F25EC 38 63 00 44 */ addi r3, r3, 0x44 -/* 802F25F0 7C 60 1A 14 */ add r3, r0, r3 -/* 802F25F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s deleted file mode 100644 index 609cc8ab04a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2340: -/* 802F2340 7C 60 1B 78 */ mr r0, r3 -/* 802F2344 54 83 10 3A */ slwi r3, r4, 2 -/* 802F2348 38 63 00 60 */ addi r3, r3, 0x60 -/* 802F234C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2350 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s deleted file mode 100644 index 2df1110acbf..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F20A0: -/* 802F20A0 7C 60 1B 78 */ mr r0, r3 -/* 802F20A4 54 83 10 3A */ slwi r3, r4, 2 -/* 802F20A8 38 63 00 98 */ addi r3, r3, 0x98 -/* 802F20AC 7C 60 1A 14 */ add r3, r0, r3 -/* 802F20B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s deleted file mode 100644 index 96072cbec53..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1E00: -/* 802F1E00 7C 60 1B 78 */ mr r0, r3 -/* 802F1E04 54 83 10 3A */ slwi r3, r4, 2 -/* 802F1E08 38 63 00 F8 */ addi r3, r3, 0xf8 -/* 802F1E0C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1E10 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s deleted file mode 100644 index 050aeb51ae9..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2808: -/* 802F2808 7C 60 1B 78 */ mr r0, r3 -/* 802F280C 54 83 10 3A */ slwi r3, r4, 2 -/* 802F2810 38 63 00 08 */ addi r3, r3, 8 -/* 802F2814 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2818 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s deleted file mode 100644 index 291686101b9..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2564: -/* 802F2564 7C 60 1B 78 */ mr r0, r3 -/* 802F2568 54 83 10 3A */ slwi r3, r4, 2 -/* 802F256C 38 63 00 0A */ addi r3, r3, 0xa -/* 802F2570 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2574 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s deleted file mode 100644 index c59a6970c7c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F22C0: -/* 802F22C0 7C 60 1B 78 */ mr r0, r3 -/* 802F22C4 54 83 10 3A */ slwi r3, r4, 2 -/* 802F22C8 38 63 00 0E */ addi r3, r3, 0xe -/* 802F22CC 7C 60 1A 14 */ add r3, r0, r3 -/* 802F22D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s deleted file mode 100644 index 8feeccc0c15..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2020: -/* 802F2020 7C 60 1B 78 */ mr r0, r3 -/* 802F2024 54 83 10 3A */ slwi r3, r4, 2 -/* 802F2028 38 63 00 16 */ addi r3, r3, 0x16 -/* 802F202C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2030 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s deleted file mode 100644 index 20f2f629d17..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1D80: -/* 802F1D80 7C 60 1B 78 */ mr r0, r3 -/* 802F1D84 54 83 10 3A */ slwi r3, r4, 2 -/* 802F1D88 38 63 00 16 */ addi r3, r3, 0x16 -/* 802F1D8C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1D90 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s deleted file mode 100644 index 65c51b8b794..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F2630: -/* 802F2630 88 63 00 32 */ lbz r3, 0x32(r3) -/* 802F2634 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s deleted file mode 100644 index f69a716f05c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F238C: -/* 802F238C 88 63 00 3E */ lbz r3, 0x3e(r3) -/* 802F2390 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s deleted file mode 100644 index 3e29211612a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F20EC: -/* 802F20EC 88 63 00 56 */ lbz r3, 0x56(r3) -/* 802F20F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s deleted file mode 100644 index b8273c962d3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_802F1E4C: -/* 802F1E4C 88 63 00 76 */ lbz r3, 0x76(r3) -/* 802F1E50 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s deleted file mode 100644 index 75d1b4d14e0..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2914: -/* 802F2914 7C 60 1B 78 */ mr r0, r3 -/* 802F2918 54 83 18 38 */ slwi r3, r4, 3 -/* 802F291C 38 63 00 2C */ addi r3, r3, 0x2c -/* 802F2920 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2924 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s deleted file mode 100644 index 45d0f4d5ead..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2674: -/* 802F2674 7C 60 1B 78 */ mr r0, r3 -/* 802F2678 54 83 18 38 */ slwi r3, r4, 3 -/* 802F267C 38 63 00 33 */ addi r3, r3, 0x33 -/* 802F2680 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2684 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s deleted file mode 100644 index 8c5fed5c274..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F23D0: -/* 802F23D0 7C 60 1B 78 */ mr r0, r3 -/* 802F23D4 54 83 18 38 */ slwi r3, r4, 3 -/* 802F23D8 38 63 00 3F */ addi r3, r3, 0x3f -/* 802F23DC 7C 60 1A 14 */ add r3, r0, r3 -/* 802F23E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s deleted file mode 100644 index 8b0be1361df..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2130: -/* 802F2130 7C 60 1B 78 */ mr r0, r3 -/* 802F2134 54 83 18 38 */ slwi r3, r4, 3 -/* 802F2138 38 63 00 57 */ addi r3, r3, 0x57 -/* 802F213C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2140 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s deleted file mode 100644 index f3ea1c899ad..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1E90: -/* 802F1E90 7C 60 1B 78 */ mr r0, r3 -/* 802F1E94 54 83 18 38 */ slwi r3, r4, 3 -/* 802F1E98 38 63 00 77 */ addi r3, r3, 0x77 -/* 802F1E9C 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1EA0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s deleted file mode 100644 index 919919376f2..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2970: -/* 802F2970 7C 60 1B 78 */ mr r0, r3 -/* 802F2974 38 64 00 46 */ addi r3, r4, 0x46 -/* 802F2978 7C 60 1A 14 */ add r3, r0, r3 -/* 802F297C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s deleted file mode 100644 index 005d99349c8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F26D0: -/* 802F26D0 7C 60 1B 78 */ mr r0, r3 -/* 802F26D4 38 64 00 58 */ addi r3, r4, 0x58 -/* 802F26D8 7C 60 1A 14 */ add r3, r0, r3 -/* 802F26DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s deleted file mode 100644 index e462f59ed2d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F242C: -/* 802F242C 7C 60 1B 78 */ mr r0, r3 -/* 802F2430 38 64 00 78 */ addi r3, r4, 0x78 -/* 802F2434 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2438 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s deleted file mode 100644 index daae3af843d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F218C: -/* 802F218C 7C 60 1B 78 */ mr r0, r3 -/* 802F2190 38 64 00 B8 */ addi r3, r4, 0xb8 -/* 802F2194 7C 60 1A 14 */ add r3, r0, r3 -/* 802F2198 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s deleted file mode 100644 index c0ca13833c1..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1EEC: -/* 802F1EEC 7C 60 1B 78 */ mr r0, r3 -/* 802F1EF0 38 64 01 28 */ addi r3, r4, 0x128 -/* 802F1EF4 7C 60 1A 14 */ add r3, r0, r3 -/* 802F1EF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s deleted file mode 100644 index cd1e1db872e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F27C4: -/* 802F27C4 54 80 08 3C */ slwi r0, r4, 1 -/* 802F27C8 7C 63 02 14 */ add r3, r3, r0 -/* 802F27CC A0 63 00 04 */ lhz r3, 4(r3) -/* 802F27D0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s deleted file mode 100644 index ad0fd23d22c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2520: -/* 802F2520 54 80 08 3C */ slwi r0, r4, 1 -/* 802F2524 7C 63 02 14 */ add r3, r3, r0 -/* 802F2528 A0 63 00 04 */ lhz r3, 4(r3) -/* 802F252C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s deleted file mode 100644 index 4c04711c836..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F227C: -/* 802F227C 54 80 08 3C */ slwi r0, r4, 1 -/* 802F2280 7C 63 02 14 */ add r3, r3, r0 -/* 802F2284 A0 63 00 04 */ lhz r3, 4(r3) -/* 802F2288 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s deleted file mode 100644 index a0282c94d15..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1FDC: -/* 802F1FDC 54 80 08 3C */ slwi r0, r4, 1 -/* 802F1FE0 7C 63 02 14 */ add r3, r3, r0 -/* 802F1FE4 A0 63 00 04 */ lhz r3, 4(r3) -/* 802F1FE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s deleted file mode 100644 index bae1f86f79e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1D3C: -/* 802F1D3C 54 80 08 3C */ slwi r0, r4, 1 -/* 802F1D40 7C 63 02 14 */ add r3, r3, r0 -/* 802F1D44 A0 63 00 04 */ lhz r3, 4(r3) -/* 802F1D48 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s deleted file mode 100644 index 6a1609b917b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F29D8: -/* 802F29D8 28 04 00 01 */ cmplwi r4, 1 -/* 802F29DC 41 80 00 0C */ blt lbl_802F29E8 -/* 802F29E0 38 60 00 00 */ li r3, 0 -/* 802F29E4 4E 80 00 20 */ blr -lbl_802F29E8: -/* 802F29E8 54 80 10 3A */ slwi r0, r4, 2 -/* 802F29EC 7C 63 02 14 */ add r3, r3, r0 -/* 802F29F0 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802F29F4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s deleted file mode 100644 index 471f617a295..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F2738: -/* 802F2738 28 04 00 02 */ cmplwi r4, 2 -/* 802F273C 41 80 00 0C */ blt lbl_802F2748 -/* 802F2740 38 60 00 00 */ li r3, 0 -/* 802F2744 4E 80 00 20 */ blr -lbl_802F2748: -/* 802F2748 54 80 10 3A */ slwi r0, r4, 2 -/* 802F274C 7C 63 02 14 */ add r3, r3, r0 -/* 802F2750 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802F2754 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s deleted file mode 100644 index 70a40fac47c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F2494: -/* 802F2494 28 04 00 04 */ cmplwi r4, 4 -/* 802F2498 41 80 00 0C */ blt lbl_802F24A4 -/* 802F249C 38 60 00 00 */ li r3, 0 -/* 802F24A0 4E 80 00 20 */ blr -lbl_802F24A4: -/* 802F24A4 54 80 10 3A */ slwi r0, r4, 2 -/* 802F24A8 7C 63 02 14 */ add r3, r3, r0 -/* 802F24AC 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802F24B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s deleted file mode 100644 index c7a6d358989..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F21F4: -/* 802F21F4 28 04 00 08 */ cmplwi r4, 8 -/* 802F21F8 41 80 00 0C */ blt lbl_802F2204 -/* 802F21FC 38 60 00 00 */ li r3, 0 -/* 802F2200 4E 80 00 20 */ blr -lbl_802F2204: -/* 802F2204 54 80 10 3A */ slwi r0, r4, 2 -/* 802F2208 7C 63 02 14 */ add r3, r3, r0 -/* 802F220C 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802F2210 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s deleted file mode 100644 index 9349f2381a1..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F1F54: -/* 802F1F54 28 04 00 08 */ cmplwi r4, 8 -/* 802F1F58 41 80 00 0C */ blt lbl_802F1F64 -/* 802F1F5C 38 60 00 00 */ li r3, 0 -/* 802F1F60 4E 80 00 20 */ blr -lbl_802F1F64: -/* 802F1F64 54 80 10 3A */ slwi r0, r4, 2 -/* 802F1F68 7C 63 02 14 */ add r3, r3, r0 -/* 802F1F6C 80 63 01 6C */ lwz r3, 0x16c(r3) -/* 802F1F70 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock1Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock1Fv.s deleted file mode 100644 index 7d5250a055a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock1Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F27A0: -/* 802F27A0 3C 60 54 56 */ lis r3, 0x5456 /* 0x54564231@ha */ -/* 802F27A4 38 63 42 31 */ addi r3, r3, 0x4231 /* 0x54564231@l */ -/* 802F27A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock2Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock2Fv.s deleted file mode 100644 index d4dc7ef636c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock2Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F24FC: -/* 802F24FC 3C 60 54 56 */ lis r3, 0x5456 /* 0x54564232@ha */ -/* 802F2500 38 63 42 32 */ addi r3, r3, 0x4232 /* 0x54564232@l */ -/* 802F2504 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock4Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock4Fv.s deleted file mode 100644 index d29060a65ae..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock4Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2258: -/* 802F2258 3C 60 54 56 */ lis r3, 0x5456 /* 0x54564234@ha */ -/* 802F225C 38 63 42 34 */ addi r3, r3, 0x4234 /* 0x54564234@l */ -/* 802F2260 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock8Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock8Fv.s deleted file mode 100644 index 3ab2b1bb29b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock8Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1FB8: -/* 802F1FB8 3C 60 54 56 */ lis r3, 0x5456 /* 0x54564238@ha */ -/* 802F1FBC 38 63 42 38 */ addi r3, r3, 0x4238 /* 0x54564238@l */ -/* 802F1FC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__13J2DTevBlock16Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__13J2DTevBlock16Fv.s deleted file mode 100644 index 61de9b42ee2..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__13J2DTevBlock16Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1D18: -/* 802F1D18 3C 60 54 56 */ lis r3, 0x5456 /* 0x54563136@ha */ -/* 802F1D1C 38 63 31 36 */ addi r3, r3, 0x3136 /* 0x54563136@l */ -/* 802F1D20 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/getType__15J2DIndBlockFullFv.s b/asm/JSystem/J2DGraph/J2DMatBlock/getType__15J2DIndBlockFullFv.s deleted file mode 100644 index 548517f3b7d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/getType__15J2DIndBlockFullFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1B94: -/* 802F1B94 3C 60 49 42 */ lis r3, 0x4942 /* 0x49424C46@ha */ -/* 802F1B98 38 63 4C 46 */ addi r3, r3, 0x4C46 /* 0x49424C46@l */ -/* 802F1B9C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s deleted file mode 100644 index ca1ba371f64..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802EBDE4: -/* 802EBDE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EBDE8 7C 08 02 A6 */ mflr r0 -/* 802EBDEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EBDF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EBDF4 93 C1 00 08 */ stw r30, 8(r1) -/* 802EBDF8 7C 7E 1B 78 */ mr r30, r3 -/* 802EBDFC 7C BF 2B 78 */ mr r31, r5 -/* 802EBE00 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802EBE04 28 03 00 00 */ cmplwi r3, 0 -/* 802EBE08 41 82 00 18 */ beq lbl_802EBE20 -/* 802EBE0C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EBE10 28 00 00 00 */ cmplwi r0, 0 -/* 802EBE14 41 82 00 0C */ beq lbl_802EBE20 -/* 802EBE18 38 60 00 00 */ li r3, 0 -/* 802EBE1C 48 00 00 58 */ b lbl_802EBE74 -lbl_802EBE20: -/* 802EBE20 28 04 00 00 */ cmplwi r4, 0 -/* 802EBE24 40 82 00 0C */ bne lbl_802EBE30 -/* 802EBE28 28 1F 00 00 */ cmplwi r31, 0 -/* 802EBE2C 40 82 00 0C */ bne lbl_802EBE38 -lbl_802EBE30: -/* 802EBE30 38 60 00 00 */ li r3, 0 -/* 802EBE34 48 00 00 40 */ b lbl_802EBE74 -lbl_802EBE38: -/* 802EBE38 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EBE3C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EBE40 41 82 00 0C */ beq lbl_802EBE4C -/* 802EBE44 38 80 00 01 */ li r4, 1 -/* 802EBE48 4B FF 23 ED */ bl __dt__10JUTTextureFv -lbl_802EBE4C: -/* 802EBE4C 93 FE 00 50 */ stw r31, 0x50(r30) -/* 802EBE50 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EBE54 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBE58 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 802EBE5C 38 00 00 00 */ li r0, 0 -/* 802EBE60 90 1E 00 54 */ stw r0, 0x54(r30) -/* 802EBE64 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EBE68 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EBE6C B0 1E 00 04 */ sth r0, 4(r30) -/* 802EBE70 38 60 00 01 */ li r3, 1 -lbl_802EBE74: -/* 802EBE74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EBE78 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EBE7C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EBE80 7C 08 03 A6 */ mtlr r0 -/* 802EBE84 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBE88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s deleted file mode 100644 index 4a6059d4715..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F29A8: -/* 802F29A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F29AC 7C 08 02 A6 */ mflr r0 -/* 802F29B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F29B4 38 C0 00 00 */ li r6, 0 -/* 802F29B8 81 83 00 00 */ lwz r12, 0(r3) -/* 802F29BC 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F29C0 7D 89 03 A6 */ mtctr r12 -/* 802F29C4 4E 80 04 21 */ bctrl -/* 802F29C8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F29CC 7C 08 03 A6 */ mtlr r0 -/* 802F29D0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F29D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s deleted file mode 100644 index 46edeec99ee..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s +++ /dev/null @@ -1,83 +0,0 @@ -lbl_802EBCC0: -/* 802EBCC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EBCC4 7C 08 02 A6 */ mflr r0 -/* 802EBCC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EBCCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBCD0 48 07 65 09 */ bl _savegpr_28 -/* 802EBCD4 7C 7C 1B 78 */ mr r28, r3 -/* 802EBCD8 7C BD 2B 78 */ mr r29, r5 -/* 802EBCDC 7C DE 33 78 */ mr r30, r6 -/* 802EBCE0 28 04 00 00 */ cmplwi r4, 0 -/* 802EBCE4 40 82 00 0C */ bne lbl_802EBCF0 -/* 802EBCE8 28 1D 00 00 */ cmplwi r29, 0 -/* 802EBCEC 40 82 00 0C */ bne lbl_802EBCF8 -lbl_802EBCF0: -/* 802EBCF0 38 60 00 00 */ li r3, 0 -/* 802EBCF4 48 00 00 D8 */ b lbl_802EBDCC -lbl_802EBCF8: -/* 802EBCF8 80 7C 00 50 */ lwz r3, 0x50(r28) -/* 802EBCFC 28 03 00 00 */ cmplwi r3, 0 -/* 802EBD00 41 82 00 18 */ beq lbl_802EBD18 -/* 802EBD04 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EBD08 28 00 00 00 */ cmplwi r0, 0 -/* 802EBD0C 41 82 00 0C */ beq lbl_802EBD18 -/* 802EBD10 38 60 00 00 */ li r3, 0 -/* 802EBD14 48 00 00 B8 */ b lbl_802EBDCC -lbl_802EBD18: -/* 802EBD18 28 03 00 00 */ cmplwi r3, 0 -/* 802EBD1C 40 82 00 64 */ bne lbl_802EBD80 -/* 802EBD20 38 60 00 40 */ li r3, 0x40 -/* 802EBD24 4B FE 2F 29 */ bl __nw__FUl -/* 802EBD28 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EBD2C 41 82 00 24 */ beq lbl_802EBD50 -/* 802EBD30 38 00 00 00 */ li r0, 0 -/* 802EBD34 90 1F 00 28 */ stw r0, 0x28(r31) -/* 802EBD38 7F A4 EB 78 */ mr r4, r29 -/* 802EBD3C 38 A0 00 00 */ li r5, 0 -/* 802EBD40 4B FF 25 69 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802EBD44 88 1F 00 3B */ lbz r0, 0x3b(r31) -/* 802EBD48 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EBD4C 98 1F 00 3B */ stb r0, 0x3b(r31) -lbl_802EBD50: -/* 802EBD50 93 FC 00 50 */ stw r31, 0x50(r28) -/* 802EBD54 80 7C 00 50 */ lwz r3, 0x50(r28) -/* 802EBD58 28 03 00 00 */ cmplwi r3, 0 -/* 802EBD5C 40 82 00 0C */ bne lbl_802EBD68 -/* 802EBD60 38 60 00 00 */ li r3, 0 -/* 802EBD64 48 00 00 68 */ b lbl_802EBDCC -lbl_802EBD68: -/* 802EBD68 28 1E 00 00 */ cmplwi r30, 0 -/* 802EBD6C 41 82 00 38 */ beq lbl_802EBDA4 -/* 802EBD70 7F A4 EB 78 */ mr r4, r29 -/* 802EBD74 7F C5 F3 78 */ mr r5, r30 -/* 802EBD78 4B FF 26 D5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette -/* 802EBD7C 48 00 00 28 */ b lbl_802EBDA4 -lbl_802EBD80: -/* 802EBD80 28 1E 00 00 */ cmplwi r30, 0 -/* 802EBD84 40 82 00 14 */ bne lbl_802EBD98 -/* 802EBD88 7F A4 EB 78 */ mr r4, r29 -/* 802EBD8C 38 A0 00 00 */ li r5, 0 -/* 802EBD90 4B FF 25 19 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802EBD94 48 00 00 10 */ b lbl_802EBDA4 -lbl_802EBD98: -/* 802EBD98 7F A4 EB 78 */ mr r4, r29 -/* 802EBD9C 7F C5 F3 78 */ mr r5, r30 -/* 802EBDA0 4B FF 26 AD */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette -lbl_802EBDA4: -/* 802EBDA4 88 1C 00 5C */ lbz r0, 0x5c(r28) -/* 802EBDA8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBDAC 60 00 00 01 */ ori r0, r0, 1 -/* 802EBDB0 98 1C 00 5C */ stb r0, 0x5c(r28) -/* 802EBDB4 38 00 00 00 */ li r0, 0 -/* 802EBDB8 90 1C 00 54 */ stw r0, 0x54(r28) -/* 802EBDBC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EBDC0 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EBDC4 B0 1C 00 04 */ sth r0, 4(r28) -/* 802EBDC8 38 60 00 01 */ li r3, 1 -lbl_802EBDCC: -/* 802EBDCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBDD0 48 07 64 55 */ bl _restgpr_28 -/* 802EBDD4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EBDD8 7C 08 03 A6 */ mtlr r0 -/* 802EBDDC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EBDE0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s deleted file mode 100644 index e00820857b6..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s +++ /dev/null @@ -1,100 +0,0 @@ -lbl_802ECDE8: -/* 802ECDE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ECDEC 7C 08 02 A6 */ mflr r0 -/* 802ECDF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ECDF4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECDF8 48 07 53 E5 */ bl _savegpr_29 -/* 802ECDFC 7C 7D 1B 78 */ mr r29, r3 -/* 802ECE00 7C 9E 23 78 */ mr r30, r4 -/* 802ECE04 7C BF 2B 78 */ mr r31, r5 -/* 802ECE08 28 1E 00 02 */ cmplwi r30, 2 -/* 802ECE0C 40 80 00 0C */ bge lbl_802ECE18 -/* 802ECE10 28 1F 00 00 */ cmplwi r31, 0 -/* 802ECE14 40 82 00 0C */ bne lbl_802ECE20 -lbl_802ECE18: -/* 802ECE18 38 60 00 00 */ li r3, 0 -/* 802ECE1C 48 00 01 14 */ b lbl_802ECF30 -lbl_802ECE20: -/* 802ECE20 38 80 00 00 */ li r4, 0 -/* 802ECE24 48 00 00 28 */ b lbl_802ECE4C -lbl_802ECE28: -/* 802ECE28 54 83 15 BA */ rlwinm r3, r4, 2, 0x16, 0x1d -/* 802ECE2C 38 03 00 64 */ addi r0, r3, 0x64 -/* 802ECE30 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802ECE34 28 03 00 00 */ cmplwi r3, 0 -/* 802ECE38 41 82 00 20 */ beq lbl_802ECE58 -/* 802ECE3C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802ECE40 28 00 00 00 */ cmplwi r0, 0 -/* 802ECE44 41 82 00 14 */ beq lbl_802ECE58 -/* 802ECE48 38 84 00 01 */ addi r4, r4, 1 -lbl_802ECE4C: -/* 802ECE4C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802ECE50 28 00 00 02 */ cmplwi r0, 2 -/* 802ECE54 41 80 FF D4 */ blt lbl_802ECE28 -lbl_802ECE58: -/* 802ECE58 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802ECE5C 7C 00 F0 40 */ cmplw r0, r30 -/* 802ECE60 40 80 00 0C */ bge lbl_802ECE6C -/* 802ECE64 38 60 00 00 */ li r3, 0 -/* 802ECE68 48 00 00 C8 */ b lbl_802ECF30 -lbl_802ECE6C: -/* 802ECE6C 28 00 00 02 */ cmplwi r0, 2 -/* 802ECE70 40 82 00 0C */ bne lbl_802ECE7C -/* 802ECE74 38 60 00 00 */ li r3, 0 -/* 802ECE78 48 00 00 B8 */ b lbl_802ECF30 -lbl_802ECE7C: -/* 802ECE7C 80 7D 00 68 */ lwz r3, 0x68(r29) -/* 802ECE80 28 03 00 00 */ cmplwi r3, 0 -/* 802ECE84 41 82 00 30 */ beq lbl_802ECEB4 -/* 802ECE88 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802ECE8C 28 00 00 00 */ cmplwi r0, 0 -/* 802ECE90 40 82 00 24 */ bne lbl_802ECEB4 -/* 802ECE94 88 1D 00 78 */ lbz r0, 0x78(r29) -/* 802ECE98 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 802ECE9C 41 82 00 0C */ beq lbl_802ECEA8 -/* 802ECEA0 38 80 00 01 */ li r4, 1 -/* 802ECEA4 4B FF 13 91 */ bl __dt__10JUTTextureFv -lbl_802ECEA8: -/* 802ECEA8 88 1D 00 78 */ lbz r0, 0x78(r29) -/* 802ECEAC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d -/* 802ECEB0 98 1D 00 78 */ stb r0, 0x78(r29) -lbl_802ECEB4: -/* 802ECEB4 28 1E 00 00 */ cmplwi r30, 0 -/* 802ECEB8 40 82 00 1C */ bne lbl_802ECED4 -/* 802ECEBC 80 1D 00 64 */ lwz r0, 0x64(r29) -/* 802ECEC0 90 1D 00 68 */ stw r0, 0x68(r29) -/* 802ECEC4 80 1D 00 6C */ lwz r0, 0x6c(r29) -/* 802ECEC8 90 1D 00 70 */ stw r0, 0x70(r29) -/* 802ECECC A0 1D 00 04 */ lhz r0, 4(r29) -/* 802ECED0 B0 1D 00 06 */ sth r0, 6(r29) -lbl_802ECED4: -/* 802ECED4 57 C0 10 3A */ slwi r0, r30, 2 -/* 802ECED8 7C 7D 02 14 */ add r3, r29, r0 -/* 802ECEDC 93 E3 00 64 */ stw r31, 0x64(r3) -/* 802ECEE0 38 00 00 00 */ li r0, 0 -/* 802ECEE4 90 03 00 6C */ stw r0, 0x6c(r3) -/* 802ECEE8 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802ECEEC 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802ECEF0 57 C0 08 3C */ slwi r0, r30, 1 -/* 802ECEF4 7C 7D 02 14 */ add r3, r29, r0 -/* 802ECEF8 B0 83 00 04 */ sth r4, 4(r3) -/* 802ECEFC 7F A3 EB 78 */ mr r3, r29 -/* 802ECF00 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 802ECF04 38 A0 00 01 */ li r5, 1 -/* 802ECF08 81 9D 00 00 */ lwz r12, 0(r29) -/* 802ECF0C 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802ECF10 7D 89 03 A6 */ mtctr r12 -/* 802ECF14 4E 80 04 21 */ bctrl -/* 802ECF18 88 7D 00 78 */ lbz r3, 0x78(r29) -/* 802ECF1C 38 00 00 01 */ li r0, 1 -/* 802ECF20 7C 00 F0 30 */ slw r0, r0, r30 -/* 802ECF24 7C 60 00 78 */ andc r0, r3, r0 -/* 802ECF28 98 1D 00 78 */ stb r0, 0x78(r29) -/* 802ECF2C 38 60 00 01 */ li r3, 1 -lbl_802ECF30: -/* 802ECF30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECF34 48 07 52 F5 */ bl _restgpr_29 -/* 802ECF38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802ECF3C 7C 08 03 A6 */ mtlr r0 -/* 802ECF40 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ECF44 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s deleted file mode 100644 index 2bd119b0021..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F2708: -/* 802F2708 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F270C 7C 08 02 A6 */ mflr r0 -/* 802F2710 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F2714 38 C0 00 00 */ li r6, 0 -/* 802F2718 81 83 00 00 */ lwz r12, 0(r3) -/* 802F271C 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F2720 7D 89 03 A6 */ mtctr r12 -/* 802F2724 4E 80 04 21 */ bctrl -/* 802F2728 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F272C 7C 08 03 A6 */ mtlr r0 -/* 802F2730 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F2734 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s deleted file mode 100644 index f594cdcde97..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_802EE1D4: -/* 802EE1D4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EE1D8 7C 08 02 A6 */ mflr r0 -/* 802EE1DC 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EE1E0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE1E4 48 07 3F F9 */ bl _savegpr_29 -/* 802EE1E8 7C 7D 1B 78 */ mr r29, r3 -/* 802EE1EC 7C 9E 23 78 */ mr r30, r4 -/* 802EE1F0 7C BF 2B 78 */ mr r31, r5 -/* 802EE1F4 28 1E 00 04 */ cmplwi r30, 4 -/* 802EE1F8 40 80 00 0C */ bge lbl_802EE204 -/* 802EE1FC 28 1F 00 00 */ cmplwi r31, 0 -/* 802EE200 40 82 00 0C */ bne lbl_802EE20C -lbl_802EE204: -/* 802EE204 38 60 00 00 */ li r3, 0 -/* 802EE208 48 00 01 44 */ b lbl_802EE34C -lbl_802EE20C: -/* 802EE20C 38 80 00 00 */ li r4, 0 -/* 802EE210 48 00 00 28 */ b lbl_802EE238 -lbl_802EE214: -/* 802EE214 54 83 15 BA */ rlwinm r3, r4, 2, 0x16, 0x1d -/* 802EE218 38 03 00 8C */ addi r0, r3, 0x8c -/* 802EE21C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802EE220 28 03 00 00 */ cmplwi r3, 0 -/* 802EE224 41 82 00 20 */ beq lbl_802EE244 -/* 802EE228 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EE22C 28 00 00 00 */ cmplwi r0, 0 -/* 802EE230 41 82 00 14 */ beq lbl_802EE244 -/* 802EE234 38 84 00 01 */ addi r4, r4, 1 -lbl_802EE238: -/* 802EE238 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802EE23C 28 00 00 04 */ cmplwi r0, 4 -/* 802EE240 41 80 FF D4 */ blt lbl_802EE214 -lbl_802EE244: -/* 802EE244 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802EE248 7C 00 F0 40 */ cmplw r0, r30 -/* 802EE24C 40 80 00 0C */ bge lbl_802EE258 -/* 802EE250 38 60 00 00 */ li r3, 0 -/* 802EE254 48 00 00 F8 */ b lbl_802EE34C -lbl_802EE258: -/* 802EE258 28 00 00 04 */ cmplwi r0, 4 -/* 802EE25C 40 82 00 0C */ bne lbl_802EE268 -/* 802EE260 38 60 00 00 */ li r3, 0 -/* 802EE264 48 00 00 E8 */ b lbl_802EE34C -lbl_802EE268: -/* 802EE268 80 7D 00 98 */ lwz r3, 0x98(r29) -/* 802EE26C 28 03 00 00 */ cmplwi r3, 0 -/* 802EE270 41 82 00 30 */ beq lbl_802EE2A0 -/* 802EE274 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EE278 28 00 00 00 */ cmplwi r0, 0 -/* 802EE27C 40 82 00 24 */ bne lbl_802EE2A0 -/* 802EE280 88 1D 00 B0 */ lbz r0, 0xb0(r29) -/* 802EE284 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c -/* 802EE288 41 82 00 0C */ beq lbl_802EE294 -/* 802EE28C 38 80 00 01 */ li r4, 1 -/* 802EE290 4B FE FF A5 */ bl __dt__10JUTTextureFv -lbl_802EE294: -/* 802EE294 88 1D 00 B0 */ lbz r0, 0xb0(r29) -/* 802EE298 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b -/* 802EE29C 98 1D 00 B0 */ stb r0, 0xb0(r29) -lbl_802EE2A0: -/* 802EE2A0 38 E0 00 03 */ li r7, 3 -/* 802EE2A4 48 00 00 40 */ b lbl_802EE2E4 -lbl_802EE2A8: -/* 802EE2A8 54 80 10 3A */ slwi r0, r4, 2 -/* 802EE2AC 7C BD 02 14 */ add r5, r29, r0 -/* 802EE2B0 80 65 00 88 */ lwz r3, 0x88(r5) -/* 802EE2B4 54 E0 15 BA */ rlwinm r0, r7, 2, 0x16, 0x1d -/* 802EE2B8 7C DD 02 14 */ add r6, r29, r0 -/* 802EE2BC 90 66 00 8C */ stw r3, 0x8c(r6) -/* 802EE2C0 80 05 00 98 */ lwz r0, 0x98(r5) -/* 802EE2C4 90 06 00 9C */ stw r0, 0x9c(r6) -/* 802EE2C8 54 83 08 3C */ slwi r3, r4, 1 -/* 802EE2CC 38 03 00 02 */ addi r0, r3, 2 -/* 802EE2D0 7C 9D 02 2E */ lhzx r4, r29, r0 -/* 802EE2D4 54 E3 0D FC */ rlwinm r3, r7, 1, 0x17, 0x1e -/* 802EE2D8 38 03 00 04 */ addi r0, r3, 4 -/* 802EE2DC 7C 9D 03 2E */ sthx r4, r29, r0 -/* 802EE2E0 38 E7 FF FF */ addi r7, r7, -1 -lbl_802EE2E4: -/* 802EE2E4 54 E4 06 3E */ clrlwi r4, r7, 0x18 -/* 802EE2E8 7C 04 F0 40 */ cmplw r4, r30 -/* 802EE2EC 41 81 FF BC */ bgt lbl_802EE2A8 -/* 802EE2F0 57 C0 10 3A */ slwi r0, r30, 2 -/* 802EE2F4 7C 7D 02 14 */ add r3, r29, r0 -/* 802EE2F8 93 E3 00 8C */ stw r31, 0x8c(r3) -/* 802EE2FC 38 00 00 00 */ li r0, 0 -/* 802EE300 90 03 00 9C */ stw r0, 0x9c(r3) -/* 802EE304 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EE308 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EE30C 57 C0 08 3C */ slwi r0, r30, 1 -/* 802EE310 7C 7D 02 14 */ add r3, r29, r0 -/* 802EE314 B0 83 00 04 */ sth r4, 4(r3) -/* 802EE318 7F A3 EB 78 */ mr r3, r29 -/* 802EE31C 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 802EE320 38 A0 00 01 */ li r5, 1 -/* 802EE324 81 9D 00 00 */ lwz r12, 0(r29) -/* 802EE328 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802EE32C 7D 89 03 A6 */ mtctr r12 -/* 802EE330 4E 80 04 21 */ bctrl -/* 802EE334 88 7D 00 B0 */ lbz r3, 0xb0(r29) -/* 802EE338 38 00 00 01 */ li r0, 1 -/* 802EE33C 7C 00 F0 30 */ slw r0, r0, r30 -/* 802EE340 7C 60 00 78 */ andc r0, r3, r0 -/* 802EE344 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 802EE348 38 60 00 01 */ li r3, 1 -lbl_802EE34C: -/* 802EE34C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE350 48 07 3E D9 */ bl _restgpr_29 -/* 802EE354 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EE358 7C 08 03 A6 */ mtlr r0 -/* 802EE35C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EE360 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s deleted file mode 100644 index 228592a93a2..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F2464: -/* 802F2464 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F2468 7C 08 02 A6 */ mflr r0 -/* 802F246C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F2470 38 C0 00 00 */ li r6, 0 -/* 802F2474 81 83 00 00 */ lwz r12, 0(r3) -/* 802F2478 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F247C 7D 89 03 A6 */ mtctr r12 -/* 802F2480 4E 80 04 21 */ bctrl -/* 802F2484 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F2488 7C 08 03 A6 */ mtlr r0 -/* 802F248C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F2490 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s deleted file mode 100644 index bfc028e7241..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_802EF67C: -/* 802EF67C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EF680 7C 08 02 A6 */ mflr r0 -/* 802EF684 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EF688 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF68C 48 07 2B 51 */ bl _savegpr_29 -/* 802EF690 7C 7D 1B 78 */ mr r29, r3 -/* 802EF694 7C 9E 23 78 */ mr r30, r4 -/* 802EF698 7C BF 2B 78 */ mr r31, r5 -/* 802EF69C 28 1E 00 08 */ cmplwi r30, 8 -/* 802EF6A0 40 80 00 0C */ bge lbl_802EF6AC -/* 802EF6A4 28 1F 00 00 */ cmplwi r31, 0 -/* 802EF6A8 40 82 00 0C */ bne lbl_802EF6B4 -lbl_802EF6AC: -/* 802EF6AC 38 60 00 00 */ li r3, 0 -/* 802EF6B0 48 00 01 44 */ b lbl_802EF7F4 -lbl_802EF6B4: -/* 802EF6B4 38 80 00 00 */ li r4, 0 -/* 802EF6B8 48 00 00 28 */ b lbl_802EF6E0 -lbl_802EF6BC: -/* 802EF6BC 54 83 15 BA */ rlwinm r3, r4, 2, 0x16, 0x1d -/* 802EF6C0 38 03 00 DC */ addi r0, r3, 0xdc -/* 802EF6C4 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802EF6C8 28 03 00 00 */ cmplwi r3, 0 -/* 802EF6CC 41 82 00 20 */ beq lbl_802EF6EC -/* 802EF6D0 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EF6D4 28 00 00 00 */ cmplwi r0, 0 -/* 802EF6D8 41 82 00 14 */ beq lbl_802EF6EC -/* 802EF6DC 38 84 00 01 */ addi r4, r4, 1 -lbl_802EF6E0: -/* 802EF6E0 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802EF6E4 28 00 00 08 */ cmplwi r0, 8 -/* 802EF6E8 41 80 FF D4 */ blt lbl_802EF6BC -lbl_802EF6EC: -/* 802EF6EC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802EF6F0 7C 00 F0 40 */ cmplw r0, r30 -/* 802EF6F4 40 80 00 0C */ bge lbl_802EF700 -/* 802EF6F8 38 60 00 00 */ li r3, 0 -/* 802EF6FC 48 00 00 F8 */ b lbl_802EF7F4 -lbl_802EF700: -/* 802EF700 28 00 00 08 */ cmplwi r0, 8 -/* 802EF704 40 82 00 0C */ bne lbl_802EF710 -/* 802EF708 38 60 00 00 */ li r3, 0 -/* 802EF70C 48 00 00 E8 */ b lbl_802EF7F4 -lbl_802EF710: -/* 802EF710 80 7D 00 F8 */ lwz r3, 0xf8(r29) -/* 802EF714 28 03 00 00 */ cmplwi r3, 0 -/* 802EF718 41 82 00 30 */ beq lbl_802EF748 -/* 802EF71C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EF720 28 00 00 00 */ cmplwi r0, 0 -/* 802EF724 40 82 00 24 */ bne lbl_802EF748 -/* 802EF728 88 1D 01 20 */ lbz r0, 0x120(r29) -/* 802EF72C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EF730 41 82 00 0C */ beq lbl_802EF73C -/* 802EF734 38 80 00 01 */ li r4, 1 -/* 802EF738 4B FE EA FD */ bl __dt__10JUTTextureFv -lbl_802EF73C: -/* 802EF73C 88 1D 01 20 */ lbz r0, 0x120(r29) -/* 802EF740 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802EF744 98 1D 01 20 */ stb r0, 0x120(r29) -lbl_802EF748: -/* 802EF748 38 E0 00 07 */ li r7, 7 -/* 802EF74C 48 00 00 40 */ b lbl_802EF78C -lbl_802EF750: -/* 802EF750 54 80 10 3A */ slwi r0, r4, 2 -/* 802EF754 7C BD 02 14 */ add r5, r29, r0 -/* 802EF758 80 65 00 D8 */ lwz r3, 0xd8(r5) -/* 802EF75C 54 E0 15 BA */ rlwinm r0, r7, 2, 0x16, 0x1d -/* 802EF760 7C DD 02 14 */ add r6, r29, r0 -/* 802EF764 90 66 00 DC */ stw r3, 0xdc(r6) -/* 802EF768 80 05 00 F8 */ lwz r0, 0xf8(r5) -/* 802EF76C 90 06 00 FC */ stw r0, 0xfc(r6) -/* 802EF770 54 83 08 3C */ slwi r3, r4, 1 -/* 802EF774 38 03 00 02 */ addi r0, r3, 2 -/* 802EF778 7C 9D 02 2E */ lhzx r4, r29, r0 -/* 802EF77C 54 E3 0D FC */ rlwinm r3, r7, 1, 0x17, 0x1e -/* 802EF780 38 03 00 04 */ addi r0, r3, 4 -/* 802EF784 7C 9D 03 2E */ sthx r4, r29, r0 -/* 802EF788 38 E7 FF FF */ addi r7, r7, -1 -lbl_802EF78C: -/* 802EF78C 54 E4 06 3E */ clrlwi r4, r7, 0x18 -/* 802EF790 7C 04 F0 40 */ cmplw r4, r30 -/* 802EF794 41 81 FF BC */ bgt lbl_802EF750 -/* 802EF798 57 C0 10 3A */ slwi r0, r30, 2 -/* 802EF79C 7C 7D 02 14 */ add r3, r29, r0 -/* 802EF7A0 93 E3 00 DC */ stw r31, 0xdc(r3) -/* 802EF7A4 38 00 00 00 */ li r0, 0 -/* 802EF7A8 90 03 00 FC */ stw r0, 0xfc(r3) -/* 802EF7AC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EF7B0 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EF7B4 57 C0 08 3C */ slwi r0, r30, 1 -/* 802EF7B8 7C 7D 02 14 */ add r3, r29, r0 -/* 802EF7BC B0 83 00 04 */ sth r4, 4(r3) -/* 802EF7C0 7F A3 EB 78 */ mr r3, r29 -/* 802EF7C4 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 802EF7C8 38 A0 00 01 */ li r5, 1 -/* 802EF7CC 81 9D 00 00 */ lwz r12, 0(r29) -/* 802EF7D0 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802EF7D4 7D 89 03 A6 */ mtctr r12 -/* 802EF7D8 4E 80 04 21 */ bctrl -/* 802EF7DC 88 7D 01 20 */ lbz r3, 0x120(r29) -/* 802EF7E0 38 00 00 01 */ li r0, 1 -/* 802EF7E4 7C 00 F0 30 */ slw r0, r0, r30 -/* 802EF7E8 7C 60 00 78 */ andc r0, r3, r0 -/* 802EF7EC 98 1D 01 20 */ stb r0, 0x120(r29) -/* 802EF7F0 38 60 00 01 */ li r3, 1 -lbl_802EF7F4: -/* 802EF7F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF7F8 48 07 2A 31 */ bl _restgpr_29 -/* 802EF7FC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EF800 7C 08 03 A6 */ mtlr r0 -/* 802EF804 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EF808 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s deleted file mode 100644 index 6e5c530d124..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F21C4: -/* 802F21C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F21C8 7C 08 02 A6 */ mflr r0 -/* 802F21CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F21D0 38 C0 00 00 */ li r6, 0 -/* 802F21D4 81 83 00 00 */ lwz r12, 0(r3) -/* 802F21D8 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F21DC 7D 89 03 A6 */ mtctr r12 -/* 802F21E0 4E 80 04 21 */ bctrl -/* 802F21E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F21E8 7C 08 03 A6 */ mtlr r0 -/* 802F21EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F21F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s deleted file mode 100644 index 8624c48c267..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_802F0AFC: -/* 802F0AFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F0B00 7C 08 02 A6 */ mflr r0 -/* 802F0B04 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F0B08 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0B0C 48 07 16 D1 */ bl _savegpr_29 -/* 802F0B10 7C 7D 1B 78 */ mr r29, r3 -/* 802F0B14 7C 9E 23 78 */ mr r30, r4 -/* 802F0B18 7C BF 2B 78 */ mr r31, r5 -/* 802F0B1C 28 1E 00 08 */ cmplwi r30, 8 -/* 802F0B20 40 80 00 0C */ bge lbl_802F0B2C -/* 802F0B24 28 1F 00 00 */ cmplwi r31, 0 -/* 802F0B28 40 82 00 0C */ bne lbl_802F0B34 -lbl_802F0B2C: -/* 802F0B2C 38 60 00 00 */ li r3, 0 -/* 802F0B30 48 00 01 44 */ b lbl_802F0C74 -lbl_802F0B34: -/* 802F0B34 38 80 00 00 */ li r4, 0 -/* 802F0B38 48 00 00 28 */ b lbl_802F0B60 -lbl_802F0B3C: -/* 802F0B3C 54 83 15 BA */ rlwinm r3, r4, 2, 0x16, 0x1d -/* 802F0B40 38 03 01 6C */ addi r0, r3, 0x16c -/* 802F0B44 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802F0B48 28 03 00 00 */ cmplwi r3, 0 -/* 802F0B4C 41 82 00 20 */ beq lbl_802F0B6C -/* 802F0B50 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802F0B54 28 00 00 00 */ cmplwi r0, 0 -/* 802F0B58 41 82 00 14 */ beq lbl_802F0B6C -/* 802F0B5C 38 84 00 01 */ addi r4, r4, 1 -lbl_802F0B60: -/* 802F0B60 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802F0B64 28 00 00 08 */ cmplwi r0, 8 -/* 802F0B68 41 80 FF D4 */ blt lbl_802F0B3C -lbl_802F0B6C: -/* 802F0B6C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 802F0B70 7C 00 F0 40 */ cmplw r0, r30 -/* 802F0B74 40 80 00 0C */ bge lbl_802F0B80 -/* 802F0B78 38 60 00 00 */ li r3, 0 -/* 802F0B7C 48 00 00 F8 */ b lbl_802F0C74 -lbl_802F0B80: -/* 802F0B80 28 00 00 08 */ cmplwi r0, 8 -/* 802F0B84 40 82 00 0C */ bne lbl_802F0B90 -/* 802F0B88 38 60 00 00 */ li r3, 0 -/* 802F0B8C 48 00 00 E8 */ b lbl_802F0C74 -lbl_802F0B90: -/* 802F0B90 80 7D 01 88 */ lwz r3, 0x188(r29) -/* 802F0B94 28 03 00 00 */ cmplwi r3, 0 -/* 802F0B98 41 82 00 30 */ beq lbl_802F0BC8 -/* 802F0B9C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802F0BA0 28 00 00 00 */ cmplwi r0, 0 -/* 802F0BA4 40 82 00 24 */ bne lbl_802F0BC8 -/* 802F0BA8 88 1D 01 B0 */ lbz r0, 0x1b0(r29) -/* 802F0BAC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802F0BB0 41 82 00 0C */ beq lbl_802F0BBC -/* 802F0BB4 38 80 00 01 */ li r4, 1 -/* 802F0BB8 4B FE D6 7D */ bl __dt__10JUTTextureFv -lbl_802F0BBC: -/* 802F0BBC 88 1D 01 B0 */ lbz r0, 0x1b0(r29) -/* 802F0BC0 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802F0BC4 98 1D 01 B0 */ stb r0, 0x1b0(r29) -lbl_802F0BC8: -/* 802F0BC8 38 E0 00 07 */ li r7, 7 -/* 802F0BCC 48 00 00 40 */ b lbl_802F0C0C -lbl_802F0BD0: -/* 802F0BD0 54 80 10 3A */ slwi r0, r4, 2 -/* 802F0BD4 7C BD 02 14 */ add r5, r29, r0 -/* 802F0BD8 80 65 01 68 */ lwz r3, 0x168(r5) -/* 802F0BDC 54 E0 15 BA */ rlwinm r0, r7, 2, 0x16, 0x1d -/* 802F0BE0 7C DD 02 14 */ add r6, r29, r0 -/* 802F0BE4 90 66 01 6C */ stw r3, 0x16c(r6) -/* 802F0BE8 80 05 01 88 */ lwz r0, 0x188(r5) -/* 802F0BEC 90 06 01 8C */ stw r0, 0x18c(r6) -/* 802F0BF0 54 83 08 3C */ slwi r3, r4, 1 -/* 802F0BF4 38 03 00 02 */ addi r0, r3, 2 -/* 802F0BF8 7C 9D 02 2E */ lhzx r4, r29, r0 -/* 802F0BFC 54 E3 0D FC */ rlwinm r3, r7, 1, 0x17, 0x1e -/* 802F0C00 38 03 00 04 */ addi r0, r3, 4 -/* 802F0C04 7C 9D 03 2E */ sthx r4, r29, r0 -/* 802F0C08 38 E7 FF FF */ addi r7, r7, -1 -lbl_802F0C0C: -/* 802F0C0C 54 E4 06 3E */ clrlwi r4, r7, 0x18 -/* 802F0C10 7C 04 F0 40 */ cmplw r4, r30 -/* 802F0C14 41 81 FF BC */ bgt lbl_802F0BD0 -/* 802F0C18 57 C0 10 3A */ slwi r0, r30, 2 -/* 802F0C1C 7C 7D 02 14 */ add r3, r29, r0 -/* 802F0C20 93 E3 01 6C */ stw r31, 0x16c(r3) -/* 802F0C24 38 00 00 00 */ li r0, 0 -/* 802F0C28 90 03 01 8C */ stw r0, 0x18c(r3) -/* 802F0C2C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F0C30 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F0C34 57 C0 08 3C */ slwi r0, r30, 1 -/* 802F0C38 7C 7D 02 14 */ add r3, r29, r0 -/* 802F0C3C B0 83 00 04 */ sth r4, 4(r3) -/* 802F0C40 7F A3 EB 78 */ mr r3, r29 -/* 802F0C44 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 802F0C48 38 A0 00 01 */ li r5, 1 -/* 802F0C4C 81 9D 00 00 */ lwz r12, 0(r29) -/* 802F0C50 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802F0C54 7D 89 03 A6 */ mtctr r12 -/* 802F0C58 4E 80 04 21 */ bctrl -/* 802F0C5C 88 7D 01 B0 */ lbz r3, 0x1b0(r29) -/* 802F0C60 38 00 00 01 */ li r0, 1 -/* 802F0C64 7C 00 F0 30 */ slw r0, r0, r30 -/* 802F0C68 7C 60 00 78 */ andc r0, r3, r0 -/* 802F0C6C 98 1D 01 B0 */ stb r0, 0x1b0(r29) -/* 802F0C70 38 60 00 01 */ li r3, 1 -lbl_802F0C74: -/* 802F0C74 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0C78 48 07 15 B1 */ bl _restgpr_29 -/* 802F0C7C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F0C80 7C 08 03 A6 */ mtlr r0 -/* 802F0C84 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F0C88 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s deleted file mode 100644 index b0dc25e4e26..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_802F1F24: -/* 802F1F24 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F1F28 7C 08 02 A6 */ mflr r0 -/* 802F1F2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F1F30 38 C0 00 00 */ li r6, 0 -/* 802F1F34 81 83 00 00 */ lwz r12, 0(r3) -/* 802F1F38 81 8C 00 7C */ lwz r12, 0x7c(r12) -/* 802F1F3C 7D 89 03 A6 */ mtctr r12 -/* 802F1F40 4E 80 04 21 */ bctrl -/* 802F1F44 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F1F48 7C 08 03 A6 */ mtlr r0 -/* 802F1F4C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1F50 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock1F11_GXTexMapIDUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock1F11_GXTexMapIDUl.s deleted file mode 100644 index 708f49e93ae..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock1F11_GXTexMapIDUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802EC570: -/* 802EC570 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC574 7C 08 02 A6 */ mflr r0 -/* 802EC578 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC57C 28 05 00 00 */ cmplwi r5, 0 -/* 802EC580 40 82 00 28 */ bne lbl_802EC5A8 -/* 802EC584 54 A0 10 3A */ slwi r0, r5, 2 -/* 802EC588 7C 63 02 14 */ add r3, r3, r0 -/* 802EC58C 80 63 00 50 */ lwz r3, 0x50(r3) -/* 802EC590 28 03 00 00 */ cmplwi r3, 0 -/* 802EC594 41 82 00 14 */ beq lbl_802EC5A8 -/* 802EC598 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EC59C 28 00 00 00 */ cmplwi r0, 0 -/* 802EC5A0 41 82 00 08 */ beq lbl_802EC5A8 -/* 802EC5A4 4B FF 22 9D */ bl load__10JUTTextureF11_GXTexMapID -lbl_802EC5A8: -/* 802EC5A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC5AC 7C 08 03 A6 */ mtlr r0 -/* 802EC5B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC5B4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock2F11_GXTexMapIDUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock2F11_GXTexMapIDUl.s deleted file mode 100644 index f75036f1237..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock2F11_GXTexMapIDUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802ED874: -/* 802ED874 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802ED878 7C 08 02 A6 */ mflr r0 -/* 802ED87C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802ED880 28 05 00 02 */ cmplwi r5, 2 -/* 802ED884 40 80 00 28 */ bge lbl_802ED8AC -/* 802ED888 54 A0 10 3A */ slwi r0, r5, 2 -/* 802ED88C 7C 63 02 14 */ add r3, r3, r0 -/* 802ED890 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802ED894 28 03 00 00 */ cmplwi r3, 0 -/* 802ED898 41 82 00 14 */ beq lbl_802ED8AC -/* 802ED89C 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802ED8A0 28 00 00 00 */ cmplwi r0, 0 -/* 802ED8A4 41 82 00 08 */ beq lbl_802ED8AC -/* 802ED8A8 4B FF 0F 99 */ bl load__10JUTTextureF11_GXTexMapID -lbl_802ED8AC: -/* 802ED8AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802ED8B0 7C 08 03 A6 */ mtlr r0 -/* 802ED8B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ED8B8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock4F11_GXTexMapIDUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock4F11_GXTexMapIDUl.s deleted file mode 100644 index 44be407a784..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock4F11_GXTexMapIDUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802EED1C: -/* 802EED1C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EED20 7C 08 02 A6 */ mflr r0 -/* 802EED24 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EED28 28 05 00 04 */ cmplwi r5, 4 -/* 802EED2C 40 80 00 28 */ bge lbl_802EED54 -/* 802EED30 54 A0 10 3A */ slwi r0, r5, 2 -/* 802EED34 7C 63 02 14 */ add r3, r3, r0 -/* 802EED38 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802EED3C 28 03 00 00 */ cmplwi r3, 0 -/* 802EED40 41 82 00 14 */ beq lbl_802EED54 -/* 802EED44 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802EED48 28 00 00 00 */ cmplwi r0, 0 -/* 802EED4C 41 82 00 08 */ beq lbl_802EED54 -/* 802EED50 4B FE FA F1 */ bl load__10JUTTextureF11_GXTexMapID -lbl_802EED54: -/* 802EED54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EED58 7C 08 03 A6 */ mtlr r0 -/* 802EED5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EED60 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock8F11_GXTexMapIDUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock8F11_GXTexMapIDUl.s deleted file mode 100644 index 9e092a258b3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock8F11_GXTexMapIDUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802F019C: -/* 802F019C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F01A0 7C 08 02 A6 */ mflr r0 -/* 802F01A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F01A8 28 05 00 08 */ cmplwi r5, 8 -/* 802F01AC 40 80 00 28 */ bge lbl_802F01D4 -/* 802F01B0 54 A0 10 3A */ slwi r0, r5, 2 -/* 802F01B4 7C 63 02 14 */ add r3, r3, r0 -/* 802F01B8 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802F01BC 28 03 00 00 */ cmplwi r3, 0 -/* 802F01C0 41 82 00 14 */ beq lbl_802F01D4 -/* 802F01C4 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802F01C8 28 00 00 00 */ cmplwi r0, 0 -/* 802F01CC 41 82 00 08 */ beq lbl_802F01D4 -/* 802F01D0 4B FE E6 71 */ bl load__10JUTTextureF11_GXTexMapID -lbl_802F01D4: -/* 802F01D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F01D8 7C 08 03 A6 */ mtlr r0 -/* 802F01DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F01E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__13J2DTevBlock16F11_GXTexMapIDUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__13J2DTevBlock16F11_GXTexMapIDUl.s deleted file mode 100644 index 05948d2543b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__13J2DTevBlock16F11_GXTexMapIDUl.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_802F161C: -/* 802F161C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F1620 7C 08 02 A6 */ mflr r0 -/* 802F1624 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F1628 28 05 00 08 */ cmplwi r5, 8 -/* 802F162C 40 80 00 28 */ bge lbl_802F1654 -/* 802F1630 54 A0 10 3A */ slwi r0, r5, 2 -/* 802F1634 7C 63 02 14 */ add r3, r3, r0 -/* 802F1638 80 63 01 6C */ lwz r3, 0x16c(r3) -/* 802F163C 28 03 00 00 */ cmplwi r3, 0 -/* 802F1640 41 82 00 14 */ beq lbl_802F1654 -/* 802F1644 80 03 00 20 */ lwz r0, 0x20(r3) -/* 802F1648 28 00 00 00 */ cmplwi r0, 0 -/* 802F164C 41 82 00 08 */ beq lbl_802F1654 -/* 802F1650 4B FE D1 F1 */ bl load__10JUTTextureF11_GXTexMapID -lbl_802F1654: -/* 802F1654 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F1658 7C 08 03 A6 */ mtlr r0 -/* 802F165C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F1660 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s deleted file mode 100644 index b3b0a350609..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802EBC0C: -/* 802EBC0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EBC10 7C 08 02 A6 */ mflr r0 -/* 802EBC14 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EBC18 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EBC1C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EBC20 7C 7E 1B 78 */ mr r30, r3 -/* 802EBC24 7C 9F 23 78 */ mr r31, r4 -/* 802EBC28 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 802EBC2C 40 82 00 0C */ bne lbl_802EBC38 -/* 802EBC30 38 60 00 01 */ li r3, 1 -/* 802EBC34 48 00 00 74 */ b lbl_802EBCA8 -lbl_802EBC38: -/* 802EBC38 80 1E 00 50 */ lwz r0, 0x50(r30) -/* 802EBC3C 28 00 00 00 */ cmplwi r0, 0 -/* 802EBC40 40 82 00 54 */ bne lbl_802EBC94 -/* 802EBC44 38 60 00 40 */ li r3, 0x40 -/* 802EBC48 4B FE 30 05 */ bl __nw__FUl -/* 802EBC4C 28 03 00 00 */ cmplwi r3, 0 -/* 802EBC50 41 82 00 1C */ beq lbl_802EBC6C -/* 802EBC54 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802EBC58 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EBC5C 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802EBC60 38 00 00 00 */ li r0, 0 -/* 802EBC64 90 03 00 28 */ stw r0, 0x28(r3) -/* 802EBC68 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802EBC6C: -/* 802EBC6C 90 7E 00 50 */ stw r3, 0x50(r30) -/* 802EBC70 80 1E 00 50 */ lwz r0, 0x50(r30) -/* 802EBC74 28 00 00 00 */ cmplwi r0, 0 -/* 802EBC78 40 82 00 0C */ bne lbl_802EBC84 -/* 802EBC7C 38 60 00 00 */ li r3, 0 -/* 802EBC80 48 00 00 28 */ b lbl_802EBCA8 -lbl_802EBC84: -/* 802EBC84 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EBC88 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBC8C 60 00 00 01 */ ori r0, r0, 1 -/* 802EBC90 98 1E 00 5C */ stb r0, 0x5c(r30) -lbl_802EBC94: -/* 802EBC94 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802EBC98 38 00 00 01 */ li r0, 1 -/* 802EBC9C 38 60 FF FF */ li r3, -1 -/* 802EBCA0 7C 04 00 10 */ subfc r0, r4, r0 -/* 802EBCA4 7C 63 01 90 */ subfze r3, r3 -lbl_802EBCA8: -/* 802EBCA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EBCAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EBCB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EBCB4 7C 08 03 A6 */ mtlr r0 -/* 802EBCB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EBCBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s deleted file mode 100644 index 30831c47250..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802ECA18: -/* 802ECA18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ECA1C 7C 08 02 A6 */ mflr r0 -/* 802ECA20 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ECA24 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECA28 48 07 57 B1 */ bl _savegpr_28 -/* 802ECA2C 7C 7C 1B 78 */ mr r28, r3 -/* 802ECA30 3B A0 00 00 */ li r29, 0 -/* 802ECA34 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 802ECA38 48 00 00 88 */ b lbl_802ECAC0 -lbl_802ECA3C: -/* 802ECA3C 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802ECA40 28 00 00 02 */ cmplwi r0, 2 -/* 802ECA44 41 80 00 0C */ blt lbl_802ECA50 -/* 802ECA48 38 60 00 00 */ li r3, 0 -/* 802ECA4C 48 00 00 84 */ b lbl_802ECAD0 -lbl_802ECA50: -/* 802ECA50 57 A3 15 BA */ rlwinm r3, r29, 2, 0x16, 0x1d -/* 802ECA54 3B C3 00 64 */ addi r30, r3, 0x64 -/* 802ECA58 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802ECA5C 28 00 00 00 */ cmplwi r0, 0 -/* 802ECA60 40 82 00 5C */ bne lbl_802ECABC -/* 802ECA64 38 60 00 40 */ li r3, 0x40 -/* 802ECA68 4B FE 21 E5 */ bl __nw__FUl -/* 802ECA6C 28 03 00 00 */ cmplwi r3, 0 -/* 802ECA70 41 82 00 1C */ beq lbl_802ECA8C -/* 802ECA74 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802ECA78 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802ECA7C 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802ECA80 38 00 00 00 */ li r0, 0 -/* 802ECA84 90 03 00 28 */ stw r0, 0x28(r3) -/* 802ECA88 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802ECA8C: -/* 802ECA8C 7C 7C F1 2E */ stwx r3, r28, r30 -/* 802ECA90 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802ECA94 28 00 00 00 */ cmplwi r0, 0 -/* 802ECA98 40 82 00 0C */ bne lbl_802ECAA4 -/* 802ECA9C 38 60 00 00 */ li r3, 0 -/* 802ECAA0 48 00 00 30 */ b lbl_802ECAD0 -lbl_802ECAA4: -/* 802ECAA4 88 9C 00 78 */ lbz r4, 0x78(r28) -/* 802ECAA8 38 60 00 01 */ li r3, 1 -/* 802ECAAC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802ECAB0 7C 60 00 30 */ slw r0, r3, r0 -/* 802ECAB4 7C 80 03 78 */ or r0, r4, r0 -/* 802ECAB8 98 1C 00 78 */ stb r0, 0x78(r28) -lbl_802ECABC: -/* 802ECABC 3B BD 00 01 */ addi r29, r29, 1 -lbl_802ECAC0: -/* 802ECAC0 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802ECAC4 7C 00 F8 40 */ cmplw r0, r31 -/* 802ECAC8 41 80 FF 74 */ blt lbl_802ECA3C -/* 802ECACC 38 60 00 01 */ li r3, 1 -lbl_802ECAD0: -/* 802ECAD0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ECAD4 48 07 57 51 */ bl _restgpr_28 -/* 802ECAD8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802ECADC 7C 08 03 A6 */ mtlr r0 -/* 802ECAE0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ECAE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s deleted file mode 100644 index 702c6029461..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802EDD34: -/* 802EDD34 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EDD38 7C 08 02 A6 */ mflr r0 -/* 802EDD3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EDD40 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDD44 48 07 44 95 */ bl _savegpr_28 -/* 802EDD48 7C 7C 1B 78 */ mr r28, r3 -/* 802EDD4C 3B A0 00 00 */ li r29, 0 -/* 802EDD50 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 802EDD54 48 00 00 88 */ b lbl_802EDDDC -lbl_802EDD58: -/* 802EDD58 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EDD5C 28 00 00 04 */ cmplwi r0, 4 -/* 802EDD60 41 80 00 0C */ blt lbl_802EDD6C -/* 802EDD64 38 60 00 00 */ li r3, 0 -/* 802EDD68 48 00 00 84 */ b lbl_802EDDEC -lbl_802EDD6C: -/* 802EDD6C 57 A3 15 BA */ rlwinm r3, r29, 2, 0x16, 0x1d -/* 802EDD70 3B C3 00 8C */ addi r30, r3, 0x8c -/* 802EDD74 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802EDD78 28 00 00 00 */ cmplwi r0, 0 -/* 802EDD7C 40 82 00 5C */ bne lbl_802EDDD8 -/* 802EDD80 38 60 00 40 */ li r3, 0x40 -/* 802EDD84 4B FE 0E C9 */ bl __nw__FUl -/* 802EDD88 28 03 00 00 */ cmplwi r3, 0 -/* 802EDD8C 41 82 00 1C */ beq lbl_802EDDA8 -/* 802EDD90 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802EDD94 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EDD98 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802EDD9C 38 00 00 00 */ li r0, 0 -/* 802EDDA0 90 03 00 28 */ stw r0, 0x28(r3) -/* 802EDDA4 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802EDDA8: -/* 802EDDA8 7C 7C F1 2E */ stwx r3, r28, r30 -/* 802EDDAC 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802EDDB0 28 00 00 00 */ cmplwi r0, 0 -/* 802EDDB4 40 82 00 0C */ bne lbl_802EDDC0 -/* 802EDDB8 38 60 00 00 */ li r3, 0 -/* 802EDDBC 48 00 00 30 */ b lbl_802EDDEC -lbl_802EDDC0: -/* 802EDDC0 88 9C 00 B0 */ lbz r4, 0xb0(r28) -/* 802EDDC4 38 60 00 01 */ li r3, 1 -/* 802EDDC8 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EDDCC 7C 60 00 30 */ slw r0, r3, r0 -/* 802EDDD0 7C 80 03 78 */ or r0, r4, r0 -/* 802EDDD4 98 1C 00 B0 */ stb r0, 0xb0(r28) -lbl_802EDDD8: -/* 802EDDD8 3B BD 00 01 */ addi r29, r29, 1 -lbl_802EDDDC: -/* 802EDDDC 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EDDE0 7C 00 F8 40 */ cmplw r0, r31 -/* 802EDDE4 41 80 FF 74 */ blt lbl_802EDD58 -/* 802EDDE8 38 60 00 01 */ li r3, 1 -lbl_802EDDEC: -/* 802EDDEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EDDF0 48 07 44 35 */ bl _restgpr_28 -/* 802EDDF4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EDDF8 7C 08 03 A6 */ mtlr r0 -/* 802EDDFC 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EDE00 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s deleted file mode 100644 index d157ba7964c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802EF1E0: -/* 802EF1E0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EF1E4 7C 08 02 A6 */ mflr r0 -/* 802EF1E8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EF1EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF1F0 48 07 2F E9 */ bl _savegpr_28 -/* 802EF1F4 7C 7C 1B 78 */ mr r28, r3 -/* 802EF1F8 3B A0 00 00 */ li r29, 0 -/* 802EF1FC 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 802EF200 48 00 00 88 */ b lbl_802EF288 -lbl_802EF204: -/* 802EF204 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EF208 28 00 00 08 */ cmplwi r0, 8 -/* 802EF20C 41 80 00 0C */ blt lbl_802EF218 -/* 802EF210 38 60 00 00 */ li r3, 0 -/* 802EF214 48 00 00 84 */ b lbl_802EF298 -lbl_802EF218: -/* 802EF218 57 A3 15 BA */ rlwinm r3, r29, 2, 0x16, 0x1d -/* 802EF21C 3B C3 00 DC */ addi r30, r3, 0xdc -/* 802EF220 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802EF224 28 00 00 00 */ cmplwi r0, 0 -/* 802EF228 40 82 00 5C */ bne lbl_802EF284 -/* 802EF22C 38 60 00 40 */ li r3, 0x40 -/* 802EF230 4B FD FA 1D */ bl __nw__FUl -/* 802EF234 28 03 00 00 */ cmplwi r3, 0 -/* 802EF238 41 82 00 1C */ beq lbl_802EF254 -/* 802EF23C 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802EF240 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EF244 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802EF248 38 00 00 00 */ li r0, 0 -/* 802EF24C 90 03 00 28 */ stw r0, 0x28(r3) -/* 802EF250 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802EF254: -/* 802EF254 7C 7C F1 2E */ stwx r3, r28, r30 -/* 802EF258 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802EF25C 28 00 00 00 */ cmplwi r0, 0 -/* 802EF260 40 82 00 0C */ bne lbl_802EF26C -/* 802EF264 38 60 00 00 */ li r3, 0 -/* 802EF268 48 00 00 30 */ b lbl_802EF298 -lbl_802EF26C: -/* 802EF26C 88 9C 01 20 */ lbz r4, 0x120(r28) -/* 802EF270 38 60 00 01 */ li r3, 1 -/* 802EF274 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EF278 7C 60 00 30 */ slw r0, r3, r0 -/* 802EF27C 7C 80 03 78 */ or r0, r4, r0 -/* 802EF280 98 1C 01 20 */ stb r0, 0x120(r28) -lbl_802EF284: -/* 802EF284 3B BD 00 01 */ addi r29, r29, 1 -lbl_802EF288: -/* 802EF288 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802EF28C 7C 00 F8 40 */ cmplw r0, r31 -/* 802EF290 41 80 FF 74 */ blt lbl_802EF204 -/* 802EF294 38 60 00 01 */ li r3, 1 -lbl_802EF298: -/* 802EF298 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EF29C 48 07 2F 89 */ bl _restgpr_28 -/* 802EF2A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EF2A4 7C 08 03 A6 */ mtlr r0 -/* 802EF2A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EF2AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s deleted file mode 100644 index f8923f8546f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_802F0660: -/* 802F0660 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F0664 7C 08 02 A6 */ mflr r0 -/* 802F0668 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F066C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0670 48 07 1B 69 */ bl _savegpr_28 -/* 802F0674 7C 7C 1B 78 */ mr r28, r3 -/* 802F0678 3B A0 00 00 */ li r29, 0 -/* 802F067C 54 9F 06 3E */ clrlwi r31, r4, 0x18 -/* 802F0680 48 00 00 88 */ b lbl_802F0708 -lbl_802F0684: -/* 802F0684 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802F0688 28 00 00 08 */ cmplwi r0, 8 -/* 802F068C 41 80 00 0C */ blt lbl_802F0698 -/* 802F0690 38 60 00 00 */ li r3, 0 -/* 802F0694 48 00 00 84 */ b lbl_802F0718 -lbl_802F0698: -/* 802F0698 57 A3 15 BA */ rlwinm r3, r29, 2, 0x16, 0x1d -/* 802F069C 3B C3 01 6C */ addi r30, r3, 0x16c -/* 802F06A0 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802F06A4 28 00 00 00 */ cmplwi r0, 0 -/* 802F06A8 40 82 00 5C */ bne lbl_802F0704 -/* 802F06AC 38 60 00 40 */ li r3, 0x40 -/* 802F06B0 4B FD E5 9D */ bl __nw__FUl -/* 802F06B4 28 03 00 00 */ cmplwi r3, 0 -/* 802F06B8 41 82 00 1C */ beq lbl_802F06D4 -/* 802F06BC 88 03 00 3B */ lbz r0, 0x3b(r3) -/* 802F06C0 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802F06C4 98 03 00 3B */ stb r0, 0x3b(r3) -/* 802F06C8 38 00 00 00 */ li r0, 0 -/* 802F06CC 90 03 00 28 */ stw r0, 0x28(r3) -/* 802F06D0 90 03 00 20 */ stw r0, 0x20(r3) -lbl_802F06D4: -/* 802F06D4 7C 7C F1 2E */ stwx r3, r28, r30 -/* 802F06D8 7C 1C F0 2E */ lwzx r0, r28, r30 -/* 802F06DC 28 00 00 00 */ cmplwi r0, 0 -/* 802F06E0 40 82 00 0C */ bne lbl_802F06EC -/* 802F06E4 38 60 00 00 */ li r3, 0 -/* 802F06E8 48 00 00 30 */ b lbl_802F0718 -lbl_802F06EC: -/* 802F06EC 88 9C 01 B0 */ lbz r4, 0x1b0(r28) -/* 802F06F0 38 60 00 01 */ li r3, 1 -/* 802F06F4 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802F06F8 7C 60 00 30 */ slw r0, r3, r0 -/* 802F06FC 7C 80 03 78 */ or r0, r4, r0 -/* 802F0700 98 1C 01 B0 */ stb r0, 0x1b0(r28) -lbl_802F0704: -/* 802F0704 3B BD 00 01 */ addi r29, r29, 1 -lbl_802F0708: -/* 802F0708 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 802F070C 7C 00 F8 40 */ cmplw r0, r31 -/* 802F0710 41 80 FF 74 */ blt lbl_802F0684 -/* 802F0714 38 60 00 01 */ li r3, 1 -lbl_802F0718: -/* 802F0718 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F071C 48 07 1B 09 */ bl _restgpr_28 -/* 802F0720 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F0724 7C 08 03 A6 */ mtlr r0 -/* 802F0728 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F072C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s deleted file mode 100644 index 584e94efe59..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802EC0A8: -/* 802EC0A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC0AC 7C 08 02 A6 */ mflr r0 -/* 802EC0B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC0B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EC0B8 7C 7F 1B 78 */ mr r31, r3 -/* 802EC0BC 28 04 00 01 */ cmplwi r4, 1 -/* 802EC0C0 41 80 00 0C */ blt lbl_802EC0CC -/* 802EC0C4 38 60 00 00 */ li r3, 0 -/* 802EC0C8 48 00 00 48 */ b lbl_802EC110 -lbl_802EC0CC: -/* 802EC0CC 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EC0D0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EC0D4 41 82 00 10 */ beq lbl_802EC0E4 -/* 802EC0D8 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802EC0DC 38 80 00 01 */ li r4, 1 -/* 802EC0E0 4B FF 21 55 */ bl __dt__10JUTTextureFv -lbl_802EC0E4: -/* 802EC0E4 38 00 00 00 */ li r0, 0 -/* 802EC0E8 90 1F 00 50 */ stw r0, 0x50(r31) -/* 802EC0EC 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EC0F0 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EC0F4 98 1F 00 5C */ stb r0, 0x5c(r31) -/* 802EC0F8 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802EC0FC 4B FE 2C 41 */ bl __dl__FPv -/* 802EC100 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EC104 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EC108 B0 1F 00 04 */ sth r0, 4(r31) -/* 802EC10C 38 60 00 01 */ li r3, 1 -lbl_802EC110: -/* 802EC110 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EC114 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC118 7C 08 03 A6 */ mtlr r0 -/* 802EC11C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC120 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s deleted file mode 100644 index f18a32cf175..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s +++ /dev/null @@ -1,58 +0,0 @@ -lbl_802ED21C: -/* 802ED21C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802ED220 7C 08 02 A6 */ mflr r0 -/* 802ED224 90 01 00 14 */ stw r0, 0x14(r1) -/* 802ED228 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ED22C 93 C1 00 08 */ stw r30, 8(r1) -/* 802ED230 7C 7E 1B 78 */ mr r30, r3 -/* 802ED234 7C 9F 23 78 */ mr r31, r4 -/* 802ED238 28 1F 00 02 */ cmplwi r31, 2 -/* 802ED23C 41 80 00 0C */ blt lbl_802ED248 -/* 802ED240 38 60 00 00 */ li r3, 0 -/* 802ED244 48 00 00 94 */ b lbl_802ED2D8 -lbl_802ED248: -/* 802ED248 88 7E 00 78 */ lbz r3, 0x78(r30) -/* 802ED24C 38 00 00 01 */ li r0, 1 -/* 802ED250 7C 00 F8 30 */ slw r0, r0, r31 -/* 802ED254 7C 60 00 39 */ and. r0, r3, r0 -/* 802ED258 41 82 00 18 */ beq lbl_802ED270 -/* 802ED25C 57 E0 10 3A */ slwi r0, r31, 2 -/* 802ED260 7C 7E 02 14 */ add r3, r30, r0 -/* 802ED264 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802ED268 38 80 00 01 */ li r4, 1 -/* 802ED26C 4B FF 0F C9 */ bl __dt__10JUTTextureFv -lbl_802ED270: -/* 802ED270 57 E0 10 3A */ slwi r0, r31, 2 -/* 802ED274 7C 7E 02 14 */ add r3, r30, r0 -/* 802ED278 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 802ED27C 4B FE 1A C1 */ bl __dl__FPv -/* 802ED280 28 1F 00 00 */ cmplwi r31, 0 -/* 802ED284 40 82 00 1C */ bne lbl_802ED2A0 -/* 802ED288 80 1E 00 68 */ lwz r0, 0x68(r30) -/* 802ED28C 90 1E 00 64 */ stw r0, 0x64(r30) -/* 802ED290 80 1E 00 70 */ lwz r0, 0x70(r30) -/* 802ED294 90 1E 00 6C */ stw r0, 0x6c(r30) -/* 802ED298 A0 1E 00 06 */ lhz r0, 6(r30) -/* 802ED29C B0 1E 00 04 */ sth r0, 4(r30) -lbl_802ED2A0: -/* 802ED2A0 38 00 00 00 */ li r0, 0 -/* 802ED2A4 90 1E 00 68 */ stw r0, 0x68(r30) -/* 802ED2A8 90 1E 00 70 */ stw r0, 0x70(r30) -/* 802ED2AC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802ED2B0 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802ED2B4 B0 1E 00 06 */ sth r0, 6(r30) -/* 802ED2B8 7F C3 F3 78 */ mr r3, r30 -/* 802ED2BC 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802ED2C0 38 A0 00 00 */ li r5, 0 -/* 802ED2C4 81 9E 00 00 */ lwz r12, 0(r30) -/* 802ED2C8 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802ED2CC 7D 89 03 A6 */ mtctr r12 -/* 802ED2D0 4E 80 04 21 */ bctrl -/* 802ED2D4 38 60 00 01 */ li r3, 1 -lbl_802ED2D8: -/* 802ED2D8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802ED2DC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802ED2E0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802ED2E4 7C 08 03 A6 */ mtlr r0 -/* 802ED2E8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ED2EC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s deleted file mode 100644 index 345f70b1e58..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802EE6A0: -/* 802EE6A0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EE6A4 7C 08 02 A6 */ mflr r0 -/* 802EE6A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EE6AC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EE6B0 93 C1 00 08 */ stw r30, 8(r1) -/* 802EE6B4 7C 7E 1B 78 */ mr r30, r3 -/* 802EE6B8 7C 9F 23 78 */ mr r31, r4 -/* 802EE6BC 28 1F 00 04 */ cmplwi r31, 4 -/* 802EE6C0 41 80 00 0C */ blt lbl_802EE6CC -/* 802EE6C4 38 60 00 00 */ li r3, 0 -/* 802EE6C8 48 00 00 B8 */ b lbl_802EE780 -lbl_802EE6CC: -/* 802EE6CC 88 7E 00 B0 */ lbz r3, 0xb0(r30) -/* 802EE6D0 38 00 00 01 */ li r0, 1 -/* 802EE6D4 7C 00 F8 30 */ slw r0, r0, r31 -/* 802EE6D8 7C 60 00 39 */ and. r0, r3, r0 -/* 802EE6DC 41 82 00 18 */ beq lbl_802EE6F4 -/* 802EE6E0 57 E0 10 3A */ slwi r0, r31, 2 -/* 802EE6E4 7C 7E 02 14 */ add r3, r30, r0 -/* 802EE6E8 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802EE6EC 38 80 00 01 */ li r4, 1 -/* 802EE6F0 4B FE FB 45 */ bl __dt__10JUTTextureFv -lbl_802EE6F4: -/* 802EE6F4 57 E0 10 3A */ slwi r0, r31, 2 -/* 802EE6F8 7C 7E 02 14 */ add r3, r30, r0 -/* 802EE6FC 80 63 00 9C */ lwz r3, 0x9c(r3) -/* 802EE700 4B FE 06 3D */ bl __dl__FPv -/* 802EE704 57 E4 10 3A */ slwi r4, r31, 2 -/* 802EE708 57 E3 08 3C */ slwi r3, r31, 1 -/* 802EE70C 20 1F 00 03 */ subfic r0, r31, 3 -/* 802EE710 7C 09 03 A6 */ mtctr r0 -/* 802EE714 28 1F 00 03 */ cmplwi r31, 3 -/* 802EE718 40 80 00 30 */ bge lbl_802EE748 -lbl_802EE71C: -/* 802EE71C 7C BE 22 14 */ add r5, r30, r4 -/* 802EE720 80 05 00 90 */ lwz r0, 0x90(r5) -/* 802EE724 90 05 00 8C */ stw r0, 0x8c(r5) -/* 802EE728 80 05 00 A0 */ lwz r0, 0xa0(r5) -/* 802EE72C 90 05 00 9C */ stw r0, 0x9c(r5) -/* 802EE730 7C BE 1A 14 */ add r5, r30, r3 -/* 802EE734 A0 05 00 06 */ lhz r0, 6(r5) -/* 802EE738 B0 05 00 04 */ sth r0, 4(r5) -/* 802EE73C 38 63 00 02 */ addi r3, r3, 2 -/* 802EE740 38 84 00 04 */ addi r4, r4, 4 -/* 802EE744 42 00 FF D8 */ bdnz lbl_802EE71C -lbl_802EE748: -/* 802EE748 38 00 00 00 */ li r0, 0 -/* 802EE74C 90 1E 00 98 */ stw r0, 0x98(r30) -/* 802EE750 90 1E 00 A8 */ stw r0, 0xa8(r30) -/* 802EE754 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EE758 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EE75C B0 1E 00 0A */ sth r0, 0xa(r30) -/* 802EE760 7F C3 F3 78 */ mr r3, r30 -/* 802EE764 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802EE768 38 A0 00 00 */ li r5, 0 -/* 802EE76C 81 9E 00 00 */ lwz r12, 0(r30) -/* 802EE770 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802EE774 7D 89 03 A6 */ mtctr r12 -/* 802EE778 4E 80 04 21 */ bctrl -/* 802EE77C 38 60 00 01 */ li r3, 1 -lbl_802EE780: -/* 802EE780 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EE784 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EE788 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EE78C 7C 08 03 A6 */ mtlr r0 -/* 802EE790 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EE794 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s deleted file mode 100644 index b4b64008ce0..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802EFB48: -/* 802EFB48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EFB4C 7C 08 02 A6 */ mflr r0 -/* 802EFB50 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EFB54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EFB58 93 C1 00 08 */ stw r30, 8(r1) -/* 802EFB5C 7C 7E 1B 78 */ mr r30, r3 -/* 802EFB60 7C 9F 23 78 */ mr r31, r4 -/* 802EFB64 28 1F 00 08 */ cmplwi r31, 8 -/* 802EFB68 41 80 00 0C */ blt lbl_802EFB74 -/* 802EFB6C 38 60 00 00 */ li r3, 0 -/* 802EFB70 48 00 00 B8 */ b lbl_802EFC28 -lbl_802EFB74: -/* 802EFB74 88 7E 01 20 */ lbz r3, 0x120(r30) -/* 802EFB78 38 00 00 01 */ li r0, 1 -/* 802EFB7C 7C 00 F8 30 */ slw r0, r0, r31 -/* 802EFB80 7C 60 00 39 */ and. r0, r3, r0 -/* 802EFB84 41 82 00 18 */ beq lbl_802EFB9C -/* 802EFB88 57 E0 10 3A */ slwi r0, r31, 2 -/* 802EFB8C 7C 7E 02 14 */ add r3, r30, r0 -/* 802EFB90 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802EFB94 38 80 00 01 */ li r4, 1 -/* 802EFB98 4B FE E6 9D */ bl __dt__10JUTTextureFv -lbl_802EFB9C: -/* 802EFB9C 57 E0 10 3A */ slwi r0, r31, 2 -/* 802EFBA0 7C 7E 02 14 */ add r3, r30, r0 -/* 802EFBA4 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 802EFBA8 4B FD F1 95 */ bl __dl__FPv -/* 802EFBAC 57 E4 10 3A */ slwi r4, r31, 2 -/* 802EFBB0 57 E3 08 3C */ slwi r3, r31, 1 -/* 802EFBB4 20 1F 00 07 */ subfic r0, r31, 7 -/* 802EFBB8 7C 09 03 A6 */ mtctr r0 -/* 802EFBBC 28 1F 00 07 */ cmplwi r31, 7 -/* 802EFBC0 40 80 00 30 */ bge lbl_802EFBF0 -lbl_802EFBC4: -/* 802EFBC4 7C BE 22 14 */ add r5, r30, r4 -/* 802EFBC8 80 05 00 E0 */ lwz r0, 0xe0(r5) -/* 802EFBCC 90 05 00 DC */ stw r0, 0xdc(r5) -/* 802EFBD0 80 05 01 00 */ lwz r0, 0x100(r5) -/* 802EFBD4 90 05 00 FC */ stw r0, 0xfc(r5) -/* 802EFBD8 7C BE 1A 14 */ add r5, r30, r3 -/* 802EFBDC A0 05 00 06 */ lhz r0, 6(r5) -/* 802EFBE0 B0 05 00 04 */ sth r0, 4(r5) -/* 802EFBE4 38 63 00 02 */ addi r3, r3, 2 -/* 802EFBE8 38 84 00 04 */ addi r4, r4, 4 -/* 802EFBEC 42 00 FF D8 */ bdnz lbl_802EFBC4 -lbl_802EFBF0: -/* 802EFBF0 38 00 00 00 */ li r0, 0 -/* 802EFBF4 90 1E 00 F8 */ stw r0, 0xf8(r30) -/* 802EFBF8 90 1E 01 18 */ stw r0, 0x118(r30) -/* 802EFBFC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EFC00 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EFC04 B0 1E 00 12 */ sth r0, 0x12(r30) -/* 802EFC08 7F C3 F3 78 */ mr r3, r30 -/* 802EFC0C 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802EFC10 38 A0 00 00 */ li r5, 0 -/* 802EFC14 81 9E 00 00 */ lwz r12, 0(r30) -/* 802EFC18 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802EFC1C 7D 89 03 A6 */ mtctr r12 -/* 802EFC20 4E 80 04 21 */ bctrl -/* 802EFC24 38 60 00 01 */ li r3, 1 -lbl_802EFC28: -/* 802EFC28 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EFC2C 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EFC30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EFC34 7C 08 03 A6 */ mtlr r0 -/* 802EFC38 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EFC3C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s b/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s deleted file mode 100644 index f90b02995fe..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802F0FC8: -/* 802F0FC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F0FCC 7C 08 02 A6 */ mflr r0 -/* 802F0FD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F0FD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F0FD8 93 C1 00 08 */ stw r30, 8(r1) -/* 802F0FDC 7C 7E 1B 78 */ mr r30, r3 -/* 802F0FE0 7C 9F 23 78 */ mr r31, r4 -/* 802F0FE4 28 1F 00 08 */ cmplwi r31, 8 -/* 802F0FE8 41 80 00 0C */ blt lbl_802F0FF4 -/* 802F0FEC 38 60 00 00 */ li r3, 0 -/* 802F0FF0 48 00 00 B8 */ b lbl_802F10A8 -lbl_802F0FF4: -/* 802F0FF4 88 7E 01 B0 */ lbz r3, 0x1b0(r30) -/* 802F0FF8 38 00 00 01 */ li r0, 1 -/* 802F0FFC 7C 00 F8 30 */ slw r0, r0, r31 -/* 802F1000 7C 60 00 39 */ and. r0, r3, r0 -/* 802F1004 41 82 00 18 */ beq lbl_802F101C -/* 802F1008 57 E0 10 3A */ slwi r0, r31, 2 -/* 802F100C 7C 7E 02 14 */ add r3, r30, r0 -/* 802F1010 80 63 01 6C */ lwz r3, 0x16c(r3) -/* 802F1014 38 80 00 01 */ li r4, 1 -/* 802F1018 4B FE D2 1D */ bl __dt__10JUTTextureFv -lbl_802F101C: -/* 802F101C 57 E0 10 3A */ slwi r0, r31, 2 -/* 802F1020 7C 7E 02 14 */ add r3, r30, r0 -/* 802F1024 80 63 01 8C */ lwz r3, 0x18c(r3) -/* 802F1028 4B FD DD 15 */ bl __dl__FPv -/* 802F102C 57 E4 10 3A */ slwi r4, r31, 2 -/* 802F1030 57 E3 08 3C */ slwi r3, r31, 1 -/* 802F1034 20 1F 00 07 */ subfic r0, r31, 7 -/* 802F1038 7C 09 03 A6 */ mtctr r0 -/* 802F103C 28 1F 00 07 */ cmplwi r31, 7 -/* 802F1040 40 80 00 30 */ bge lbl_802F1070 -lbl_802F1044: -/* 802F1044 7C BE 22 14 */ add r5, r30, r4 -/* 802F1048 80 05 01 70 */ lwz r0, 0x170(r5) -/* 802F104C 90 05 01 6C */ stw r0, 0x16c(r5) -/* 802F1050 80 05 01 90 */ lwz r0, 0x190(r5) -/* 802F1054 90 05 01 8C */ stw r0, 0x18c(r5) -/* 802F1058 7C BE 1A 14 */ add r5, r30, r3 -/* 802F105C A0 05 00 06 */ lhz r0, 6(r5) -/* 802F1060 B0 05 00 04 */ sth r0, 4(r5) -/* 802F1064 38 63 00 02 */ addi r3, r3, 2 -/* 802F1068 38 84 00 04 */ addi r4, r4, 4 -/* 802F106C 42 00 FF D8 */ bdnz lbl_802F1044 -lbl_802F1070: -/* 802F1070 38 00 00 00 */ li r0, 0 -/* 802F1074 90 1E 01 88 */ stw r0, 0x188(r30) -/* 802F1078 90 1E 01 A8 */ stw r0, 0x1a8(r30) -/* 802F107C 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F1080 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F1084 B0 1E 00 12 */ sth r0, 0x12(r30) -/* 802F1088 7F C3 F3 78 */ mr r3, r30 -/* 802F108C 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802F1090 38 A0 00 00 */ li r5, 0 -/* 802F1094 81 9E 00 00 */ lwz r12, 0(r30) -/* 802F1098 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 802F109C 7D 89 03 A6 */ mtctr r12 -/* 802F10A0 4E 80 04 21 */ bctrl -/* 802F10A4 38 60 00 01 */ li r3, 1 -lbl_802F10A8: -/* 802F10A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F10AC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F10B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F10B4 7C 08 03 A6 */ mtlr r0 -/* 802F10B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F10BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock1Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock1Fv.s deleted file mode 100644 index b170790a19f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock1Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2A30: -/* 802F2A30 88 03 00 5C */ lbz r0, 0x5c(r3) -/* 802F2A34 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802F2A38 98 03 00 5C */ stb r0, 0x5c(r3) -/* 802F2A3C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock2Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock2Fv.s deleted file mode 100644 index 6084cbcaf55..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock2Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2790: -/* 802F2790 88 03 00 78 */ lbz r0, 0x78(r3) -/* 802F2794 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802F2798 98 03 00 78 */ stb r0, 0x78(r3) -/* 802F279C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock4Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock4Fv.s deleted file mode 100644 index 4587a56913f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock4Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F24EC: -/* 802F24EC 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 802F24F0 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802F24F4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802F24F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock8Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock8Fv.s deleted file mode 100644 index 74ef95b3313..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock8Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F224C: -/* 802F224C 38 00 00 00 */ li r0, 0 -/* 802F2250 98 03 01 21 */ stb r0, 0x121(r3) -/* 802F2254 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__13J2DTevBlock16Fv.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__13J2DTevBlock16Fv.s deleted file mode 100644 index 5b1de517436..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__13J2DTevBlock16Fv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1FAC: -/* 802F1FAC 38 00 00 00 */ li r0, 0 -/* 802F1FB0 98 03 01 B1 */ stb r0, 0x1b1(r3) -/* 802F1FB4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s deleted file mode 100644 index b97211d6836..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802EC1D8: -/* 802EC1D8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC1DC 7C 08 02 A6 */ mflr r0 -/* 802EC1E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC1E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EC1E8 93 C1 00 08 */ stw r30, 8(r1) -/* 802EC1EC 7C 7E 1B 78 */ mr r30, r3 -/* 802EC1F0 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EC1F4 40 82 00 0C */ bne lbl_802EC200 -/* 802EC1F8 38 60 00 00 */ li r3, 0 -/* 802EC1FC 48 00 00 44 */ b lbl_802EC240 -lbl_802EC200: -/* 802EC200 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EC204 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EC208 41 82 00 24 */ beq lbl_802EC22C -/* 802EC20C 80 7E 00 58 */ lwz r3, 0x58(r30) -/* 802EC210 28 03 00 00 */ cmplwi r3, 0 -/* 802EC214 41 82 00 18 */ beq lbl_802EC22C -/* 802EC218 38 80 00 01 */ li r4, 1 -/* 802EC21C 81 83 00 00 */ lwz r12, 0(r3) -/* 802EC220 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EC224 7D 89 03 A6 */ mtctr r12 -/* 802EC228 4E 80 04 21 */ bctrl -lbl_802EC22C: -/* 802EC22C 93 FE 00 58 */ stw r31, 0x58(r30) -/* 802EC230 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EC234 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802EC238 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 802EC23C 38 60 00 01 */ li r3, 1 -lbl_802EC240: -/* 802EC240 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EC244 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EC248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC24C 7C 08 03 A6 */ mtlr r0 -/* 802EC250 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC254 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s deleted file mode 100644 index 2f14dcf8639..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802EC124: -/* 802EC124 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EC128 7C 08 02 A6 */ mflr r0 -/* 802EC12C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EC130 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC134 48 07 60 A9 */ bl _savegpr_29 -/* 802EC138 7C 7D 1B 78 */ mr r29, r3 -/* 802EC13C 7C 9E 23 79 */ or. r30, r4, r4 -/* 802EC140 40 82 00 0C */ bne lbl_802EC14C -/* 802EC144 38 60 00 00 */ li r3, 0 -/* 802EC148 48 00 00 78 */ b lbl_802EC1C0 -lbl_802EC14C: -/* 802EC14C 38 60 00 70 */ li r3, 0x70 -/* 802EC150 4B FE 2A FD */ bl __nw__FUl -/* 802EC154 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EC158 41 82 00 14 */ beq lbl_802EC16C -/* 802EC15C 7F C4 F3 78 */ mr r4, r30 -/* 802EC160 38 A0 00 00 */ li r5, 0 -/* 802EC164 4B FF 2E 31 */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802EC168 7C 7F 1B 78 */ mr r31, r3 -lbl_802EC16C: -/* 802EC16C 28 1F 00 00 */ cmplwi r31, 0 -/* 802EC170 40 82 00 0C */ bne lbl_802EC17C -/* 802EC174 38 60 00 00 */ li r3, 0 -/* 802EC178 48 00 00 48 */ b lbl_802EC1C0 -lbl_802EC17C: -/* 802EC17C 88 1D 00 5C */ lbz r0, 0x5c(r29) -/* 802EC180 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EC184 41 82 00 24 */ beq lbl_802EC1A8 -/* 802EC188 80 7D 00 58 */ lwz r3, 0x58(r29) -/* 802EC18C 28 03 00 00 */ cmplwi r3, 0 -/* 802EC190 41 82 00 18 */ beq lbl_802EC1A8 -/* 802EC194 38 80 00 01 */ li r4, 1 -/* 802EC198 81 83 00 00 */ lwz r12, 0(r3) -/* 802EC19C 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EC1A0 7D 89 03 A6 */ mtctr r12 -/* 802EC1A4 4E 80 04 21 */ bctrl -lbl_802EC1A8: -/* 802EC1A8 93 FD 00 58 */ stw r31, 0x58(r29) -/* 802EC1AC 88 1D 00 5C */ lbz r0, 0x5c(r29) -/* 802EC1B0 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802EC1B4 60 00 00 80 */ ori r0, r0, 0x80 -/* 802EC1B8 98 1D 00 5C */ stb r0, 0x5c(r29) -/* 802EC1BC 38 60 00 01 */ li r3, 1 -lbl_802EC1C0: -/* 802EC1C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC1C4 48 07 60 65 */ bl _restgpr_29 -/* 802EC1C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EC1CC 7C 08 03 A6 */ mtlr r0 -/* 802EC1D0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC1D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s deleted file mode 100644 index 874d46c25a8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802ED3A4: -/* 802ED3A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802ED3A8 7C 08 02 A6 */ mflr r0 -/* 802ED3AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802ED3B0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802ED3B4 93 C1 00 08 */ stw r30, 8(r1) -/* 802ED3B8 7C 7E 1B 78 */ mr r30, r3 -/* 802ED3BC 7C 9F 23 79 */ or. r31, r4, r4 -/* 802ED3C0 40 82 00 0C */ bne lbl_802ED3CC -/* 802ED3C4 38 60 00 00 */ li r3, 0 -/* 802ED3C8 48 00 00 44 */ b lbl_802ED40C -lbl_802ED3CC: -/* 802ED3CC 88 1E 00 78 */ lbz r0, 0x78(r30) -/* 802ED3D0 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802ED3D4 41 82 00 24 */ beq lbl_802ED3F8 -/* 802ED3D8 80 7E 00 74 */ lwz r3, 0x74(r30) -/* 802ED3DC 28 03 00 00 */ cmplwi r3, 0 -/* 802ED3E0 41 82 00 18 */ beq lbl_802ED3F8 -/* 802ED3E4 38 80 00 01 */ li r4, 1 -/* 802ED3E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802ED3EC 81 8C 00 08 */ lwz r12, 8(r12) -/* 802ED3F0 7D 89 03 A6 */ mtctr r12 -/* 802ED3F4 4E 80 04 21 */ bctrl -lbl_802ED3F8: -/* 802ED3F8 93 FE 00 74 */ stw r31, 0x74(r30) -/* 802ED3FC 88 1E 00 78 */ lbz r0, 0x78(r30) -/* 802ED400 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802ED404 98 1E 00 78 */ stb r0, 0x78(r30) -/* 802ED408 38 60 00 01 */ li r3, 1 -lbl_802ED40C: -/* 802ED40C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802ED410 83 C1 00 08 */ lwz r30, 8(r1) -/* 802ED414 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802ED418 7C 08 03 A6 */ mtlr r0 -/* 802ED41C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802ED420 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s deleted file mode 100644 index c383a58e0b7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802ED2F0: -/* 802ED2F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ED2F4 7C 08 02 A6 */ mflr r0 -/* 802ED2F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ED2FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED300 48 07 4E DD */ bl _savegpr_29 -/* 802ED304 7C 7D 1B 78 */ mr r29, r3 -/* 802ED308 7C 9E 23 79 */ or. r30, r4, r4 -/* 802ED30C 40 82 00 0C */ bne lbl_802ED318 -/* 802ED310 38 60 00 00 */ li r3, 0 -/* 802ED314 48 00 00 78 */ b lbl_802ED38C -lbl_802ED318: -/* 802ED318 38 60 00 70 */ li r3, 0x70 -/* 802ED31C 4B FE 19 31 */ bl __nw__FUl -/* 802ED320 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802ED324 41 82 00 14 */ beq lbl_802ED338 -/* 802ED328 7F C4 F3 78 */ mr r4, r30 -/* 802ED32C 38 A0 00 00 */ li r5, 0 -/* 802ED330 4B FF 1C 65 */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802ED334 7C 7F 1B 78 */ mr r31, r3 -lbl_802ED338: -/* 802ED338 28 1F 00 00 */ cmplwi r31, 0 -/* 802ED33C 40 82 00 0C */ bne lbl_802ED348 -/* 802ED340 38 60 00 00 */ li r3, 0 -/* 802ED344 48 00 00 48 */ b lbl_802ED38C -lbl_802ED348: -/* 802ED348 88 1D 00 78 */ lbz r0, 0x78(r29) -/* 802ED34C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802ED350 41 82 00 24 */ beq lbl_802ED374 -/* 802ED354 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 802ED358 28 03 00 00 */ cmplwi r3, 0 -/* 802ED35C 41 82 00 18 */ beq lbl_802ED374 -/* 802ED360 38 80 00 01 */ li r4, 1 -/* 802ED364 81 83 00 00 */ lwz r12, 0(r3) -/* 802ED368 81 8C 00 08 */ lwz r12, 8(r12) -/* 802ED36C 7D 89 03 A6 */ mtctr r12 -/* 802ED370 4E 80 04 21 */ bctrl -lbl_802ED374: -/* 802ED374 93 FD 00 74 */ stw r31, 0x74(r29) -/* 802ED378 88 1D 00 78 */ lbz r0, 0x78(r29) -/* 802ED37C 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802ED380 60 00 00 80 */ ori r0, r0, 0x80 -/* 802ED384 98 1D 00 78 */ stb r0, 0x78(r29) -/* 802ED388 38 60 00 01 */ li r3, 1 -lbl_802ED38C: -/* 802ED38C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED390 48 07 4E 99 */ bl _restgpr_29 -/* 802ED394 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802ED398 7C 08 03 A6 */ mtlr r0 -/* 802ED39C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ED3A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s deleted file mode 100644 index 728f62d55f7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_802EE84C: -/* 802EE84C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EE850 7C 08 02 A6 */ mflr r0 -/* 802EE854 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EE858 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EE85C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EE860 7C 7E 1B 78 */ mr r30, r3 -/* 802EE864 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EE868 40 82 00 0C */ bne lbl_802EE874 -/* 802EE86C 38 60 00 00 */ li r3, 0 -/* 802EE870 48 00 00 44 */ b lbl_802EE8B4 -lbl_802EE874: -/* 802EE874 88 1E 00 B0 */ lbz r0, 0xb0(r30) -/* 802EE878 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EE87C 41 82 00 24 */ beq lbl_802EE8A0 -/* 802EE880 80 7E 00 AC */ lwz r3, 0xac(r30) -/* 802EE884 28 03 00 00 */ cmplwi r3, 0 -/* 802EE888 41 82 00 18 */ beq lbl_802EE8A0 -/* 802EE88C 38 80 00 01 */ li r4, 1 -/* 802EE890 81 83 00 00 */ lwz r12, 0(r3) -/* 802EE894 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EE898 7D 89 03 A6 */ mtctr r12 -/* 802EE89C 4E 80 04 21 */ bctrl -lbl_802EE8A0: -/* 802EE8A0 93 FE 00 AC */ stw r31, 0xac(r30) -/* 802EE8A4 88 1E 00 B0 */ lbz r0, 0xb0(r30) -/* 802EE8A8 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802EE8AC 98 1E 00 B0 */ stb r0, 0xb0(r30) -/* 802EE8B0 38 60 00 01 */ li r3, 1 -lbl_802EE8B4: -/* 802EE8B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EE8B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EE8BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EE8C0 7C 08 03 A6 */ mtlr r0 -/* 802EE8C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EE8C8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s deleted file mode 100644 index 40aa5a393bc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_802EE798: -/* 802EE798 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EE79C 7C 08 02 A6 */ mflr r0 -/* 802EE7A0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EE7A4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE7A8 48 07 3A 35 */ bl _savegpr_29 -/* 802EE7AC 7C 7D 1B 78 */ mr r29, r3 -/* 802EE7B0 7C 9E 23 79 */ or. r30, r4, r4 -/* 802EE7B4 40 82 00 0C */ bne lbl_802EE7C0 -/* 802EE7B8 38 60 00 00 */ li r3, 0 -/* 802EE7BC 48 00 00 78 */ b lbl_802EE834 -lbl_802EE7C0: -/* 802EE7C0 38 60 00 70 */ li r3, 0x70 -/* 802EE7C4 4B FE 04 89 */ bl __nw__FUl -/* 802EE7C8 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EE7CC 41 82 00 14 */ beq lbl_802EE7E0 -/* 802EE7D0 7F C4 F3 78 */ mr r4, r30 -/* 802EE7D4 38 A0 00 00 */ li r5, 0 -/* 802EE7D8 4B FF 07 BD */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802EE7DC 7C 7F 1B 78 */ mr r31, r3 -lbl_802EE7E0: -/* 802EE7E0 28 1F 00 00 */ cmplwi r31, 0 -/* 802EE7E4 40 82 00 0C */ bne lbl_802EE7F0 -/* 802EE7E8 38 60 00 00 */ li r3, 0 -/* 802EE7EC 48 00 00 48 */ b lbl_802EE834 -lbl_802EE7F0: -/* 802EE7F0 88 1D 00 B0 */ lbz r0, 0xb0(r29) -/* 802EE7F4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 -/* 802EE7F8 41 82 00 24 */ beq lbl_802EE81C -/* 802EE7FC 80 7D 00 AC */ lwz r3, 0xac(r29) -/* 802EE800 28 03 00 00 */ cmplwi r3, 0 -/* 802EE804 41 82 00 18 */ beq lbl_802EE81C -/* 802EE808 38 80 00 01 */ li r4, 1 -/* 802EE80C 81 83 00 00 */ lwz r12, 0(r3) -/* 802EE810 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EE814 7D 89 03 A6 */ mtctr r12 -/* 802EE818 4E 80 04 21 */ bctrl -lbl_802EE81C: -/* 802EE81C 93 FD 00 AC */ stw r31, 0xac(r29) -/* 802EE820 88 1D 00 B0 */ lbz r0, 0xb0(r29) -/* 802EE824 54 00 06 7E */ clrlwi r0, r0, 0x19 -/* 802EE828 60 00 00 80 */ ori r0, r0, 0x80 -/* 802EE82C 98 1D 00 B0 */ stb r0, 0xb0(r29) -/* 802EE830 38 60 00 01 */ li r3, 1 -lbl_802EE834: -/* 802EE834 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE838 48 07 39 F1 */ bl _restgpr_29 -/* 802EE83C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EE840 7C 08 03 A6 */ mtlr r0 -/* 802EE844 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EE848 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s deleted file mode 100644 index 80a0a31b594..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802EFCEC: -/* 802EFCEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EFCF0 7C 08 02 A6 */ mflr r0 -/* 802EFCF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EFCF8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EFCFC 93 C1 00 08 */ stw r30, 8(r1) -/* 802EFD00 7C 7E 1B 78 */ mr r30, r3 -/* 802EFD04 7C 9F 23 79 */ or. r31, r4, r4 -/* 802EFD08 40 82 00 0C */ bne lbl_802EFD14 -/* 802EFD0C 38 60 00 00 */ li r3, 0 -/* 802EFD10 48 00 00 40 */ b lbl_802EFD50 -lbl_802EFD14: -/* 802EFD14 88 1E 01 21 */ lbz r0, 0x121(r30) -/* 802EFD18 28 00 00 00 */ cmplwi r0, 0 -/* 802EFD1C 41 82 00 24 */ beq lbl_802EFD40 -/* 802EFD20 80 7E 01 1C */ lwz r3, 0x11c(r30) -/* 802EFD24 28 03 00 00 */ cmplwi r3, 0 -/* 802EFD28 41 82 00 18 */ beq lbl_802EFD40 -/* 802EFD2C 38 80 00 01 */ li r4, 1 -/* 802EFD30 81 83 00 00 */ lwz r12, 0(r3) -/* 802EFD34 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EFD38 7D 89 03 A6 */ mtctr r12 -/* 802EFD3C 4E 80 04 21 */ bctrl -lbl_802EFD40: -/* 802EFD40 93 FE 01 1C */ stw r31, 0x11c(r30) -/* 802EFD44 38 00 00 00 */ li r0, 0 -/* 802EFD48 98 1E 01 21 */ stb r0, 0x121(r30) -/* 802EFD4C 38 60 00 01 */ li r3, 1 -lbl_802EFD50: -/* 802EFD50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EFD54 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EFD58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EFD5C 7C 08 03 A6 */ mtlr r0 -/* 802EFD60 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EFD64 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s deleted file mode 100644 index 2d46ad6526d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802EFC40: -/* 802EFC40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EFC44 7C 08 02 A6 */ mflr r0 -/* 802EFC48 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EFC4C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFC50 48 07 25 8D */ bl _savegpr_29 -/* 802EFC54 7C 7D 1B 78 */ mr r29, r3 -/* 802EFC58 7C 9E 23 79 */ or. r30, r4, r4 -/* 802EFC5C 40 82 00 0C */ bne lbl_802EFC68 -/* 802EFC60 38 60 00 00 */ li r3, 0 -/* 802EFC64 48 00 00 70 */ b lbl_802EFCD4 -lbl_802EFC68: -/* 802EFC68 38 60 00 70 */ li r3, 0x70 -/* 802EFC6C 4B FD EF E1 */ bl __nw__FUl -/* 802EFC70 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EFC74 41 82 00 14 */ beq lbl_802EFC88 -/* 802EFC78 7F C4 F3 78 */ mr r4, r30 -/* 802EFC7C 38 A0 00 00 */ li r5, 0 -/* 802EFC80 4B FE F3 15 */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802EFC84 7C 7F 1B 78 */ mr r31, r3 -lbl_802EFC88: -/* 802EFC88 28 1F 00 00 */ cmplwi r31, 0 -/* 802EFC8C 40 82 00 0C */ bne lbl_802EFC98 -/* 802EFC90 38 60 00 00 */ li r3, 0 -/* 802EFC94 48 00 00 40 */ b lbl_802EFCD4 -lbl_802EFC98: -/* 802EFC98 88 1D 01 21 */ lbz r0, 0x121(r29) -/* 802EFC9C 28 00 00 00 */ cmplwi r0, 0 -/* 802EFCA0 41 82 00 24 */ beq lbl_802EFCC4 -/* 802EFCA4 80 7D 01 1C */ lwz r3, 0x11c(r29) -/* 802EFCA8 28 03 00 00 */ cmplwi r3, 0 -/* 802EFCAC 41 82 00 18 */ beq lbl_802EFCC4 -/* 802EFCB0 38 80 00 01 */ li r4, 1 -/* 802EFCB4 81 83 00 00 */ lwz r12, 0(r3) -/* 802EFCB8 81 8C 00 08 */ lwz r12, 8(r12) -/* 802EFCBC 7D 89 03 A6 */ mtctr r12 -/* 802EFCC0 4E 80 04 21 */ bctrl -lbl_802EFCC4: -/* 802EFCC4 93 FD 01 1C */ stw r31, 0x11c(r29) -/* 802EFCC8 38 00 00 01 */ li r0, 1 -/* 802EFCCC 98 1D 01 21 */ stb r0, 0x121(r29) -/* 802EFCD0 38 60 00 01 */ li r3, 1 -lbl_802EFCD4: -/* 802EFCD4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFCD8 48 07 25 51 */ bl _restgpr_29 -/* 802EFCDC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EFCE0 7C 08 03 A6 */ mtlr r0 -/* 802EFCE4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EFCE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s deleted file mode 100644 index 02f54b5f1b3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802F116C: -/* 802F116C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802F1170 7C 08 02 A6 */ mflr r0 -/* 802F1174 90 01 00 14 */ stw r0, 0x14(r1) -/* 802F1178 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802F117C 93 C1 00 08 */ stw r30, 8(r1) -/* 802F1180 7C 7E 1B 78 */ mr r30, r3 -/* 802F1184 7C 9F 23 79 */ or. r31, r4, r4 -/* 802F1188 40 82 00 0C */ bne lbl_802F1194 -/* 802F118C 38 60 00 00 */ li r3, 0 -/* 802F1190 48 00 00 40 */ b lbl_802F11D0 -lbl_802F1194: -/* 802F1194 88 1E 01 B1 */ lbz r0, 0x1b1(r30) -/* 802F1198 28 00 00 00 */ cmplwi r0, 0 -/* 802F119C 41 82 00 24 */ beq lbl_802F11C0 -/* 802F11A0 80 7E 01 AC */ lwz r3, 0x1ac(r30) -/* 802F11A4 28 03 00 00 */ cmplwi r3, 0 -/* 802F11A8 41 82 00 18 */ beq lbl_802F11C0 -/* 802F11AC 38 80 00 01 */ li r4, 1 -/* 802F11B0 81 83 00 00 */ lwz r12, 0(r3) -/* 802F11B4 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F11B8 7D 89 03 A6 */ mtctr r12 -/* 802F11BC 4E 80 04 21 */ bctrl -lbl_802F11C0: -/* 802F11C0 93 FE 01 AC */ stw r31, 0x1ac(r30) -/* 802F11C4 38 00 00 00 */ li r0, 0 -/* 802F11C8 98 1E 01 B1 */ stb r0, 0x1b1(r30) -/* 802F11CC 38 60 00 01 */ li r3, 1 -lbl_802F11D0: -/* 802F11D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802F11D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802F11D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802F11DC 7C 08 03 A6 */ mtlr r0 -/* 802F11E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802F11E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s deleted file mode 100644 index 5b0c5ee3f46..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_802F10C0: -/* 802F10C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F10C4 7C 08 02 A6 */ mflr r0 -/* 802F10C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F10CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F10D0 48 07 11 0D */ bl _savegpr_29 -/* 802F10D4 7C 7D 1B 78 */ mr r29, r3 -/* 802F10D8 7C 9E 23 79 */ or. r30, r4, r4 -/* 802F10DC 40 82 00 0C */ bne lbl_802F10E8 -/* 802F10E0 38 60 00 00 */ li r3, 0 -/* 802F10E4 48 00 00 70 */ b lbl_802F1154 -lbl_802F10E8: -/* 802F10E8 38 60 00 70 */ li r3, 0x70 -/* 802F10EC 4B FD DB 61 */ bl __nw__FUl -/* 802F10F0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802F10F4 41 82 00 14 */ beq lbl_802F1108 -/* 802F10F8 7F C4 F3 78 */ mr r4, r30 -/* 802F10FC 38 A0 00 00 */ li r5, 0 -/* 802F1100 4B FE DE 95 */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802F1104 7C 7F 1B 78 */ mr r31, r3 -lbl_802F1108: -/* 802F1108 28 1F 00 00 */ cmplwi r31, 0 -/* 802F110C 40 82 00 0C */ bne lbl_802F1118 -/* 802F1110 38 60 00 00 */ li r3, 0 -/* 802F1114 48 00 00 40 */ b lbl_802F1154 -lbl_802F1118: -/* 802F1118 88 1D 01 B1 */ lbz r0, 0x1b1(r29) -/* 802F111C 28 00 00 00 */ cmplwi r0, 0 -/* 802F1120 41 82 00 24 */ beq lbl_802F1144 -/* 802F1124 80 7D 01 AC */ lwz r3, 0x1ac(r29) -/* 802F1128 28 03 00 00 */ cmplwi r3, 0 -/* 802F112C 41 82 00 18 */ beq lbl_802F1144 -/* 802F1130 38 80 00 01 */ li r4, 1 -/* 802F1134 81 83 00 00 */ lwz r12, 0(r3) -/* 802F1138 81 8C 00 08 */ lwz r12, 8(r12) -/* 802F113C 7D 89 03 A6 */ mtctr r12 -/* 802F1140 4E 80 04 21 */ bctrl -lbl_802F1144: -/* 802F1144 93 FD 01 AC */ stw r31, 0x1ac(r29) -/* 802F1148 38 00 00 01 */ li r0, 1 -/* 802F114C 98 1D 01 B1 */ stb r0, 0x1b1(r29) -/* 802F1150 38 60 00 01 */ li r3, 1 -lbl_802F1154: -/* 802F1154 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F1158 48 07 10 D1 */ bl _restgpr_29 -/* 802F115C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F1160 7C 08 03 A6 */ mtlr r0 -/* 802F1164 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F1168 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage.s deleted file mode 100644 index 4e93e3c1713..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F2980: -/* 802F2980 80 A5 00 00 */ lwz r5, 0(r5) -/* 802F2984 54 80 10 3A */ slwi r0, r4, 2 -/* 802F2988 7C 63 02 14 */ add r3, r3, r0 -/* 802F298C 90 A3 00 4C */ stw r5, 0x4c(r3) -/* 802F2990 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage.s deleted file mode 100644 index bab82ac110d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F26E0: -/* 802F26E0 80 A5 00 00 */ lwz r5, 0(r5) -/* 802F26E4 54 80 10 3A */ slwi r0, r4, 2 -/* 802F26E8 7C 63 02 14 */ add r3, r3, r0 -/* 802F26EC 90 A3 00 5C */ stw r5, 0x5c(r3) -/* 802F26F0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage.s deleted file mode 100644 index db3d4ad626c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F243C: -/* 802F243C 80 A5 00 00 */ lwz r5, 0(r5) -/* 802F2440 54 80 10 3A */ slwi r0, r4, 2 -/* 802F2444 7C 63 02 14 */ add r3, r3, r0 -/* 802F2448 90 A3 00 7C */ stw r5, 0x7c(r3) -/* 802F244C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage.s deleted file mode 100644 index e1292a76803..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F219C: -/* 802F219C 80 A5 00 00 */ lwz r5, 0(r5) -/* 802F21A0 54 80 10 3A */ slwi r0, r4, 2 -/* 802F21A4 7C 63 02 14 */ add r3, r3, r0 -/* 802F21A8 90 A3 00 BC */ stw r5, 0xbc(r3) -/* 802F21AC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage.s deleted file mode 100644 index a6034557ac7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_802F1EFC: -/* 802F1EFC 80 A5 00 00 */ lwz r5, 0(r5) -/* 802F1F00 54 80 10 3A */ slwi r0, r4, 2 -/* 802F1F04 7C 63 02 14 */ add r3, r3, r0 -/* 802F1F08 90 A3 01 2C */ stw r5, 0x12c(r3) -/* 802F1F0C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s deleted file mode 100644 index 1db0eeaa846..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_802EC258: -/* 802EC258 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EC25C 7C 08 02 A6 */ mflr r0 -/* 802EC260 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EC264 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC268 48 07 5F 75 */ bl _savegpr_29 -/* 802EC26C 7C 7D 1B 78 */ mr r29, r3 -/* 802EC270 7C BE 2B 78 */ mr r30, r5 -/* 802EC274 28 04 00 00 */ cmplwi r4, 0 -/* 802EC278 41 82 00 0C */ beq lbl_802EC284 -/* 802EC27C 38 60 00 00 */ li r3, 0 -/* 802EC280 48 00 00 80 */ b lbl_802EC300 -lbl_802EC284: -/* 802EC284 28 1E 00 00 */ cmplwi r30, 0 -/* 802EC288 41 82 00 64 */ beq lbl_802EC2EC -/* 802EC28C 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 802EC290 28 03 00 00 */ cmplwi r3, 0 -/* 802EC294 40 82 00 38 */ bne lbl_802EC2CC -/* 802EC298 38 60 00 18 */ li r3, 0x18 -/* 802EC29C 4B FE 29 B1 */ bl __nw__FUl -/* 802EC2A0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EC2A4 41 82 00 10 */ beq lbl_802EC2B4 -/* 802EC2A8 38 80 00 00 */ li r4, 0 -/* 802EC2AC 7F C5 F3 78 */ mr r5, r30 -/* 802EC2B0 4B FF 25 E1 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EC2B4: -/* 802EC2B4 93 FD 00 54 */ stw r31, 0x54(r29) -/* 802EC2B8 80 1D 00 54 */ lwz r0, 0x54(r29) -/* 802EC2BC 28 00 00 00 */ cmplwi r0, 0 -/* 802EC2C0 40 82 00 14 */ bne lbl_802EC2D4 -/* 802EC2C4 38 60 00 00 */ li r3, 0 -/* 802EC2C8 48 00 00 38 */ b lbl_802EC300 -lbl_802EC2CC: -/* 802EC2CC 38 80 00 00 */ li r4, 0 -/* 802EC2D0 4B FF 25 C1 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EC2D4: -/* 802EC2D4 80 7D 00 50 */ lwz r3, 0x50(r29) -/* 802EC2D8 28 03 00 00 */ cmplwi r3, 0 -/* 802EC2DC 41 82 00 20 */ beq lbl_802EC2FC -/* 802EC2E0 80 9D 00 54 */ lwz r4, 0x54(r29) -/* 802EC2E4 4B FF 22 CD */ bl attachPalette__10JUTTextureFP10JUTPalette -/* 802EC2E8 48 00 00 14 */ b lbl_802EC2FC -lbl_802EC2EC: -/* 802EC2EC 80 7D 00 54 */ lwz r3, 0x54(r29) -/* 802EC2F0 4B FE 2A 4D */ bl __dl__FPv -/* 802EC2F4 38 00 00 00 */ li r0, 0 -/* 802EC2F8 90 1D 00 54 */ stw r0, 0x54(r29) -lbl_802EC2FC: -/* 802EC2FC 38 60 00 01 */ li r3, 1 -lbl_802EC300: -/* 802EC300 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC304 48 07 5F 25 */ bl _restgpr_29 -/* 802EC308 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EC30C 7C 08 03 A6 */ mtlr r0 -/* 802EC310 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC314 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s deleted file mode 100644 index 5be8801dc69..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802ED424: -/* 802ED424 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ED428 7C 08 02 A6 */ mflr r0 -/* 802ED42C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ED430 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED434 48 07 4D 9D */ bl _savegpr_26 -/* 802ED438 7C 7A 1B 78 */ mr r26, r3 -/* 802ED43C 7C 9B 23 78 */ mr r27, r4 -/* 802ED440 7C BC 2B 78 */ mr r28, r5 -/* 802ED444 28 1B 00 02 */ cmplwi r27, 2 -/* 802ED448 41 80 00 0C */ blt lbl_802ED454 -/* 802ED44C 38 60 00 00 */ li r3, 0 -/* 802ED450 48 00 00 94 */ b lbl_802ED4E4 -lbl_802ED454: -/* 802ED454 28 1C 00 00 */ cmplwi r28, 0 -/* 802ED458 41 82 00 70 */ beq lbl_802ED4C8 -/* 802ED45C 57 7D 10 3A */ slwi r29, r27, 2 -/* 802ED460 7F DA EA 14 */ add r30, r26, r29 -/* 802ED464 80 7E 00 6C */ lwz r3, 0x6c(r30) -/* 802ED468 28 03 00 00 */ cmplwi r3, 0 -/* 802ED46C 40 82 00 38 */ bne lbl_802ED4A4 -/* 802ED470 38 60 00 18 */ li r3, 0x18 -/* 802ED474 4B FE 17 D9 */ bl __nw__FUl -/* 802ED478 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802ED47C 41 82 00 10 */ beq lbl_802ED48C -/* 802ED480 7F 64 DB 78 */ mr r4, r27 -/* 802ED484 7F 85 E3 78 */ mr r5, r28 -/* 802ED488 4B FF 14 09 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802ED48C: -/* 802ED48C 93 FE 00 6C */ stw r31, 0x6c(r30) -/* 802ED490 80 1E 00 6C */ lwz r0, 0x6c(r30) -/* 802ED494 28 00 00 00 */ cmplwi r0, 0 -/* 802ED498 40 82 00 14 */ bne lbl_802ED4AC -/* 802ED49C 38 60 00 00 */ li r3, 0 -/* 802ED4A0 48 00 00 44 */ b lbl_802ED4E4 -lbl_802ED4A4: -/* 802ED4A4 38 80 00 00 */ li r4, 0 -/* 802ED4A8 4B FF 13 E9 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802ED4AC: -/* 802ED4AC 7C 7A EA 14 */ add r3, r26, r29 -/* 802ED4B0 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802ED4B4 28 03 00 00 */ cmplwi r3, 0 -/* 802ED4B8 41 82 00 28 */ beq lbl_802ED4E0 -/* 802ED4BC 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 802ED4C0 4B FF 10 F1 */ bl attachPalette__10JUTTextureFP10JUTPalette -/* 802ED4C4 48 00 00 1C */ b lbl_802ED4E0 -lbl_802ED4C8: -/* 802ED4C8 57 60 10 3A */ slwi r0, r27, 2 -/* 802ED4CC 7F BA 02 14 */ add r29, r26, r0 -/* 802ED4D0 80 7D 00 6C */ lwz r3, 0x6c(r29) -/* 802ED4D4 4B FE 18 69 */ bl __dl__FPv -/* 802ED4D8 38 00 00 00 */ li r0, 0 -/* 802ED4DC 90 1D 00 6C */ stw r0, 0x6c(r29) -lbl_802ED4E0: -/* 802ED4E0 38 60 00 01 */ li r3, 1 -lbl_802ED4E4: -/* 802ED4E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED4E8 48 07 4D 35 */ bl _restgpr_26 -/* 802ED4EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802ED4F0 7C 08 03 A6 */ mtlr r0 -/* 802ED4F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ED4F8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s deleted file mode 100644 index ba61c4f1dac..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802EE8CC: -/* 802EE8CC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EE8D0 7C 08 02 A6 */ mflr r0 -/* 802EE8D4 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EE8D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE8DC 48 07 38 F5 */ bl _savegpr_26 -/* 802EE8E0 7C 7A 1B 78 */ mr r26, r3 -/* 802EE8E4 7C 9B 23 78 */ mr r27, r4 -/* 802EE8E8 7C BC 2B 78 */ mr r28, r5 -/* 802EE8EC 28 1B 00 04 */ cmplwi r27, 4 -/* 802EE8F0 41 80 00 0C */ blt lbl_802EE8FC -/* 802EE8F4 38 60 00 00 */ li r3, 0 -/* 802EE8F8 48 00 00 94 */ b lbl_802EE98C -lbl_802EE8FC: -/* 802EE8FC 28 1C 00 00 */ cmplwi r28, 0 -/* 802EE900 41 82 00 70 */ beq lbl_802EE970 -/* 802EE904 57 7D 10 3A */ slwi r29, r27, 2 -/* 802EE908 7F DA EA 14 */ add r30, r26, r29 -/* 802EE90C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 802EE910 28 03 00 00 */ cmplwi r3, 0 -/* 802EE914 40 82 00 38 */ bne lbl_802EE94C -/* 802EE918 38 60 00 18 */ li r3, 0x18 -/* 802EE91C 4B FE 03 31 */ bl __nw__FUl -/* 802EE920 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EE924 41 82 00 10 */ beq lbl_802EE934 -/* 802EE928 7F 64 DB 78 */ mr r4, r27 -/* 802EE92C 7F 85 E3 78 */ mr r5, r28 -/* 802EE930 4B FE FF 61 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EE934: -/* 802EE934 93 FE 00 9C */ stw r31, 0x9c(r30) -/* 802EE938 80 1E 00 9C */ lwz r0, 0x9c(r30) -/* 802EE93C 28 00 00 00 */ cmplwi r0, 0 -/* 802EE940 40 82 00 14 */ bne lbl_802EE954 -/* 802EE944 38 60 00 00 */ li r3, 0 -/* 802EE948 48 00 00 44 */ b lbl_802EE98C -lbl_802EE94C: -/* 802EE94C 38 80 00 00 */ li r4, 0 -/* 802EE950 4B FE FF 41 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EE954: -/* 802EE954 7C 7A EA 14 */ add r3, r26, r29 -/* 802EE958 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802EE95C 28 03 00 00 */ cmplwi r3, 0 -/* 802EE960 41 82 00 28 */ beq lbl_802EE988 -/* 802EE964 80 9E 00 9C */ lwz r4, 0x9c(r30) -/* 802EE968 4B FE FC 49 */ bl attachPalette__10JUTTextureFP10JUTPalette -/* 802EE96C 48 00 00 1C */ b lbl_802EE988 -lbl_802EE970: -/* 802EE970 57 60 10 3A */ slwi r0, r27, 2 -/* 802EE974 7F BA 02 14 */ add r29, r26, r0 -/* 802EE978 80 7D 00 9C */ lwz r3, 0x9c(r29) -/* 802EE97C 4B FE 03 C1 */ bl __dl__FPv -/* 802EE980 38 00 00 00 */ li r0, 0 -/* 802EE984 90 1D 00 9C */ stw r0, 0x9c(r29) -lbl_802EE988: -/* 802EE988 38 60 00 01 */ li r3, 1 -lbl_802EE98C: -/* 802EE98C 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE990 48 07 38 8D */ bl _restgpr_26 -/* 802EE994 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EE998 7C 08 03 A6 */ mtlr r0 -/* 802EE99C 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EE9A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s deleted file mode 100644 index 0f6572a12b5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802EFD68: -/* 802EFD68 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EFD6C 7C 08 02 A6 */ mflr r0 -/* 802EFD70 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EFD74 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFD78 48 07 24 59 */ bl _savegpr_26 -/* 802EFD7C 7C 7A 1B 78 */ mr r26, r3 -/* 802EFD80 7C 9B 23 78 */ mr r27, r4 -/* 802EFD84 7C BC 2B 78 */ mr r28, r5 -/* 802EFD88 28 1B 00 08 */ cmplwi r27, 8 -/* 802EFD8C 41 80 00 0C */ blt lbl_802EFD98 -/* 802EFD90 38 60 00 00 */ li r3, 0 -/* 802EFD94 48 00 00 94 */ b lbl_802EFE28 -lbl_802EFD98: -/* 802EFD98 28 1C 00 00 */ cmplwi r28, 0 -/* 802EFD9C 41 82 00 70 */ beq lbl_802EFE0C -/* 802EFDA0 57 7D 10 3A */ slwi r29, r27, 2 -/* 802EFDA4 7F DA EA 14 */ add r30, r26, r29 -/* 802EFDA8 80 7E 00 FC */ lwz r3, 0xfc(r30) -/* 802EFDAC 28 03 00 00 */ cmplwi r3, 0 -/* 802EFDB0 40 82 00 38 */ bne lbl_802EFDE8 -/* 802EFDB4 38 60 00 18 */ li r3, 0x18 -/* 802EFDB8 4B FD EE 95 */ bl __nw__FUl -/* 802EFDBC 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802EFDC0 41 82 00 10 */ beq lbl_802EFDD0 -/* 802EFDC4 7F 64 DB 78 */ mr r4, r27 -/* 802EFDC8 7F 85 E3 78 */ mr r5, r28 -/* 802EFDCC 4B FE EA C5 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EFDD0: -/* 802EFDD0 93 FE 00 FC */ stw r31, 0xfc(r30) -/* 802EFDD4 80 1E 00 FC */ lwz r0, 0xfc(r30) -/* 802EFDD8 28 00 00 00 */ cmplwi r0, 0 -/* 802EFDDC 40 82 00 14 */ bne lbl_802EFDF0 -/* 802EFDE0 38 60 00 00 */ li r3, 0 -/* 802EFDE4 48 00 00 44 */ b lbl_802EFE28 -lbl_802EFDE8: -/* 802EFDE8 38 80 00 00 */ li r4, 0 -/* 802EFDEC 4B FE EA A5 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802EFDF0: -/* 802EFDF0 7C 7A EA 14 */ add r3, r26, r29 -/* 802EFDF4 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802EFDF8 28 03 00 00 */ cmplwi r3, 0 -/* 802EFDFC 41 82 00 28 */ beq lbl_802EFE24 -/* 802EFE00 80 9E 00 FC */ lwz r4, 0xfc(r30) -/* 802EFE04 4B FE E7 AD */ bl attachPalette__10JUTTextureFP10JUTPalette -/* 802EFE08 48 00 00 1C */ b lbl_802EFE24 -lbl_802EFE0C: -/* 802EFE0C 57 60 10 3A */ slwi r0, r27, 2 -/* 802EFE10 7F BA 02 14 */ add r29, r26, r0 -/* 802EFE14 80 7D 00 FC */ lwz r3, 0xfc(r29) -/* 802EFE18 4B FD EF 25 */ bl __dl__FPv -/* 802EFE1C 38 00 00 00 */ li r0, 0 -/* 802EFE20 90 1D 00 FC */ stw r0, 0xfc(r29) -lbl_802EFE24: -/* 802EFE24 38 60 00 01 */ li r3, 1 -lbl_802EFE28: -/* 802EFE28 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFE2C 48 07 23 F1 */ bl _restgpr_26 -/* 802EFE30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EFE34 7C 08 03 A6 */ mtlr r0 -/* 802EFE38 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EFE3C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s b/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s deleted file mode 100644 index 513933c3d9d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_802F11E8: -/* 802F11E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F11EC 7C 08 02 A6 */ mflr r0 -/* 802F11F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F11F4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F11F8 48 07 0F D9 */ bl _savegpr_26 -/* 802F11FC 7C 7A 1B 78 */ mr r26, r3 -/* 802F1200 7C 9B 23 78 */ mr r27, r4 -/* 802F1204 7C BC 2B 78 */ mr r28, r5 -/* 802F1208 28 1B 00 08 */ cmplwi r27, 8 -/* 802F120C 41 80 00 0C */ blt lbl_802F1218 -/* 802F1210 38 60 00 00 */ li r3, 0 -/* 802F1214 48 00 00 94 */ b lbl_802F12A8 -lbl_802F1218: -/* 802F1218 28 1C 00 00 */ cmplwi r28, 0 -/* 802F121C 41 82 00 70 */ beq lbl_802F128C -/* 802F1220 57 7D 10 3A */ slwi r29, r27, 2 -/* 802F1224 7F DA EA 14 */ add r30, r26, r29 -/* 802F1228 80 7E 01 8C */ lwz r3, 0x18c(r30) -/* 802F122C 28 03 00 00 */ cmplwi r3, 0 -/* 802F1230 40 82 00 38 */ bne lbl_802F1268 -/* 802F1234 38 60 00 18 */ li r3, 0x18 -/* 802F1238 4B FD DA 15 */ bl __nw__FUl -/* 802F123C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802F1240 41 82 00 10 */ beq lbl_802F1250 -/* 802F1244 7F 64 DB 78 */ mr r4, r27 -/* 802F1248 7F 85 E3 78 */ mr r5, r28 -/* 802F124C 4B FE D6 45 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802F1250: -/* 802F1250 93 FE 01 8C */ stw r31, 0x18c(r30) -/* 802F1254 80 1E 01 8C */ lwz r0, 0x18c(r30) -/* 802F1258 28 00 00 00 */ cmplwi r0, 0 -/* 802F125C 40 82 00 14 */ bne lbl_802F1270 -/* 802F1260 38 60 00 00 */ li r3, 0 -/* 802F1264 48 00 00 44 */ b lbl_802F12A8 -lbl_802F1268: -/* 802F1268 38 80 00 00 */ li r4, 0 -/* 802F126C 4B FE D6 25 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT -lbl_802F1270: -/* 802F1270 7C 7A EA 14 */ add r3, r26, r29 -/* 802F1274 80 63 01 6C */ lwz r3, 0x16c(r3) -/* 802F1278 28 03 00 00 */ cmplwi r3, 0 -/* 802F127C 41 82 00 28 */ beq lbl_802F12A4 -/* 802F1280 80 9E 01 8C */ lwz r4, 0x18c(r30) -/* 802F1284 4B FE D3 2D */ bl attachPalette__10JUTTextureFP10JUTPalette -/* 802F1288 48 00 00 1C */ b lbl_802F12A4 -lbl_802F128C: -/* 802F128C 57 60 10 3A */ slwi r0, r27, 2 -/* 802F1290 7F BA 02 14 */ add r29, r26, r0 -/* 802F1294 80 7D 01 8C */ lwz r3, 0x18c(r29) -/* 802F1298 4B FD DA A5 */ bl __dl__FPv -/* 802F129C 38 00 00 00 */ li r0, 0 -/* 802F12A0 90 1D 01 8C */ stw r0, 0x18c(r29) -lbl_802F12A4: -/* 802F12A4 38 60 00 01 */ li r3, 1 -lbl_802F12A8: -/* 802F12A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F12AC 48 07 0F 71 */ bl _restgpr_26 -/* 802F12B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F12B4 7C 08 03 A6 */ mtlr r0 -/* 802F12B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F12BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock1FUl13J2DGXColorS10.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock1FUl13J2DGXColorS10.s deleted file mode 100644 index 4086c4d35cb..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock1FUl13J2DGXColorS10.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F281C: -/* 802F281C A8 05 00 00 */ lha r0, 0(r5) -/* 802F2820 54 84 18 38 */ slwi r4, r4, 3 -/* 802F2824 7C 63 22 14 */ add r3, r3, r4 -/* 802F2828 B0 03 00 0C */ sth r0, 0xc(r3) -/* 802F282C A8 05 00 02 */ lha r0, 2(r5) -/* 802F2830 B0 03 00 0E */ sth r0, 0xe(r3) -/* 802F2834 A8 05 00 04 */ lha r0, 4(r5) -/* 802F2838 B0 03 00 10 */ sth r0, 0x10(r3) -/* 802F283C A8 05 00 06 */ lha r0, 6(r5) -/* 802F2840 B0 03 00 12 */ sth r0, 0x12(r3) -/* 802F2844 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock2FUl13J2DGXColorS10.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock2FUl13J2DGXColorS10.s deleted file mode 100644 index acff1e35c27..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock2FUl13J2DGXColorS10.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F2578: -/* 802F2578 A8 05 00 00 */ lha r0, 0(r5) -/* 802F257C 54 84 18 38 */ slwi r4, r4, 3 -/* 802F2580 7C 63 22 14 */ add r3, r3, r4 -/* 802F2584 B0 03 00 12 */ sth r0, 0x12(r3) -/* 802F2588 A8 05 00 02 */ lha r0, 2(r5) -/* 802F258C B0 03 00 14 */ sth r0, 0x14(r3) -/* 802F2590 A8 05 00 04 */ lha r0, 4(r5) -/* 802F2594 B0 03 00 16 */ sth r0, 0x16(r3) -/* 802F2598 A8 05 00 06 */ lha r0, 6(r5) -/* 802F259C B0 03 00 18 */ sth r0, 0x18(r3) -/* 802F25A0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock4FUl13J2DGXColorS10.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock4FUl13J2DGXColorS10.s deleted file mode 100644 index f82abda6bde..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock4FUl13J2DGXColorS10.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F22D4: -/* 802F22D4 A8 05 00 00 */ lha r0, 0(r5) -/* 802F22D8 54 84 18 38 */ slwi r4, r4, 3 -/* 802F22DC 7C 63 22 14 */ add r3, r3, r4 -/* 802F22E0 B0 03 00 1E */ sth r0, 0x1e(r3) -/* 802F22E4 A8 05 00 02 */ lha r0, 2(r5) -/* 802F22E8 B0 03 00 20 */ sth r0, 0x20(r3) -/* 802F22EC A8 05 00 04 */ lha r0, 4(r5) -/* 802F22F0 B0 03 00 22 */ sth r0, 0x22(r3) -/* 802F22F4 A8 05 00 06 */ lha r0, 6(r5) -/* 802F22F8 B0 03 00 24 */ sth r0, 0x24(r3) -/* 802F22FC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock8FUl13J2DGXColorS10.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock8FUl13J2DGXColorS10.s deleted file mode 100644 index 091ba3ae0b4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock8FUl13J2DGXColorS10.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F2034: -/* 802F2034 A8 05 00 00 */ lha r0, 0(r5) -/* 802F2038 54 84 18 38 */ slwi r4, r4, 3 -/* 802F203C 7C 63 22 14 */ add r3, r3, r4 -/* 802F2040 B0 03 00 36 */ sth r0, 0x36(r3) -/* 802F2044 A8 05 00 02 */ lha r0, 2(r5) -/* 802F2048 B0 03 00 38 */ sth r0, 0x38(r3) -/* 802F204C A8 05 00 04 */ lha r0, 4(r5) -/* 802F2050 B0 03 00 3A */ sth r0, 0x3a(r3) -/* 802F2054 A8 05 00 06 */ lha r0, 6(r5) -/* 802F2058 B0 03 00 3C */ sth r0, 0x3c(r3) -/* 802F205C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__13J2DTevBlock16FUl13J2DGXColorS10.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__13J2DTevBlock16FUl13J2DGXColorS10.s deleted file mode 100644 index 50f85a4c98b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__13J2DTevBlock16FUl13J2DGXColorS10.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F1D94: -/* 802F1D94 A8 05 00 00 */ lha r0, 0(r5) -/* 802F1D98 54 84 18 38 */ slwi r4, r4, 3 -/* 802F1D9C 7C 63 22 14 */ add r3, r3, r4 -/* 802F1DA0 B0 03 00 56 */ sth r0, 0x56(r3) -/* 802F1DA4 A8 05 00 02 */ lha r0, 2(r5) -/* 802F1DA8 B0 03 00 58 */ sth r0, 0x58(r3) -/* 802F1DAC A8 05 00 04 */ lha r0, 4(r5) -/* 802F1DB0 B0 03 00 5A */ sth r0, 0x5a(r3) -/* 802F1DB4 A8 05 00 06 */ lha r0, 6(r5) -/* 802F1DB8 B0 03 00 5C */ sth r0, 0x5c(r3) -/* 802F1DBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock1FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock1FUlUc.s deleted file mode 100644 index 9c04c34d4d7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock1FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F28B4: -/* 802F28B4 7C 63 22 14 */ add r3, r3, r4 -/* 802F28B8 98 A3 00 45 */ stb r5, 0x45(r3) -/* 802F28BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock2FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock2FUlUc.s deleted file mode 100644 index 44ac3c93450..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock2FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2610: -/* 802F2610 7C 63 22 14 */ add r3, r3, r4 -/* 802F2614 98 A3 00 56 */ stb r5, 0x56(r3) -/* 802F2618 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock4FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock4FUlUc.s deleted file mode 100644 index 5fe63d9e419..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock4FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F236C: -/* 802F236C 7C 63 22 14 */ add r3, r3, r4 -/* 802F2370 98 A3 00 74 */ stb r5, 0x74(r3) -/* 802F2374 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock8FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock8FUlUc.s deleted file mode 100644 index 8428038759c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock8FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F20CC: -/* 802F20CC 7C 63 22 14 */ add r3, r3, r4 -/* 802F20D0 98 A3 00 B0 */ stb r5, 0xb0(r3) -/* 802F20D4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__13J2DTevBlock16FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__13J2DTevBlock16FUlUc.s deleted file mode 100644 index 04f5c1ad148..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__13J2DTevBlock16FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1E2C: -/* 802F1E2C 7C 63 22 14 */ add r3, r3, r4 -/* 802F1E30 98 A3 01 18 */ stb r5, 0x118(r3) -/* 802F1E34 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock1FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock1FUlUc.s deleted file mode 100644 index 98117a6fd44..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock1FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F289C: -/* 802F289C 7C 63 22 14 */ add r3, r3, r4 -/* 802F28A0 98 A3 00 44 */ stb r5, 0x44(r3) -/* 802F28A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock2FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock2FUlUc.s deleted file mode 100644 index 3394afeea57..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock2FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F25F8: -/* 802F25F8 7C 63 22 14 */ add r3, r3, r4 -/* 802F25FC 98 A3 00 54 */ stb r5, 0x54(r3) -/* 802F2600 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock4FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock4FUlUc.s deleted file mode 100644 index 50cdd9477d5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock4FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F2354: -/* 802F2354 7C 63 22 14 */ add r3, r3, r4 -/* 802F2358 98 A3 00 70 */ stb r5, 0x70(r3) -/* 802F235C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock8FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock8FUlUc.s deleted file mode 100644 index 5c09fbfc551..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock8FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F20B4: -/* 802F20B4 7C 63 22 14 */ add r3, r3, r4 -/* 802F20B8 98 A3 00 A8 */ stb r5, 0xa8(r3) -/* 802F20BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__13J2DTevBlock16FUlUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__13J2DTevBlock16FUlUc.s deleted file mode 100644 index 213482cc6ff..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__13J2DTevBlock16FUlUc.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_802F1E14: -/* 802F1E14 7C 63 22 14 */ add r3, r3, r4 -/* 802F1E18 98 A3 01 08 */ stb r5, 0x108(r3) -/* 802F1E1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor.s deleted file mode 100644 index cad64724659..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F285C: -/* 802F285C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2860 54 84 10 3A */ slwi r4, r4, 2 -/* 802F2864 7C 63 22 14 */ add r3, r3, r4 -/* 802F2868 98 03 00 34 */ stb r0, 0x34(r3) -/* 802F286C 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2870 98 03 00 35 */ stb r0, 0x35(r3) -/* 802F2874 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2878 98 03 00 36 */ stb r0, 0x36(r3) -/* 802F287C 88 05 00 03 */ lbz r0, 3(r5) -/* 802F2880 98 03 00 37 */ stb r0, 0x37(r3) -/* 802F2884 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor.s deleted file mode 100644 index 0c888b79d55..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F25B8: -/* 802F25B8 88 05 00 00 */ lbz r0, 0(r5) -/* 802F25BC 54 84 10 3A */ slwi r4, r4, 2 -/* 802F25C0 7C 63 22 14 */ add r3, r3, r4 -/* 802F25C4 98 03 00 44 */ stb r0, 0x44(r3) -/* 802F25C8 88 05 00 01 */ lbz r0, 1(r5) -/* 802F25CC 98 03 00 45 */ stb r0, 0x45(r3) -/* 802F25D0 88 05 00 02 */ lbz r0, 2(r5) -/* 802F25D4 98 03 00 46 */ stb r0, 0x46(r3) -/* 802F25D8 88 05 00 03 */ lbz r0, 3(r5) -/* 802F25DC 98 03 00 47 */ stb r0, 0x47(r3) -/* 802F25E0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor.s deleted file mode 100644 index f77dce97e0a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F2314: -/* 802F2314 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2318 54 84 10 3A */ slwi r4, r4, 2 -/* 802F231C 7C 63 22 14 */ add r3, r3, r4 -/* 802F2320 98 03 00 60 */ stb r0, 0x60(r3) -/* 802F2324 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2328 98 03 00 61 */ stb r0, 0x61(r3) -/* 802F232C 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2330 98 03 00 62 */ stb r0, 0x62(r3) -/* 802F2334 88 05 00 03 */ lbz r0, 3(r5) -/* 802F2338 98 03 00 63 */ stb r0, 0x63(r3) -/* 802F233C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor.s deleted file mode 100644 index b9e34b3204e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F2074: -/* 802F2074 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2078 54 84 10 3A */ slwi r4, r4, 2 -/* 802F207C 7C 63 22 14 */ add r3, r3, r4 -/* 802F2080 98 03 00 98 */ stb r0, 0x98(r3) -/* 802F2084 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2088 98 03 00 99 */ stb r0, 0x99(r3) -/* 802F208C 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2090 98 03 00 9A */ stb r0, 0x9a(r3) -/* 802F2094 88 05 00 03 */ lbz r0, 3(r5) -/* 802F2098 98 03 00 9B */ stb r0, 0x9b(r3) -/* 802F209C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor.s deleted file mode 100644 index 154869219fc..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_802F1DD4: -/* 802F1DD4 88 05 00 00 */ lbz r0, 0(r5) -/* 802F1DD8 54 84 10 3A */ slwi r4, r4, 2 -/* 802F1DDC 7C 63 22 14 */ add r3, r3, r4 -/* 802F1DE0 98 03 00 F8 */ stb r0, 0xf8(r3) -/* 802F1DE4 88 05 00 01 */ lbz r0, 1(r5) -/* 802F1DE8 98 03 00 F9 */ stb r0, 0xf9(r3) -/* 802F1DEC 88 05 00 02 */ lbz r0, 2(r5) -/* 802F1DF0 98 03 00 FA */ stb r0, 0xfa(r3) -/* 802F1DF4 88 05 00 03 */ lbz r0, 3(r5) -/* 802F1DF8 98 03 00 FB */ stb r0, 0xfb(r3) -/* 802F1DFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock1FUl11J2DTevOrder.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock1FUl11J2DTevOrder.s deleted file mode 100644 index d02f74db31f..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock1FUl11J2DTevOrder.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F27E4: -/* 802F27E4 88 05 00 00 */ lbz r0, 0(r5) -/* 802F27E8 54 84 10 3A */ slwi r4, r4, 2 -/* 802F27EC 7C 63 22 14 */ add r3, r3, r4 -/* 802F27F0 98 03 00 08 */ stb r0, 8(r3) -/* 802F27F4 88 05 00 01 */ lbz r0, 1(r5) -/* 802F27F8 98 03 00 09 */ stb r0, 9(r3) -/* 802F27FC 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2800 98 03 00 0A */ stb r0, 0xa(r3) -/* 802F2804 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock2FUl11J2DTevOrder.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock2FUl11J2DTevOrder.s deleted file mode 100644 index 05da035f5f8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock2FUl11J2DTevOrder.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F2540: -/* 802F2540 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2544 54 84 10 3A */ slwi r4, r4, 2 -/* 802F2548 7C 63 22 14 */ add r3, r3, r4 -/* 802F254C 98 03 00 0A */ stb r0, 0xa(r3) -/* 802F2550 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2554 98 03 00 0B */ stb r0, 0xb(r3) -/* 802F2558 88 05 00 02 */ lbz r0, 2(r5) -/* 802F255C 98 03 00 0C */ stb r0, 0xc(r3) -/* 802F2560 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock4FUl11J2DTevOrder.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock4FUl11J2DTevOrder.s deleted file mode 100644 index 26db4ff447c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock4FUl11J2DTevOrder.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F229C: -/* 802F229C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F22A0 54 84 10 3A */ slwi r4, r4, 2 -/* 802F22A4 7C 63 22 14 */ add r3, r3, r4 -/* 802F22A8 98 03 00 0E */ stb r0, 0xe(r3) -/* 802F22AC 88 05 00 01 */ lbz r0, 1(r5) -/* 802F22B0 98 03 00 0F */ stb r0, 0xf(r3) -/* 802F22B4 88 05 00 02 */ lbz r0, 2(r5) -/* 802F22B8 98 03 00 10 */ stb r0, 0x10(r3) -/* 802F22BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock8FUl11J2DTevOrder.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock8FUl11J2DTevOrder.s deleted file mode 100644 index feb5adb579e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock8FUl11J2DTevOrder.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F1FFC: -/* 802F1FFC 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2000 54 84 10 3A */ slwi r4, r4, 2 -/* 802F2004 7C 63 22 14 */ add r3, r3, r4 -/* 802F2008 98 03 00 16 */ stb r0, 0x16(r3) -/* 802F200C 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2010 98 03 00 17 */ stb r0, 0x17(r3) -/* 802F2014 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2018 98 03 00 18 */ stb r0, 0x18(r3) -/* 802F201C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__13J2DTevBlock16FUl11J2DTevOrder.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__13J2DTevBlock16FUl11J2DTevOrder.s deleted file mode 100644 index bd7166f27b3..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__13J2DTevBlock16FUl11J2DTevOrder.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_802F1D5C: -/* 802F1D5C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F1D60 54 84 10 3A */ slwi r4, r4, 2 -/* 802F1D64 7C 63 22 14 */ add r3, r3, r4 -/* 802F1D68 98 03 00 16 */ stb r0, 0x16(r3) -/* 802F1D6C 88 05 00 01 */ lbz r0, 1(r5) -/* 802F1D70 98 03 00 17 */ stb r0, 0x17(r3) -/* 802F1D74 88 05 00 02 */ lbz r0, 2(r5) -/* 802F1D78 98 03 00 18 */ stb r0, 0x18(r3) -/* 802F1D7C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock1FUl11J2DTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock1FUl11J2DTevStage.s deleted file mode 100644 index d770c49d6da..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock1FUl11J2DTevStage.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F28D8: -/* 802F28D8 88 05 00 01 */ lbz r0, 1(r5) -/* 802F28DC 54 84 18 38 */ slwi r4, r4, 3 -/* 802F28E0 7C 63 22 14 */ add r3, r3, r4 -/* 802F28E4 98 03 00 2D */ stb r0, 0x2d(r3) -/* 802F28E8 88 05 00 02 */ lbz r0, 2(r5) -/* 802F28EC 98 03 00 2E */ stb r0, 0x2e(r3) -/* 802F28F0 88 05 00 03 */ lbz r0, 3(r5) -/* 802F28F4 98 03 00 2F */ stb r0, 0x2f(r3) -/* 802F28F8 88 05 00 05 */ lbz r0, 5(r5) -/* 802F28FC 98 03 00 31 */ stb r0, 0x31(r3) -/* 802F2900 88 05 00 06 */ lbz r0, 6(r5) -/* 802F2904 98 03 00 32 */ stb r0, 0x32(r3) -/* 802F2908 88 05 00 07 */ lbz r0, 7(r5) -/* 802F290C 98 03 00 33 */ stb r0, 0x33(r3) -/* 802F2910 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock2FUl11J2DTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock2FUl11J2DTevStage.s deleted file mode 100644 index 0aee139082b..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock2FUl11J2DTevStage.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F2638: -/* 802F2638 88 05 00 01 */ lbz r0, 1(r5) -/* 802F263C 54 84 18 38 */ slwi r4, r4, 3 -/* 802F2640 7C 63 22 14 */ add r3, r3, r4 -/* 802F2644 98 03 00 34 */ stb r0, 0x34(r3) -/* 802F2648 88 05 00 02 */ lbz r0, 2(r5) -/* 802F264C 98 03 00 35 */ stb r0, 0x35(r3) -/* 802F2650 88 05 00 03 */ lbz r0, 3(r5) -/* 802F2654 98 03 00 36 */ stb r0, 0x36(r3) -/* 802F2658 88 05 00 05 */ lbz r0, 5(r5) -/* 802F265C 98 03 00 38 */ stb r0, 0x38(r3) -/* 802F2660 88 05 00 06 */ lbz r0, 6(r5) -/* 802F2664 98 03 00 39 */ stb r0, 0x39(r3) -/* 802F2668 88 05 00 07 */ lbz r0, 7(r5) -/* 802F266C 98 03 00 3A */ stb r0, 0x3a(r3) -/* 802F2670 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock4FUl11J2DTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock4FUl11J2DTevStage.s deleted file mode 100644 index bb8bf40c3cd..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock4FUl11J2DTevStage.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F2394: -/* 802F2394 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2398 54 84 18 38 */ slwi r4, r4, 3 -/* 802F239C 7C 63 22 14 */ add r3, r3, r4 -/* 802F23A0 98 03 00 40 */ stb r0, 0x40(r3) -/* 802F23A4 88 05 00 02 */ lbz r0, 2(r5) -/* 802F23A8 98 03 00 41 */ stb r0, 0x41(r3) -/* 802F23AC 88 05 00 03 */ lbz r0, 3(r5) -/* 802F23B0 98 03 00 42 */ stb r0, 0x42(r3) -/* 802F23B4 88 05 00 05 */ lbz r0, 5(r5) -/* 802F23B8 98 03 00 44 */ stb r0, 0x44(r3) -/* 802F23BC 88 05 00 06 */ lbz r0, 6(r5) -/* 802F23C0 98 03 00 45 */ stb r0, 0x45(r3) -/* 802F23C4 88 05 00 07 */ lbz r0, 7(r5) -/* 802F23C8 98 03 00 46 */ stb r0, 0x46(r3) -/* 802F23CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock8FUl11J2DTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock8FUl11J2DTevStage.s deleted file mode 100644 index 4eb0be56087..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock8FUl11J2DTevStage.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F20F4: -/* 802F20F4 88 05 00 01 */ lbz r0, 1(r5) -/* 802F20F8 54 84 18 38 */ slwi r4, r4, 3 -/* 802F20FC 7C 63 22 14 */ add r3, r3, r4 -/* 802F2100 98 03 00 58 */ stb r0, 0x58(r3) -/* 802F2104 88 05 00 02 */ lbz r0, 2(r5) -/* 802F2108 98 03 00 59 */ stb r0, 0x59(r3) -/* 802F210C 88 05 00 03 */ lbz r0, 3(r5) -/* 802F2110 98 03 00 5A */ stb r0, 0x5a(r3) -/* 802F2114 88 05 00 05 */ lbz r0, 5(r5) -/* 802F2118 98 03 00 5C */ stb r0, 0x5c(r3) -/* 802F211C 88 05 00 06 */ lbz r0, 6(r5) -/* 802F2120 98 03 00 5D */ stb r0, 0x5d(r3) -/* 802F2124 88 05 00 07 */ lbz r0, 7(r5) -/* 802F2128 98 03 00 5E */ stb r0, 0x5e(r3) -/* 802F212C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__13J2DTevBlock16FUl11J2DTevStage.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__13J2DTevBlock16FUl11J2DTevStage.s deleted file mode 100644 index 6cce5acd1d8..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__13J2DTevBlock16FUl11J2DTevStage.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_802F1E54: -/* 802F1E54 88 05 00 01 */ lbz r0, 1(r5) -/* 802F1E58 54 84 18 38 */ slwi r4, r4, 3 -/* 802F1E5C 7C 63 22 14 */ add r3, r3, r4 -/* 802F1E60 98 03 00 78 */ stb r0, 0x78(r3) -/* 802F1E64 88 05 00 02 */ lbz r0, 2(r5) -/* 802F1E68 98 03 00 79 */ stb r0, 0x79(r3) -/* 802F1E6C 88 05 00 03 */ lbz r0, 3(r5) -/* 802F1E70 98 03 00 7A */ stb r0, 0x7a(r3) -/* 802F1E74 88 05 00 05 */ lbz r0, 5(r5) -/* 802F1E78 98 03 00 7C */ stb r0, 0x7c(r3) -/* 802F1E7C 88 05 00 06 */ lbz r0, 6(r5) -/* 802F1E80 98 03 00 7D */ stb r0, 0x7d(r3) -/* 802F1E84 88 05 00 07 */ lbz r0, 7(r5) -/* 802F1E88 98 03 00 7E */ stb r0, 0x7e(r3) -/* 802F1E8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s deleted file mode 100644 index 069ad85de3d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F2928: -/* 802F2928 54 80 18 38 */ slwi r0, r4, 3 -/* 802F292C 7C 83 02 14 */ add r4, r3, r0 -/* 802F2930 88 04 00 33 */ lbz r0, 0x33(r4) -/* 802F2934 54 03 07 B6 */ rlwinm r3, r0, 0, 0x1e, 0x1b -/* 802F2938 88 05 00 01 */ lbz r0, 1(r5) -/* 802F293C 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 802F2940 7C 60 03 78 */ or r0, r3, r0 -/* 802F2944 98 04 00 33 */ stb r0, 0x33(r4) -/* 802F2948 88 04 00 33 */ lbz r0, 0x33(r4) -/* 802F294C 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d -/* 802F2950 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2954 7C 60 03 78 */ or r0, r3, r0 -/* 802F2958 98 04 00 33 */ stb r0, 0x33(r4) -/* 802F295C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s deleted file mode 100644 index 8ca91bcafd2..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F2688: -/* 802F2688 54 80 18 38 */ slwi r0, r4, 3 -/* 802F268C 7C 83 02 14 */ add r4, r3, r0 -/* 802F2690 88 04 00 3A */ lbz r0, 0x3a(r4) -/* 802F2694 54 03 07 B6 */ rlwinm r3, r0, 0, 0x1e, 0x1b -/* 802F2698 88 05 00 01 */ lbz r0, 1(r5) -/* 802F269C 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 802F26A0 7C 60 03 78 */ or r0, r3, r0 -/* 802F26A4 98 04 00 3A */ stb r0, 0x3a(r4) -/* 802F26A8 88 04 00 3A */ lbz r0, 0x3a(r4) -/* 802F26AC 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d -/* 802F26B0 88 05 00 00 */ lbz r0, 0(r5) -/* 802F26B4 7C 60 03 78 */ or r0, r3, r0 -/* 802F26B8 98 04 00 3A */ stb r0, 0x3a(r4) -/* 802F26BC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s deleted file mode 100644 index 12bbb467856..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F23E4: -/* 802F23E4 54 80 18 38 */ slwi r0, r4, 3 -/* 802F23E8 7C 83 02 14 */ add r4, r3, r0 -/* 802F23EC 88 04 00 46 */ lbz r0, 0x46(r4) -/* 802F23F0 54 03 07 B6 */ rlwinm r3, r0, 0, 0x1e, 0x1b -/* 802F23F4 88 05 00 01 */ lbz r0, 1(r5) -/* 802F23F8 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 802F23FC 7C 60 03 78 */ or r0, r3, r0 -/* 802F2400 98 04 00 46 */ stb r0, 0x46(r4) -/* 802F2404 88 04 00 46 */ lbz r0, 0x46(r4) -/* 802F2408 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d -/* 802F240C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2410 7C 60 03 78 */ or r0, r3, r0 -/* 802F2414 98 04 00 46 */ stb r0, 0x46(r4) -/* 802F2418 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s deleted file mode 100644 index 4c1d6b3ceab..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F2144: -/* 802F2144 54 80 18 38 */ slwi r0, r4, 3 -/* 802F2148 7C 83 02 14 */ add r4, r3, r0 -/* 802F214C 88 04 00 5E */ lbz r0, 0x5e(r4) -/* 802F2150 54 03 07 B6 */ rlwinm r3, r0, 0, 0x1e, 0x1b -/* 802F2154 88 05 00 01 */ lbz r0, 1(r5) -/* 802F2158 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 802F215C 7C 60 03 78 */ or r0, r3, r0 -/* 802F2160 98 04 00 5E */ stb r0, 0x5e(r4) -/* 802F2164 88 04 00 5E */ lbz r0, 0x5e(r4) -/* 802F2168 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d -/* 802F216C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2170 7C 60 03 78 */ or r0, r3, r0 -/* 802F2174 98 04 00 5E */ stb r0, 0x5e(r4) -/* 802F2178 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s deleted file mode 100644 index 7bbd8e873ff..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_802F1EA4: -/* 802F1EA4 54 80 18 38 */ slwi r0, r4, 3 -/* 802F1EA8 7C 83 02 14 */ add r4, r3, r0 -/* 802F1EAC 88 04 00 7E */ lbz r0, 0x7e(r4) -/* 802F1EB0 54 03 07 B6 */ rlwinm r3, r0, 0, 0x1e, 0x1b -/* 802F1EB4 88 05 00 01 */ lbz r0, 1(r5) -/* 802F1EB8 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d -/* 802F1EBC 7C 60 03 78 */ or r0, r3, r0 -/* 802F1EC0 98 04 00 7E */ stb r0, 0x7e(r4) -/* 802F1EC4 88 04 00 7E */ lbz r0, 0x7e(r4) -/* 802F1EC8 54 03 00 3A */ rlwinm r3, r0, 0, 0, 0x1d -/* 802F1ECC 88 05 00 00 */ lbz r0, 0(r5) -/* 802F1ED0 7C 60 03 78 */ or r0, r3, r0 -/* 802F1ED4 98 04 00 7E */ stb r0, 0x7e(r4) -/* 802F1ED8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable.s deleted file mode 100644 index c913d4b2638..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2960: -/* 802F2960 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2964 7C 63 22 14 */ add r3, r3, r4 -/* 802F2968 98 03 00 46 */ stb r0, 0x46(r3) -/* 802F296C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable.s deleted file mode 100644 index f7c5fa4457d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F26C0: -/* 802F26C0 88 05 00 00 */ lbz r0, 0(r5) -/* 802F26C4 7C 63 22 14 */ add r3, r3, r4 -/* 802F26C8 98 03 00 58 */ stb r0, 0x58(r3) -/* 802F26CC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable.s deleted file mode 100644 index efe3cbf2549..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F241C: -/* 802F241C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2420 7C 63 22 14 */ add r3, r3, r4 -/* 802F2424 98 03 00 78 */ stb r0, 0x78(r3) -/* 802F2428 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable.s deleted file mode 100644 index b69446682d6..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F217C: -/* 802F217C 88 05 00 00 */ lbz r0, 0(r5) -/* 802F2180 7C 63 22 14 */ add r3, r3, r4 -/* 802F2184 98 03 00 B8 */ stb r0, 0xb8(r3) -/* 802F2188 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable.s deleted file mode 100644 index 6ce963c8c0d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1EDC: -/* 802F1EDC 88 05 00 00 */ lbz r0, 0(r5) -/* 802F1EE0 7C 63 22 14 */ add r3, r3, r4 -/* 802F1EE4 98 03 01 28 */ stb r0, 0x128(r3) -/* 802F1EE8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock1FUlUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock1FUlUs.s deleted file mode 100644 index 502d48a23af..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock1FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F27B4: -/* 802F27B4 54 80 08 3C */ slwi r0, r4, 1 -/* 802F27B8 7C 63 02 14 */ add r3, r3, r0 -/* 802F27BC B0 A3 00 04 */ sth r5, 4(r3) -/* 802F27C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock2FUlUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock2FUlUs.s deleted file mode 100644 index b5c270c9b0c..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock2FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2510: -/* 802F2510 54 80 08 3C */ slwi r0, r4, 1 -/* 802F2514 7C 63 02 14 */ add r3, r3, r0 -/* 802F2518 B0 A3 00 04 */ sth r5, 4(r3) -/* 802F251C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock4FUlUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock4FUlUs.s deleted file mode 100644 index 977ebf66713..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock4FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F226C: -/* 802F226C 54 80 08 3C */ slwi r0, r4, 1 -/* 802F2270 7C 63 02 14 */ add r3, r3, r0 -/* 802F2274 B0 A3 00 04 */ sth r5, 4(r3) -/* 802F2278 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock8FUlUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock8FUlUs.s deleted file mode 100644 index fe2d5633faa..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock8FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1FCC: -/* 802F1FCC 54 80 08 3C */ slwi r0, r4, 1 -/* 802F1FD0 7C 63 02 14 */ add r3, r3, r0 -/* 802F1FD4 B0 A3 00 04 */ sth r5, 4(r3) -/* 802F1FD8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__13J2DTevBlock16FUlUs.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__13J2DTevBlock16FUlUs.s deleted file mode 100644 index aa47f43c6df..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__13J2DTevBlock16FUlUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1D2C: -/* 802F1D2C 54 80 08 3C */ slwi r0, r4, 1 -/* 802F1D30 7C 63 02 14 */ add r3, r3, r0 -/* 802F1D34 B0 A3 00 04 */ sth r5, 4(r3) -/* 802F1D38 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s deleted file mode 100644 index 6631e356fe7..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_802EC01C: -/* 802EC01C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802EC020 7C 08 02 A6 */ mflr r0 -/* 802EC024 90 01 00 14 */ stw r0, 0x14(r1) -/* 802EC028 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802EC02C 93 C1 00 08 */ stw r30, 8(r1) -/* 802EC030 7C 7E 1B 78 */ mr r30, r3 -/* 802EC034 7C BF 2B 78 */ mr r31, r5 -/* 802EC038 28 04 00 00 */ cmplwi r4, 0 -/* 802EC03C 41 82 00 0C */ beq lbl_802EC048 -/* 802EC040 38 60 00 00 */ li r3, 0 -/* 802EC044 48 00 00 4C */ b lbl_802EC090 -lbl_802EC048: -/* 802EC048 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EC04C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EC050 41 82 00 10 */ beq lbl_802EC060 -/* 802EC054 80 7E 00 50 */ lwz r3, 0x50(r30) -/* 802EC058 38 80 00 01 */ li r4, 1 -/* 802EC05C 4B FF 21 D9 */ bl __dt__10JUTTextureFv -lbl_802EC060: -/* 802EC060 93 FE 00 50 */ stw r31, 0x50(r30) -/* 802EC064 88 1E 00 5C */ lbz r0, 0x5c(r30) -/* 802EC068 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EC06C 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 802EC070 80 7E 00 54 */ lwz r3, 0x54(r30) -/* 802EC074 4B FE 2C C9 */ bl __dl__FPv -/* 802EC078 38 00 00 00 */ li r0, 0 -/* 802EC07C 90 1E 00 54 */ stw r0, 0x54(r30) -/* 802EC080 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EC084 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EC088 B0 1E 00 04 */ sth r0, 4(r30) -/* 802EC08C 38 60 00 01 */ li r3, 1 -lbl_802EC090: -/* 802EC090 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802EC094 83 C1 00 08 */ lwz r30, 8(r1) -/* 802EC098 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802EC09C 7C 08 03 A6 */ mtlr r0 -/* 802EC0A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802EC0A4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s deleted file mode 100644 index 6252d617745..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s +++ /dev/null @@ -1,112 +0,0 @@ -lbl_802EBE8C: -/* 802EBE8C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EBE90 7C 08 02 A6 */ mflr r0 -/* 802EBE94 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EBE98 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EBE9C 48 07 63 41 */ bl _savegpr_29 -/* 802EBEA0 7C 7F 1B 78 */ mr r31, r3 -/* 802EBEA4 7C BD 2B 78 */ mr r29, r5 -/* 802EBEA8 28 04 00 00 */ cmplwi r4, 0 -/* 802EBEAC 41 82 00 0C */ beq lbl_802EBEB8 -/* 802EBEB0 38 60 00 00 */ li r3, 0 -/* 802EBEB4 48 00 01 50 */ b lbl_802EC004 -lbl_802EBEB8: -/* 802EBEB8 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 802EBEBC 28 03 00 00 */ cmplwi r3, 0 -/* 802EBEC0 40 82 00 78 */ bne lbl_802EBF38 -/* 802EBEC4 28 1D 00 00 */ cmplwi r29, 0 -/* 802EBEC8 41 82 00 60 */ beq lbl_802EBF28 -/* 802EBECC 38 60 00 40 */ li r3, 0x40 -/* 802EBED0 4B FE 2D 7D */ bl __nw__FUl -/* 802EBED4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802EBED8 41 82 00 24 */ beq lbl_802EBEFC -/* 802EBEDC 38 00 00 00 */ li r0, 0 -/* 802EBEE0 90 1E 00 28 */ stw r0, 0x28(r30) -/* 802EBEE4 7F A4 EB 78 */ mr r4, r29 -/* 802EBEE8 38 A0 00 00 */ li r5, 0 -/* 802EBEEC 4B FF 23 BD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802EBEF0 88 1E 00 3B */ lbz r0, 0x3b(r30) -/* 802EBEF4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EBEF8 98 1E 00 3B */ stb r0, 0x3b(r30) -lbl_802EBEFC: -/* 802EBEFC 93 DF 00 50 */ stw r30, 0x50(r31) -/* 802EBF00 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 802EBF04 28 00 00 00 */ cmplwi r0, 0 -/* 802EBF08 40 82 00 0C */ bne lbl_802EBF14 -/* 802EBF0C 38 60 00 00 */ li r3, 0 -/* 802EBF10 48 00 00 F4 */ b lbl_802EC004 -lbl_802EBF14: -/* 802EBF14 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EBF18 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBF1C 60 00 00 01 */ ori r0, r0, 1 -/* 802EBF20 98 1F 00 5C */ stb r0, 0x5c(r31) -/* 802EBF24 48 00 00 C0 */ b lbl_802EBFE4 -lbl_802EBF28: -/* 802EBF28 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EBF2C 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBF30 98 1F 00 5C */ stb r0, 0x5c(r31) -/* 802EBF34 48 00 00 B0 */ b lbl_802EBFE4 -lbl_802EBF38: -/* 802EBF38 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EBF3C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 802EBF40 41 82 00 3C */ beq lbl_802EBF7C -/* 802EBF44 28 1D 00 00 */ cmplwi r29, 0 -/* 802EBF48 41 82 00 14 */ beq lbl_802EBF5C -/* 802EBF4C 7F A4 EB 78 */ mr r4, r29 -/* 802EBF50 38 A0 00 00 */ li r5, 0 -/* 802EBF54 4B FF 23 55 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802EBF58 48 00 00 8C */ b lbl_802EBFE4 -lbl_802EBF5C: -/* 802EBF5C 38 80 00 01 */ li r4, 1 -/* 802EBF60 4B FF 22 D5 */ bl __dt__10JUTTextureFv -/* 802EBF64 38 00 00 00 */ li r0, 0 -/* 802EBF68 90 1F 00 50 */ stw r0, 0x50(r31) -/* 802EBF6C 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EBF70 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBF74 98 1F 00 5C */ stb r0, 0x5c(r31) -/* 802EBF78 48 00 00 6C */ b lbl_802EBFE4 -lbl_802EBF7C: -/* 802EBF7C 38 00 00 00 */ li r0, 0 -/* 802EBF80 90 1F 00 50 */ stw r0, 0x50(r31) -/* 802EBF84 28 1D 00 00 */ cmplwi r29, 0 -/* 802EBF88 41 82 00 5C */ beq lbl_802EBFE4 -/* 802EBF8C 38 60 00 40 */ li r3, 0x40 -/* 802EBF90 4B FE 2C BD */ bl __nw__FUl -/* 802EBF94 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802EBF98 41 82 00 24 */ beq lbl_802EBFBC -/* 802EBF9C 38 00 00 00 */ li r0, 0 -/* 802EBFA0 90 1E 00 28 */ stw r0, 0x28(r30) -/* 802EBFA4 7F A4 EB 78 */ mr r4, r29 -/* 802EBFA8 38 A0 00 00 */ li r5, 0 -/* 802EBFAC 4B FF 22 FD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc -/* 802EBFB0 88 1E 00 3B */ lbz r0, 0x3b(r30) -/* 802EBFB4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e -/* 802EBFB8 98 1E 00 3B */ stb r0, 0x3b(r30) -lbl_802EBFBC: -/* 802EBFBC 93 DF 00 50 */ stw r30, 0x50(r31) -/* 802EBFC0 80 1F 00 50 */ lwz r0, 0x50(r31) -/* 802EBFC4 28 00 00 00 */ cmplwi r0, 0 -/* 802EBFC8 40 82 00 0C */ bne lbl_802EBFD4 -/* 802EBFCC 38 60 00 00 */ li r3, 0 -/* 802EBFD0 48 00 00 34 */ b lbl_802EC004 -lbl_802EBFD4: -/* 802EBFD4 88 1F 00 5C */ lbz r0, 0x5c(r31) -/* 802EBFD8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EBFDC 60 00 00 01 */ ori r0, r0, 1 -/* 802EBFE0 98 1F 00 5C */ stb r0, 0x5c(r31) -lbl_802EBFE4: -/* 802EBFE4 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802EBFE8 4B FE 2D 55 */ bl __dl__FPv -/* 802EBFEC 38 00 00 00 */ li r0, 0 -/* 802EBFF0 90 1F 00 54 */ stw r0, 0x54(r31) -/* 802EBFF4 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EBFF8 38 03 FF FF */ addi r0, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EBFFC B0 1F 00 04 */ sth r0, 4(r31) -/* 802EC000 38 60 00 01 */ li r3, 1 -lbl_802EC004: -/* 802EC004 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EC008 48 07 62 21 */ bl _restgpr_29 -/* 802EC00C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EC010 7C 08 03 A6 */ mtlr r0 -/* 802EC014 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EC018 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s deleted file mode 100644 index 17dcfb9694a..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802ED16C: -/* 802ED16C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802ED170 7C 08 02 A6 */ mflr r0 -/* 802ED174 90 01 00 24 */ stw r0, 0x24(r1) -/* 802ED178 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED17C 48 07 50 59 */ bl _savegpr_27 -/* 802ED180 7C 7B 1B 78 */ mr r27, r3 -/* 802ED184 7C 9C 23 78 */ mr r28, r4 -/* 802ED188 7C BD 2B 78 */ mr r29, r5 -/* 802ED18C 28 1C 00 02 */ cmplwi r28, 2 -/* 802ED190 41 80 00 0C */ blt lbl_802ED19C -/* 802ED194 38 60 00 00 */ li r3, 0 -/* 802ED198 48 00 00 6C */ b lbl_802ED204 -lbl_802ED19C: -/* 802ED19C 88 7B 00 78 */ lbz r3, 0x78(r27) -/* 802ED1A0 38 00 00 01 */ li r0, 1 -/* 802ED1A4 7C 1E E0 30 */ slw r30, r0, r28 -/* 802ED1A8 7C 60 F0 39 */ and. r0, r3, r30 -/* 802ED1AC 41 82 00 18 */ beq lbl_802ED1C4 -/* 802ED1B0 57 80 10 3A */ slwi r0, r28, 2 -/* 802ED1B4 7C 7B 02 14 */ add r3, r27, r0 -/* 802ED1B8 80 63 00 64 */ lwz r3, 0x64(r3) -/* 802ED1BC 38 80 00 01 */ li r4, 1 -/* 802ED1C0 4B FF 10 75 */ bl __dt__10JUTTextureFv -lbl_802ED1C4: -/* 802ED1C4 57 80 10 3A */ slwi r0, r28, 2 -/* 802ED1C8 7F FB 02 14 */ add r31, r27, r0 -/* 802ED1CC 93 BF 00 64 */ stw r29, 0x64(r31) -/* 802ED1D0 88 1B 00 78 */ lbz r0, 0x78(r27) -/* 802ED1D4 7C 00 F0 78 */ andc r0, r0, r30 -/* 802ED1D8 98 1B 00 78 */ stb r0, 0x78(r27) -/* 802ED1DC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 802ED1E0 4B FE 1B 5D */ bl __dl__FPv -/* 802ED1E4 38 00 00 00 */ li r0, 0 -/* 802ED1E8 90 1F 00 6C */ stw r0, 0x6c(r31) -/* 802ED1EC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802ED1F0 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802ED1F4 57 80 08 3C */ slwi r0, r28, 1 -/* 802ED1F8 7C 7B 02 14 */ add r3, r27, r0 -/* 802ED1FC B0 83 00 04 */ sth r4, 4(r3) -/* 802ED200 38 60 00 01 */ li r3, 1 -lbl_802ED204: -/* 802ED204 39 61 00 20 */ addi r11, r1, 0x20 -/* 802ED208 48 07 50 19 */ bl _restgpr_27 -/* 802ED20C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802ED210 7C 08 03 A6 */ mtlr r0 -/* 802ED214 38 21 00 20 */ addi r1, r1, 0x20 -/* 802ED218 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s deleted file mode 100644 index 094ba3fdcc4..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802EE5F0: -/* 802EE5F0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EE5F4 7C 08 02 A6 */ mflr r0 -/* 802EE5F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EE5FC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE600 48 07 3B D5 */ bl _savegpr_27 -/* 802EE604 7C 7B 1B 78 */ mr r27, r3 -/* 802EE608 7C 9C 23 78 */ mr r28, r4 -/* 802EE60C 7C BD 2B 78 */ mr r29, r5 -/* 802EE610 28 1C 00 04 */ cmplwi r28, 4 -/* 802EE614 41 80 00 0C */ blt lbl_802EE620 -/* 802EE618 38 60 00 00 */ li r3, 0 -/* 802EE61C 48 00 00 6C */ b lbl_802EE688 -lbl_802EE620: -/* 802EE620 88 7B 00 B0 */ lbz r3, 0xb0(r27) -/* 802EE624 38 00 00 01 */ li r0, 1 -/* 802EE628 7C 1E E0 30 */ slw r30, r0, r28 -/* 802EE62C 7C 60 F0 39 */ and. r0, r3, r30 -/* 802EE630 41 82 00 18 */ beq lbl_802EE648 -/* 802EE634 57 80 10 3A */ slwi r0, r28, 2 -/* 802EE638 7C 7B 02 14 */ add r3, r27, r0 -/* 802EE63C 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 802EE640 38 80 00 01 */ li r4, 1 -/* 802EE644 4B FE FB F1 */ bl __dt__10JUTTextureFv -lbl_802EE648: -/* 802EE648 57 80 10 3A */ slwi r0, r28, 2 -/* 802EE64C 7F FB 02 14 */ add r31, r27, r0 -/* 802EE650 93 BF 00 8C */ stw r29, 0x8c(r31) -/* 802EE654 88 1B 00 B0 */ lbz r0, 0xb0(r27) -/* 802EE658 7C 00 F0 78 */ andc r0, r0, r30 -/* 802EE65C 98 1B 00 B0 */ stb r0, 0xb0(r27) -/* 802EE660 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 802EE664 4B FE 06 D9 */ bl __dl__FPv -/* 802EE668 38 00 00 00 */ li r0, 0 -/* 802EE66C 90 1F 00 9C */ stw r0, 0x9c(r31) -/* 802EE670 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EE674 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EE678 57 80 08 3C */ slwi r0, r28, 1 -/* 802EE67C 7C 7B 02 14 */ add r3, r27, r0 -/* 802EE680 B0 83 00 04 */ sth r4, 4(r3) -/* 802EE684 38 60 00 01 */ li r3, 1 -lbl_802EE688: -/* 802EE688 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EE68C 48 07 3B 95 */ bl _restgpr_27 -/* 802EE690 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EE694 7C 08 03 A6 */ mtlr r0 -/* 802EE698 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EE69C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s deleted file mode 100644 index 2676effab23..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802EFA98: -/* 802EFA98 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802EFA9C 7C 08 02 A6 */ mflr r0 -/* 802EFAA0 90 01 00 24 */ stw r0, 0x24(r1) -/* 802EFAA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFAA8 48 07 27 2D */ bl _savegpr_27 -/* 802EFAAC 7C 7B 1B 78 */ mr r27, r3 -/* 802EFAB0 7C 9C 23 78 */ mr r28, r4 -/* 802EFAB4 7C BD 2B 78 */ mr r29, r5 -/* 802EFAB8 28 1C 00 08 */ cmplwi r28, 8 -/* 802EFABC 41 80 00 0C */ blt lbl_802EFAC8 -/* 802EFAC0 38 60 00 00 */ li r3, 0 -/* 802EFAC4 48 00 00 6C */ b lbl_802EFB30 -lbl_802EFAC8: -/* 802EFAC8 88 7B 01 20 */ lbz r3, 0x120(r27) -/* 802EFACC 38 00 00 01 */ li r0, 1 -/* 802EFAD0 7C 1E E0 30 */ slw r30, r0, r28 -/* 802EFAD4 7C 60 F0 39 */ and. r0, r3, r30 -/* 802EFAD8 41 82 00 18 */ beq lbl_802EFAF0 -/* 802EFADC 57 80 10 3A */ slwi r0, r28, 2 -/* 802EFAE0 7C 7B 02 14 */ add r3, r27, r0 -/* 802EFAE4 80 63 00 DC */ lwz r3, 0xdc(r3) -/* 802EFAE8 38 80 00 01 */ li r4, 1 -/* 802EFAEC 4B FE E7 49 */ bl __dt__10JUTTextureFv -lbl_802EFAF0: -/* 802EFAF0 57 80 10 3A */ slwi r0, r28, 2 -/* 802EFAF4 7F FB 02 14 */ add r31, r27, r0 -/* 802EFAF8 93 BF 00 DC */ stw r29, 0xdc(r31) -/* 802EFAFC 88 1B 01 20 */ lbz r0, 0x120(r27) -/* 802EFB00 7C 00 F0 78 */ andc r0, r0, r30 -/* 802EFB04 98 1B 01 20 */ stb r0, 0x120(r27) -/* 802EFB08 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 802EFB0C 4B FD F2 31 */ bl __dl__FPv -/* 802EFB10 38 00 00 00 */ li r0, 0 -/* 802EFB14 90 1F 00 FC */ stw r0, 0xfc(r31) -/* 802EFB18 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802EFB1C 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802EFB20 57 80 08 3C */ slwi r0, r28, 1 -/* 802EFB24 7C 7B 02 14 */ add r3, r27, r0 -/* 802EFB28 B0 83 00 04 */ sth r4, 4(r3) -/* 802EFB2C 38 60 00 01 */ li r3, 1 -lbl_802EFB30: -/* 802EFB30 39 61 00 20 */ addi r11, r1, 0x20 -/* 802EFB34 48 07 26 ED */ bl _restgpr_27 -/* 802EFB38 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802EFB3C 7C 08 03 A6 */ mtlr r0 -/* 802EFB40 38 21 00 20 */ addi r1, r1, 0x20 -/* 802EFB44 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s b/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s deleted file mode 100644 index 34569f07bb5..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_802F0F18: -/* 802F0F18 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802F0F1C 7C 08 02 A6 */ mflr r0 -/* 802F0F20 90 01 00 24 */ stw r0, 0x24(r1) -/* 802F0F24 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0F28 48 07 12 AD */ bl _savegpr_27 -/* 802F0F2C 7C 7B 1B 78 */ mr r27, r3 -/* 802F0F30 7C 9C 23 78 */ mr r28, r4 -/* 802F0F34 7C BD 2B 78 */ mr r29, r5 -/* 802F0F38 28 1C 00 08 */ cmplwi r28, 8 -/* 802F0F3C 41 80 00 0C */ blt lbl_802F0F48 -/* 802F0F40 38 60 00 00 */ li r3, 0 -/* 802F0F44 48 00 00 6C */ b lbl_802F0FB0 -lbl_802F0F48: -/* 802F0F48 88 7B 01 B0 */ lbz r3, 0x1b0(r27) -/* 802F0F4C 38 00 00 01 */ li r0, 1 -/* 802F0F50 7C 1E E0 30 */ slw r30, r0, r28 -/* 802F0F54 7C 60 F0 39 */ and. r0, r3, r30 -/* 802F0F58 41 82 00 18 */ beq lbl_802F0F70 -/* 802F0F5C 57 80 10 3A */ slwi r0, r28, 2 -/* 802F0F60 7C 7B 02 14 */ add r3, r27, r0 -/* 802F0F64 80 63 01 6C */ lwz r3, 0x16c(r3) -/* 802F0F68 38 80 00 01 */ li r4, 1 -/* 802F0F6C 4B FE D2 C9 */ bl __dt__10JUTTextureFv -lbl_802F0F70: -/* 802F0F70 57 80 10 3A */ slwi r0, r28, 2 -/* 802F0F74 7F FB 02 14 */ add r31, r27, r0 -/* 802F0F78 93 BF 01 6C */ stw r29, 0x16c(r31) -/* 802F0F7C 88 1B 01 B0 */ lbz r0, 0x1b0(r27) -/* 802F0F80 7C 00 F0 78 */ andc r0, r0, r30 -/* 802F0F84 98 1B 01 B0 */ stb r0, 0x1b0(r27) -/* 802F0F88 80 7F 01 8C */ lwz r3, 0x18c(r31) -/* 802F0F8C 4B FD DD B1 */ bl __dl__FPv -/* 802F0F90 38 00 00 00 */ li r0, 0 -/* 802F0F94 90 1F 01 8C */ stw r0, 0x18c(r31) -/* 802F0F98 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFF@ha */ -/* 802F0F9C 38 83 FF FF */ addi r4, r3, 0xFFFF /* 0x0000FFFF@l */ -/* 802F0FA0 57 80 08 3C */ slwi r0, r28, 1 -/* 802F0FA4 7C 7B 02 14 */ add r3, r27, r0 -/* 802F0FA8 B0 83 00 04 */ sth r4, 4(r3) -/* 802F0FAC 38 60 00 01 */ li r3, 1 -lbl_802F0FB0: -/* 802F0FB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802F0FB4 48 07 12 6D */ bl _restgpr_27 -/* 802F0FB8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802F0FBC 7C 08 03 A6 */ mtlr r0 -/* 802F0FC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802F0FC4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock1FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock1FUc.s deleted file mode 100644 index f8cb1570508..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock1FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2A20: -/* 802F2A20 88 03 00 5C */ lbz r0, 0x5c(r3) -/* 802F2A24 7C 00 20 38 */ and r0, r0, r4 -/* 802F2A28 98 03 00 5C */ stb r0, 0x5c(r3) -/* 802F2A2C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock2FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock2FUc.s deleted file mode 100644 index 66f5cc1e39e..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock2FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F2780: -/* 802F2780 88 03 00 78 */ lbz r0, 0x78(r3) -/* 802F2784 7C 00 20 38 */ and r0, r0, r4 -/* 802F2788 98 03 00 78 */ stb r0, 0x78(r3) -/* 802F278C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock4FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock4FUc.s deleted file mode 100644 index 1b127694a62..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock4FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F24DC: -/* 802F24DC 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 802F24E0 7C 00 20 38 */ and r0, r0, r4 -/* 802F24E4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 802F24E8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock8FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock8FUc.s deleted file mode 100644 index dbf8b91b074..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock8FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F223C: -/* 802F223C 88 03 01 20 */ lbz r0, 0x120(r3) -/* 802F2240 7C 00 20 38 */ and r0, r0, r4 -/* 802F2244 98 03 01 20 */ stb r0, 0x120(r3) -/* 802F2248 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__13J2DTevBlock16FUc.s b/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__13J2DTevBlock16FUc.s deleted file mode 100644 index 4f75d31c96d..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__13J2DTevBlock16FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802F1F9C: -/* 802F1F9C 88 03 01 B0 */ lbz r0, 0x1b0(r3) -/* 802F1FA0 7C 00 20 38 */ and r0, r0, r4 -/* 802F1FA4 98 03 01 B0 */ stb r0, 0x1b0(r3) -/* 802F1FA8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock1FUcb.s b/asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock1FUcb.s deleted file mode 100644 index 9b75f8d92d0..00000000000 --- a/asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock1FUcb.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802EC318: -/* 802EC318 88 03 00 5C */ lbz r0, 0x5c(r3) -/* 802EC31C 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 -/* 802EC320 98 03 00 5C */ stb r0, 0x5c(r3) -/* 802EC324 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s deleted file mode 100644 index efb7b5417f4..00000000000 --- a/asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_802F8648: -/* 802F8648 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802F864C 7C 08 02 A6 */ mflr r0 -/* 802F8650 90 01 00 34 */ stw r0, 0x34(r1) -/* 802F8654 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8658 48 06 9B 81 */ bl _savegpr_28 -/* 802F865C 7C 7D 1B 78 */ mr r29, r3 -/* 802F8660 7C BE 2B 78 */ mr r30, r5 -/* 802F8664 7C DF 33 79 */ or. r31, r6, r6 -/* 802F8668 40 82 00 0C */ bne lbl_802F8674 -/* 802F866C 38 60 00 00 */ li r3, 0 -/* 802F8670 48 00 00 C0 */ b lbl_802F8730 -lbl_802F8674: -/* 802F8674 7C 83 23 78 */ mr r3, r4 -/* 802F8678 7F E4 FB 78 */ mr r4, r31 -/* 802F867C 4B FD BB F5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802F8680 7C 7C 1B 79 */ or. r28, r3, r3 -/* 802F8684 41 82 00 A8 */ beq lbl_802F872C -/* 802F8688 7F E3 FB 78 */ mr r3, r31 -/* 802F868C 7F 84 E3 78 */ mr r4, r28 -/* 802F8690 81 9F 00 00 */ lwz r12, 0(r31) -/* 802F8694 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 802F8698 7D 89 03 A6 */ mtctr r12 -/* 802F869C 4E 80 04 21 */ bctrl -/* 802F86A0 7C 65 1B 78 */ mr r5, r3 -/* 802F86A4 38 61 00 08 */ addi r3, r1, 8 -/* 802F86A8 3C 80 80 3C */ lis r4, __vt__10JSUIosBase@ha /* 0x803C2DF8@ha */ -/* 802F86AC 38 04 2D F8 */ addi r0, r4, __vt__10JSUIosBase@l /* 0x803C2DF8@l */ -/* 802F86B0 90 01 00 08 */ stw r0, 8(r1) -/* 802F86B4 38 00 00 00 */ li r0, 0 -/* 802F86B8 98 01 00 0C */ stb r0, 0xc(r1) -/* 802F86BC 3C 80 80 3D */ lis r4, __vt__14JSUInputStream@ha /* 0x803CC4D4@ha */ -/* 802F86C0 38 04 C4 D4 */ addi r0, r4, __vt__14JSUInputStream@l /* 0x803CC4D4@l */ -/* 802F86C4 90 01 00 08 */ stw r0, 8(r1) -/* 802F86C8 3C 80 80 3D */ lis r4, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 802F86CC 38 04 C4 B0 */ addi r0, r4, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 802F86D0 90 01 00 08 */ stw r0, 8(r1) -/* 802F86D4 3C 80 80 3D */ lis r4, __vt__20JSUMemoryInputStream@ha /* 0x803CC4F0@ha */ -/* 802F86D8 38 04 C4 F0 */ addi r0, r4, __vt__20JSUMemoryInputStream@l /* 0x803CC4F0@l */ -/* 802F86DC 90 01 00 08 */ stw r0, 8(r1) -/* 802F86E0 7F 84 E3 78 */ mr r4, r28 -/* 802F86E4 4B FE 3E 3D */ bl setBuffer__20JSUMemoryInputStreamFPCvl -/* 802F86E8 7F A3 EB 78 */ mr r3, r29 -/* 802F86EC 38 81 00 08 */ addi r4, r1, 8 -/* 802F86F0 7F C5 F3 78 */ mr r5, r30 -/* 802F86F4 7F E6 FB 78 */ mr r6, r31 -/* 802F86F8 48 00 00 51 */ bl setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive -/* 802F86FC 7C 7D 1B 78 */ mr r29, r3 -/* 802F8700 3C 60 80 3D */ lis r3, __vt__20JSUMemoryInputStream@ha /* 0x803CC4F0@ha */ -/* 802F8704 38 03 C4 F0 */ addi r0, r3, __vt__20JSUMemoryInputStream@l /* 0x803CC4F0@l */ -/* 802F8708 90 01 00 08 */ stw r0, 8(r1) -/* 802F870C 3C 60 80 3D */ lis r3, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 802F8710 38 03 C4 B0 */ addi r0, r3, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 802F8714 90 01 00 08 */ stw r0, 8(r1) -/* 802F8718 38 61 00 08 */ addi r3, r1, 8 -/* 802F871C 38 80 00 00 */ li r4, 0 -/* 802F8720 4B FE 3B 1D */ bl __dt__14JSUInputStreamFv -/* 802F8724 7F A3 EB 78 */ mr r3, r29 -/* 802F8728 48 00 00 08 */ b lbl_802F8730 -lbl_802F872C: -/* 802F872C 38 60 00 00 */ li r3, 0 -lbl_802F8730: -/* 802F8730 39 61 00 30 */ addi r11, r1, 0x30 -/* 802F8734 48 06 9A F1 */ bl _restgpr_28 -/* 802F8738 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802F873C 7C 08 03 A6 */ mtlr r0 -/* 802F8740 38 21 00 30 */ addi r1, r1, 0x30 -/* 802F8744 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s b/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s deleted file mode 100644 index 52a74d97ad7..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s +++ /dev/null @@ -1,290 +0,0 @@ -lbl_802FF75C: -/* 802FF75C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 802FF760 7C 08 02 A6 */ mflr r0 -/* 802FF764 90 01 00 94 */ stw r0, 0x94(r1) -/* 802FF768 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FF76C 48 06 2A 61 */ bl _savegpr_25 -/* 802FF770 7C 7B 1B 78 */ mr r27, r3 -/* 802FF774 7C 99 23 78 */ mr r25, r4 -/* 802FF778 7C BC 2B 78 */ mr r28, r5 -/* 802FF77C 7C DD 33 78 */ mr r29, r6 -/* 802FF780 7C FA 3B 78 */ mr r26, r7 -/* 802FF784 4B FF 64 75 */ bl __ct__7J2DPaneFv -/* 802FF788 3C 60 80 3D */ lis r3, __vt__10J2DTextBox@ha /* 0x803CD328@ha */ -/* 802FF78C 38 03 D3 28 */ addi r0, r3, __vt__10J2DTextBox@l /* 0x803CD328@l */ -/* 802FF790 90 1B 00 00 */ stw r0, 0(r27) -/* 802FF794 38 60 00 00 */ li r3, 0 -/* 802FF798 90 7B 01 00 */ stw r3, 0x100(r27) -/* 802FF79C 38 00 FF FF */ li r0, -1 -/* 802FF7A0 90 1B 01 04 */ stw r0, 0x104(r27) -/* 802FF7A4 90 1B 01 08 */ stw r0, 0x108(r27) -/* 802FF7A8 90 7B 01 24 */ stw r3, 0x124(r27) -/* 802FF7AC 90 1B 01 28 */ stw r0, 0x128(r27) -/* 802FF7B0 90 1B 01 2C */ stw r0, 0x12c(r27) -/* 802FF7B4 7F 83 E3 78 */ mr r3, r28 -/* 802FF7B8 81 9C 00 00 */ lwz r12, 0(r28) -/* 802FF7BC 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802FF7C0 7D 89 03 A6 */ mtctr r12 -/* 802FF7C4 4E 80 04 21 */ bctrl -/* 802FF7C8 7C 7F 1B 78 */ mr r31, r3 -/* 802FF7CC 7F 83 E3 78 */ mr r3, r28 -/* 802FF7D0 38 81 00 28 */ addi r4, r1, 0x28 -/* 802FF7D4 38 A0 00 08 */ li r5, 8 -/* 802FF7D8 4B FD CA C1 */ bl read__14JSUInputStreamFPvl -/* 802FF7DC 3C 60 54 42 */ lis r3, 0x5442 /* 0x54425831@ha */ -/* 802FF7E0 38 03 58 31 */ addi r0, r3, 0x5831 /* 0x54425831@l */ -/* 802FF7E4 90 1B 00 08 */ stw r0, 8(r27) -/* 802FF7E8 7F 83 E3 78 */ mr r3, r28 -/* 802FF7EC 81 9C 00 00 */ lwz r12, 0(r28) -/* 802FF7F0 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802FF7F4 7D 89 03 A6 */ mtctr r12 -/* 802FF7F8 4E 80 04 21 */ bctrl -/* 802FF7FC 7C 7E 1B 78 */ mr r30, r3 -/* 802FF800 7F 83 E3 78 */ mr r3, r28 -/* 802FF804 38 81 00 20 */ addi r4, r1, 0x20 -/* 802FF808 38 A0 00 08 */ li r5, 8 -/* 802FF80C 4B FD CC 4D */ bl peek__20JSURandomInputStreamFPvl -/* 802FF810 7F 63 DB 78 */ mr r3, r27 -/* 802FF814 7F 24 CB 78 */ mr r4, r25 -/* 802FF818 7F 85 E3 78 */ mr r5, r28 -/* 802FF81C 4B FF 82 FD */ bl makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802FF820 7F 83 E3 78 */ mr r3, r28 -/* 802FF824 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FF828 7C 9E 02 14 */ add r4, r30, r0 -/* 802FF82C 38 A0 00 00 */ li r5, 0 -/* 802FF830 4B FD CC AD */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802FF834 7F 83 E3 78 */ mr r3, r28 -/* 802FF838 38 81 00 30 */ addi r4, r1, 0x30 -/* 802FF83C 38 A0 00 20 */ li r5, 0x20 -/* 802FF840 4B FD CA 59 */ bl read__14JSUInputStreamFPvl -/* 802FF844 3B C0 00 00 */ li r30, 0 -/* 802FF848 A0 01 00 34 */ lhz r0, 0x34(r1) -/* 802FF84C 28 00 FF FF */ cmplwi r0, 0xffff -/* 802FF850 41 82 00 54 */ beq lbl_802FF8A4 -/* 802FF854 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 802FF858 7F DA 02 15 */ add. r30, r26, r0 -/* 802FF85C 41 82 00 48 */ beq lbl_802FF8A4 -/* 802FF860 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FF864 28 03 00 00 */ cmplwi r3, 0 -/* 802FF868 41 82 00 34 */ beq lbl_802FF89C -/* 802FF86C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF870 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 802FF874 7D 89 03 A6 */ mtctr r12 -/* 802FF878 4E 80 04 21 */ bctrl -/* 802FF87C 28 03 00 00 */ cmplwi r3, 0 -/* 802FF880 41 82 00 1C */ beq lbl_802FF89C -/* 802FF884 90 7B 01 00 */ stw r3, 0x100(r27) -/* 802FF888 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FF88C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FF890 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 802FF894 7D 89 03 A6 */ mtctr r12 -/* 802FF898 4E 80 04 21 */ bctrl -lbl_802FF89C: -/* 802FF89C 88 1E 00 13 */ lbz r0, 0x13(r30) -/* 802FF8A0 98 1B 00 B2 */ stb r0, 0xb2(r27) -lbl_802FF8A4: -/* 802FF8A4 A8 01 00 36 */ lha r0, 0x36(r1) -/* 802FF8A8 C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FF8AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FF8B0 90 01 00 54 */ stw r0, 0x54(r1) -/* 802FF8B4 3C 60 43 30 */ lis r3, 0x4330 -/* 802FF8B8 90 61 00 50 */ stw r3, 0x50(r1) -/* 802FF8BC C8 01 00 50 */ lfd f0, 0x50(r1) -/* 802FF8C0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FF8C4 D0 1B 01 14 */ stfs f0, 0x114(r27) -/* 802FF8C8 A8 01 00 38 */ lha r0, 0x38(r1) -/* 802FF8CC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FF8D0 90 01 00 5C */ stw r0, 0x5c(r1) -/* 802FF8D4 90 61 00 58 */ stw r3, 0x58(r1) -/* 802FF8D8 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 802FF8DC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FF8E0 D0 1B 01 18 */ stfs f0, 0x118(r27) -/* 802FF8E4 A0 01 00 3A */ lhz r0, 0x3a(r1) -/* 802FF8E8 C8 22 C8 90 */ lfd f1, lit_1665(r2) -/* 802FF8EC 90 01 00 64 */ stw r0, 0x64(r1) -/* 802FF8F0 90 61 00 60 */ stw r3, 0x60(r1) -/* 802FF8F4 C8 01 00 60 */ lfd f0, 0x60(r1) -/* 802FF8F8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FF8FC D0 1B 01 1C */ stfs f0, 0x11c(r27) -/* 802FF900 A0 01 00 3C */ lhz r0, 0x3c(r1) -/* 802FF904 90 01 00 6C */ stw r0, 0x6c(r1) -/* 802FF908 90 61 00 68 */ stw r3, 0x68(r1) -/* 802FF90C C8 01 00 68 */ lfd f0, 0x68(r1) -/* 802FF910 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FF914 D0 1B 01 20 */ stfs f0, 0x120(r27) -/* 802FF918 88 01 00 3E */ lbz r0, 0x3e(r1) -/* 802FF91C 54 03 10 3A */ slwi r3, r0, 2 -/* 802FF920 88 01 00 3F */ lbz r0, 0x3f(r1) -/* 802FF924 7C 60 03 78 */ or r0, r3, r0 -/* 802FF928 98 1B 01 30 */ stb r0, 0x130(r27) -/* 802FF92C 80 01 00 40 */ lwz r0, 0x40(r1) -/* 802FF930 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802FF934 88 01 00 1C */ lbz r0, 0x1c(r1) -/* 802FF938 98 1B 01 04 */ stb r0, 0x104(r27) -/* 802FF93C 88 01 00 1D */ lbz r0, 0x1d(r1) -/* 802FF940 98 1B 01 05 */ stb r0, 0x105(r27) -/* 802FF944 88 01 00 1E */ lbz r0, 0x1e(r1) -/* 802FF948 98 1B 01 06 */ stb r0, 0x106(r27) -/* 802FF94C 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 802FF950 98 1B 01 07 */ stb r0, 0x107(r27) -/* 802FF954 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802FF958 90 01 00 18 */ stw r0, 0x18(r1) -/* 802FF95C 88 01 00 18 */ lbz r0, 0x18(r1) -/* 802FF960 98 1B 01 08 */ stb r0, 0x108(r27) -/* 802FF964 88 01 00 19 */ lbz r0, 0x19(r1) -/* 802FF968 98 1B 01 09 */ stb r0, 0x109(r27) -/* 802FF96C 88 01 00 1A */ lbz r0, 0x1a(r1) -/* 802FF970 98 1B 01 0A */ stb r0, 0x10a(r27) -/* 802FF974 88 01 00 1B */ lbz r0, 0x1b(r1) -/* 802FF978 98 1B 01 0B */ stb r0, 0x10b(r27) -/* 802FF97C 7F 63 DB 78 */ mr r3, r27 -/* 802FF980 88 81 00 48 */ lbz r4, 0x48(r1) -/* 802FF984 30 04 FF FF */ addic r0, r4, -1 -/* 802FF988 7C 00 21 10 */ subfe r0, r0, r4 -/* 802FF98C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 802FF990 81 9B 00 00 */ lwz r12, 0(r27) -/* 802FF994 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802FF998 7D 89 03 A6 */ mtctr r12 -/* 802FF99C 4E 80 04 21 */ bctrl -/* 802FF9A0 3B 40 00 00 */ li r26, 0 -/* 802FF9A4 57 A0 01 8D */ rlwinm. r0, r29, 0, 6, 6 -/* 802FF9A8 40 82 00 24 */ bne lbl_802FF9CC -/* 802FF9AC A0 01 00 4C */ lhz r0, 0x4c(r1) -/* 802FF9B0 7C 1A 03 78 */ mr r26, r0 -/* 802FF9B4 7C 00 07 34 */ extsh r0, r0 -/* 802FF9B8 2C 00 FF FF */ cmpwi r0, -1 -/* 802FF9BC 40 82 00 10 */ bne lbl_802FF9CC -/* 802FF9C0 A0 61 00 4E */ lhz r3, 0x4e(r1) -/* 802FF9C4 38 03 00 01 */ addi r0, r3, 1 -/* 802FF9C8 54 1A 04 3E */ clrlwi r26, r0, 0x10 -lbl_802FF9CC: -/* 802FF9CC 38 00 00 00 */ li r0, 0 -/* 802FF9D0 B0 1B 01 32 */ sth r0, 0x132(r27) -/* 802FF9D4 90 1B 01 24 */ stw r0, 0x124(r27) -/* 802FF9D8 57 43 04 3F */ clrlwi. r3, r26, 0x10 -/* 802FF9DC 41 82 00 0C */ beq lbl_802FF9E8 -/* 802FF9E0 4B FC F2 E5 */ bl __nwa__FUl -/* 802FF9E4 90 7B 01 24 */ stw r3, 0x124(r27) -lbl_802FF9E8: -/* 802FF9E8 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 802FF9EC 28 00 00 00 */ cmplwi r0, 0 -/* 802FF9F0 41 82 00 40 */ beq lbl_802FFA30 -/* 802FF9F4 B3 5B 01 32 */ sth r26, 0x132(r27) -/* 802FF9F8 57 43 04 3E */ clrlwi r3, r26, 0x10 -/* 802FF9FC 38 03 FF FF */ addi r0, r3, -1 -/* 802FFA00 A3 41 00 4E */ lhz r26, 0x4e(r1) -/* 802FFA04 7C 00 D0 00 */ cmpw r0, r26 -/* 802FFA08 40 80 00 08 */ bge lbl_802FFA10 -/* 802FFA0C 54 1A 04 3E */ clrlwi r26, r0, 0x10 -lbl_802FFA10: -/* 802FFA10 7F 83 E3 78 */ mr r3, r28 -/* 802FFA14 80 9B 01 24 */ lwz r4, 0x124(r27) -/* 802FFA18 57 45 04 3E */ clrlwi r5, r26, 0x10 -/* 802FFA1C 4B FD CA 3D */ bl peek__20JSURandomInputStreamFPvl -/* 802FFA20 38 80 00 00 */ li r4, 0 -/* 802FFA24 80 7B 01 24 */ lwz r3, 0x124(r27) -/* 802FFA28 57 40 04 3E */ clrlwi r0, r26, 0x10 -/* 802FFA2C 7C 83 01 AE */ stbx r4, r3, r0 -lbl_802FFA30: -/* 802FFA30 7F 83 E3 78 */ mr r3, r28 -/* 802FFA34 A0 81 00 4E */ lhz r4, 0x4e(r1) -/* 802FFA38 81 9C 00 00 */ lwz r12, 0(r28) -/* 802FFA3C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802FFA40 7D 89 03 A6 */ mtctr r12 -/* 802FFA44 4E 80 04 21 */ bctrl -/* 802FFA48 7F 83 E3 78 */ mr r3, r28 -/* 802FFA4C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802FFA50 7C 9F 02 14 */ add r4, r31, r0 -/* 802FFA54 38 A0 00 00 */ li r5, 0 -/* 802FFA58 4B FD CA 85 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 802FFA5C 38 00 00 00 */ li r0, 0 -/* 802FFA60 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FFA64 88 01 00 14 */ lbz r0, 0x14(r1) -/* 802FFA68 98 1B 01 2C */ stb r0, 0x12c(r27) -/* 802FFA6C 88 01 00 15 */ lbz r0, 0x15(r1) -/* 802FFA70 98 1B 01 2D */ stb r0, 0x12d(r27) -/* 802FFA74 88 01 00 16 */ lbz r0, 0x16(r1) -/* 802FFA78 98 1B 01 2E */ stb r0, 0x12e(r27) -/* 802FFA7C 88 01 00 17 */ lbz r0, 0x17(r1) -/* 802FFA80 98 1B 01 2F */ stb r0, 0x12f(r27) -/* 802FFA84 38 00 FF FF */ li r0, -1 -/* 802FFA88 90 01 00 10 */ stw r0, 0x10(r1) -/* 802FFA8C 88 01 00 10 */ lbz r0, 0x10(r1) -/* 802FFA90 98 1B 01 28 */ stb r0, 0x128(r27) -/* 802FFA94 88 01 00 11 */ lbz r0, 0x11(r1) -/* 802FFA98 98 1B 01 29 */ stb r0, 0x129(r27) -/* 802FFA9C 88 01 00 12 */ lbz r0, 0x12(r1) -/* 802FFAA0 98 1B 01 2A */ stb r0, 0x12a(r27) -/* 802FFAA4 88 01 00 13 */ lbz r0, 0x13(r1) -/* 802FFAA8 98 1B 01 2B */ stb r0, 0x12b(r27) -/* 802FFAAC 28 1E 00 00 */ cmplwi r30, 0 -/* 802FFAB0 41 82 00 E4 */ beq lbl_802FFB94 -/* 802FFAB4 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FFAB8 28 03 00 00 */ cmplwi r3, 0 -/* 802FFABC 41 82 00 D8 */ beq lbl_802FFB94 -/* 802FFAC0 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFAC4 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 802FFAC8 7D 89 03 A6 */ mtctr r12 -/* 802FFACC 4E 80 04 21 */ bctrl -/* 802FFAD0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 802FFAD4 28 00 00 01 */ cmplwi r0, 1 -/* 802FFAD8 41 82 00 BC */ beq lbl_802FFB94 -/* 802FFADC 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FFAE0 38 80 00 00 */ li r4, 0 -/* 802FFAE4 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFAE8 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802FFAEC 7D 89 03 A6 */ mtctr r12 -/* 802FFAF0 4E 80 04 21 */ bctrl -/* 802FFAF4 AB 83 00 00 */ lha r28, 0(r3) -/* 802FFAF8 AB A3 00 02 */ lha r29, 2(r3) -/* 802FFAFC AB E3 00 04 */ lha r31, 4(r3) -/* 802FFB00 AB 43 00 06 */ lha r26, 6(r3) -/* 802FFB04 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 802FFB08 38 80 00 01 */ li r4, 1 -/* 802FFB0C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFB10 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 802FFB14 7D 89 03 A6 */ mtctr r12 -/* 802FFB18 4E 80 04 21 */ bctrl -/* 802FFB1C A8 83 00 00 */ lha r4, 0(r3) -/* 802FFB20 A8 A3 00 02 */ lha r5, 2(r3) -/* 802FFB24 A8 C3 00 04 */ lha r6, 4(r3) -/* 802FFB28 A8 63 00 06 */ lha r3, 6(r3) -/* 802FFB2C 57 A0 82 1E */ rlwinm r0, r29, 0x10, 8, 0xf -/* 802FFB30 53 80 C0 0E */ rlwimi r0, r28, 0x18, 0, 7 -/* 802FFB34 53 E0 44 2E */ rlwimi r0, r31, 8, 0x10, 0x17 -/* 802FFB38 53 40 06 3E */ rlwimi r0, r26, 0, 0x18, 0x1f -/* 802FFB3C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802FFB40 88 01 00 0C */ lbz r0, 0xc(r1) -/* 802FFB44 98 1B 01 2C */ stb r0, 0x12c(r27) -/* 802FFB48 88 01 00 0D */ lbz r0, 0xd(r1) -/* 802FFB4C 98 1B 01 2D */ stb r0, 0x12d(r27) -/* 802FFB50 88 01 00 0E */ lbz r0, 0xe(r1) -/* 802FFB54 98 1B 01 2E */ stb r0, 0x12e(r27) -/* 802FFB58 88 01 00 0F */ lbz r0, 0xf(r1) -/* 802FFB5C 98 1B 01 2F */ stb r0, 0x12f(r27) -/* 802FFB60 54 A0 82 1E */ rlwinm r0, r5, 0x10, 8, 0xf -/* 802FFB64 50 80 C0 0E */ rlwimi r0, r4, 0x18, 0, 7 -/* 802FFB68 50 C0 44 2E */ rlwimi r0, r6, 8, 0x10, 0x17 -/* 802FFB6C 50 60 06 3E */ rlwimi r0, r3, 0, 0x18, 0x1f -/* 802FFB70 90 01 00 08 */ stw r0, 8(r1) -/* 802FFB74 88 01 00 08 */ lbz r0, 8(r1) -/* 802FFB78 98 1B 01 28 */ stb r0, 0x128(r27) -/* 802FFB7C 88 01 00 09 */ lbz r0, 9(r1) -/* 802FFB80 98 1B 01 29 */ stb r0, 0x129(r27) -/* 802FFB84 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802FFB88 98 1B 01 2A */ stb r0, 0x12a(r27) -/* 802FFB8C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802FFB90 98 1B 01 2B */ stb r0, 0x12b(r27) -lbl_802FFB94: -/* 802FFB94 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 802FFB98 D0 1B 01 0C */ stfs f0, 0x10c(r27) -/* 802FFB9C D0 1B 01 10 */ stfs f0, 0x110(r27) -/* 802FFBA0 38 00 00 01 */ li r0, 1 -/* 802FFBA4 98 1B 01 31 */ stb r0, 0x131(r27) -/* 802FFBA8 7F 63 DB 78 */ mr r3, r27 -/* 802FFBAC 39 61 00 90 */ addi r11, r1, 0x90 -/* 802FFBB0 48 06 26 69 */ bl _restgpr_25 -/* 802FFBB4 80 01 00 94 */ lwz r0, 0x94(r1) -/* 802FFBB8 7C 08 03 A6 */ mtlr r0 -/* 802FFBBC 38 21 00 90 */ addi r1, r1, 0x90 -/* 802FFBC0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s b/asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s deleted file mode 100644 index d3fb91acba9..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_803001E0: -/* 803001E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803001E4 7C 08 02 A6 */ mflr r0 -/* 803001E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803001EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 803001F0 93 C1 00 08 */ stw r30, 8(r1) -/* 803001F4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 803001F8 7C 9F 23 78 */ mr r31, r4 -/* 803001FC 41 82 00 60 */ beq lbl_8030025C -/* 80300200 3C 60 80 3D */ lis r3, __vt__10J2DTextBox@ha /* 0x803CD328@ha */ -/* 80300204 38 03 D3 28 */ addi r0, r3, __vt__10J2DTextBox@l /* 0x803CD328@l */ -/* 80300208 90 1E 00 00 */ stw r0, 0(r30) -/* 8030020C 88 1E 01 31 */ lbz r0, 0x131(r30) -/* 80300210 28 00 00 00 */ cmplwi r0, 0 -/* 80300214 41 82 00 24 */ beq lbl_80300238 -/* 80300218 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8030021C 28 03 00 00 */ cmplwi r3, 0 -/* 80300220 41 82 00 18 */ beq lbl_80300238 -/* 80300224 38 80 00 01 */ li r4, 1 -/* 80300228 81 83 00 00 */ lwz r12, 0(r3) -/* 8030022C 81 8C 00 08 */ lwz r12, 8(r12) -/* 80300230 7D 89 03 A6 */ mtctr r12 -/* 80300234 4E 80 04 21 */ bctrl -lbl_80300238: -/* 80300238 80 7E 01 24 */ lwz r3, 0x124(r30) -/* 8030023C 4B FC EB 25 */ bl __dla__FPv -/* 80300240 7F C3 F3 78 */ mr r3, r30 -/* 80300244 38 80 00 00 */ li r4, 0 -/* 80300248 4B FF 63 45 */ bl __dt__7J2DPaneFv -/* 8030024C 7F E0 07 35 */ extsh. r0, r31 -/* 80300250 40 81 00 0C */ ble lbl_8030025C -/* 80300254 7F C3 F3 78 */ mr r3, r30 -/* 80300258 4B FC EA E5 */ bl __dl__FPv -lbl_8030025C: -/* 8030025C 7F C3 F3 78 */ mr r3, r30 -/* 80300260 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80300264 83 C1 00 08 */ lwz r30, 8(r1) -/* 80300268 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030026C 7C 08 03 A6 */ mtlr r0 -/* 80300270 38 21 00 10 */ addi r1, r1, 0x10 -/* 80300274 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFffPA3_A4_f.s deleted file mode 100644 index cd8b9487b1d..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFffPA3_A4_f.s +++ /dev/null @@ -1,113 +0,0 @@ -lbl_80300950: -/* 80300950 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 80300954 7C 08 02 A6 */ mflr r0 -/* 80300958 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 8030095C DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 80300960 F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 80300964 DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 80300968 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 8030096C 93 E1 00 AC */ stw r31, 0xac(r1) -/* 80300970 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 80300974 7C 7E 1B 78 */ mr r30, r3 -/* 80300978 FF C0 08 90 */ fmr f30, f1 -/* 8030097C FF E0 10 90 */ fmr f31, f2 -/* 80300980 7C 9F 23 78 */ mr r31, r4 -/* 80300984 80 03 01 28 */ lwz r0, 0x128(r3) -/* 80300988 90 01 00 08 */ stw r0, 8(r1) -/* 8030098C 80 03 01 2C */ lwz r0, 0x12c(r3) -/* 80300990 90 01 00 0C */ stw r0, 0xc(r1) -/* 80300994 80 03 01 08 */ lwz r0, 0x108(r3) -/* 80300998 90 01 00 10 */ stw r0, 0x10(r1) -/* 8030099C 80 03 01 04 */ lwz r0, 0x104(r3) -/* 803009A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 803009A4 38 61 00 48 */ addi r3, r1, 0x48 -/* 803009A8 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 803009AC C0 3E 01 14 */ lfs f1, 0x114(r30) -/* 803009B0 C0 5E 01 18 */ lfs f2, 0x118(r30) -/* 803009B4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 803009B8 38 C1 00 10 */ addi r6, r1, 0x10 -/* 803009BC 38 E1 00 0C */ addi r7, r1, 0xc -/* 803009C0 39 01 00 08 */ addi r8, r1, 8 -/* 803009C4 4B FF 39 D1 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 803009C8 C0 5E 01 20 */ lfs f2, 0x120(r30) -/* 803009CC C0 3E 01 1C */ lfs f1, 0x11c(r30) -/* 803009D0 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 803009D4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 803009D8 40 81 00 08 */ ble lbl_803009E0 -/* 803009DC 48 00 00 08 */ b lbl_803009E4 -lbl_803009E0: -/* 803009E0 FC 20 00 90 */ fmr f1, f0 -lbl_803009E4: -/* 803009E4 D0 21 00 98 */ stfs f1, 0x98(r1) -/* 803009E8 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 803009EC FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 803009F0 40 81 00 08 */ ble lbl_803009F8 -/* 803009F4 48 00 00 08 */ b lbl_803009FC -lbl_803009F8: -/* 803009F8 FC 40 00 90 */ fmr f2, f0 -lbl_803009FC: -/* 803009FC D0 41 00 9C */ stfs f2, 0x9c(r1) -/* 80300A00 7F E3 FB 78 */ mr r3, r31 -/* 80300A04 38 9E 00 80 */ addi r4, r30, 0x80 -/* 80300A08 38 A1 00 18 */ addi r5, r1, 0x18 -/* 80300A0C 48 04 5A D9 */ bl PSMTXConcat -/* 80300A10 38 61 00 18 */ addi r3, r1, 0x18 -/* 80300A14 38 80 00 00 */ li r4, 0 -/* 80300A18 48 05 F8 35 */ bl GXLoadPosMtxImm -/* 80300A1C 38 60 00 00 */ li r3, 0 -/* 80300A20 48 05 E6 B5 */ bl GXSetNumIndStages -/* 80300A24 3B E0 00 00 */ li r31, 0 -lbl_80300A28: -/* 80300A28 7F E3 FB 78 */ mr r3, r31 -/* 80300A2C 48 05 E6 CD */ bl GXSetTevDirect -/* 80300A30 3B FF 00 01 */ addi r31, r31, 1 -/* 80300A34 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 80300A38 41 80 FF F0 */ blt lbl_80300A28 -/* 80300A3C 38 60 00 01 */ li r3, 1 -/* 80300A40 48 05 B3 BD */ bl GXSetNumTexGens -/* 80300A44 38 60 00 00 */ li r3, 0 -/* 80300A48 38 80 00 01 */ li r4, 1 -/* 80300A4C 38 A0 00 04 */ li r5, 4 -/* 80300A50 38 C0 00 3C */ li r6, 0x3c -/* 80300A54 38 E0 00 00 */ li r7, 0 -/* 80300A58 39 00 00 7D */ li r8, 0x7d -/* 80300A5C 48 05 B1 21 */ bl GXSetTexCoordGen2 -/* 80300A60 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300A64 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80300A68 EC 3E 00 2A */ fadds f1, f30, f0 -/* 80300A6C C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80300A70 EC 5F 00 2A */ fadds f2, f31, f0 -/* 80300A74 4B FF 3C E9 */ bl locate__8J2DPrintFff -/* 80300A78 80 9E 01 24 */ lwz r4, 0x124(r30) -/* 80300A7C 28 04 00 00 */ cmplwi r4, 0 -/* 80300A80 41 82 00 44 */ beq lbl_80300AC4 -/* 80300A84 88 1E 01 30 */ lbz r0, 0x130(r30) -/* 80300A88 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300A8C C0 42 C8 98 */ lfs f2, lit_2049(r2) -/* 80300A90 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80300A94 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80300A98 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80300A9C EC 22 00 2A */ fadds f1, f2, f0 -/* 80300AA0 C0 5E 00 2C */ lfs f2, 0x2c(r30) -/* 80300AA4 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80300AA8 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80300AAC 54 05 F7 BE */ rlwinm r5, r0, 0x1e, 0x1e, 0x1f -/* 80300AB0 54 06 07 BE */ clrlwi r6, r0, 0x1e -/* 80300AB4 C0 7E 01 0C */ lfs f3, 0x10c(r30) -/* 80300AB8 C0 9E 01 10 */ lfs f4, 0x110(r30) -/* 80300ABC 88 FE 00 B3 */ lbz r7, 0xb3(r30) -/* 80300AC0 4B FF 3D 69 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc -lbl_80300AC4: -/* 80300AC4 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300AC8 38 80 FF FF */ li r4, -1 -/* 80300ACC 4B FF 39 55 */ bl __dt__8J2DPrintFv -/* 80300AD0 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 80300AD4 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 80300AD8 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 80300ADC CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 80300AE0 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 80300AE4 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 80300AE8 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80300AEC 7C 08 03 A6 */ mtlr r0 -/* 80300AF0 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80300AF4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFff.s b/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFff.s deleted file mode 100644 index f6951f05aee..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFff.s +++ /dev/null @@ -1,114 +0,0 @@ -lbl_803002E8: -/* 803002E8 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 803002EC 7C 08 02 A6 */ mflr r0 -/* 803002F0 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 803002F4 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 803002F8 F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 803002FC DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 80300300 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 80300304 93 E1 00 AC */ stw r31, 0xac(r1) -/* 80300308 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 8030030C 7C 7E 1B 78 */ mr r30, r3 -/* 80300310 FF C0 08 90 */ fmr f30, f1 -/* 80300314 FF E0 10 90 */ fmr f31, f2 -/* 80300318 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 8030031C 28 00 00 00 */ cmplwi r0, 0 -/* 80300320 41 82 01 48 */ beq lbl_80300468 -/* 80300324 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80300328 90 01 00 08 */ stw r0, 8(r1) -/* 8030032C 80 1E 01 2C */ lwz r0, 0x12c(r30) -/* 80300330 90 01 00 0C */ stw r0, 0xc(r1) -/* 80300334 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 80300338 90 01 00 10 */ stw r0, 0x10(r1) -/* 8030033C 80 1E 01 04 */ lwz r0, 0x104(r30) -/* 80300340 90 01 00 14 */ stw r0, 0x14(r1) -/* 80300344 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300348 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 8030034C C0 3E 01 14 */ lfs f1, 0x114(r30) -/* 80300350 C0 5E 01 18 */ lfs f2, 0x118(r30) -/* 80300354 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80300358 38 C1 00 10 */ addi r6, r1, 0x10 -/* 8030035C 38 E1 00 0C */ addi r7, r1, 0xc -/* 80300360 39 01 00 08 */ addi r8, r1, 8 -/* 80300364 4B FF 40 31 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 80300368 C0 5E 01 20 */ lfs f2, 0x120(r30) -/* 8030036C C0 3E 01 1C */ lfs f1, 0x11c(r30) -/* 80300370 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 80300374 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80300378 40 81 00 08 */ ble lbl_80300380 -/* 8030037C 48 00 00 08 */ b lbl_80300384 -lbl_80300380: -/* 80300380 FC 20 00 90 */ fmr f1, f0 -lbl_80300384: -/* 80300384 D0 21 00 98 */ stfs f1, 0x98(r1) -/* 80300388 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 8030038C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80300390 40 81 00 08 */ ble lbl_80300398 -/* 80300394 48 00 00 08 */ b lbl_8030039C -lbl_80300398: -/* 80300398 FC 40 00 90 */ fmr f2, f0 -lbl_8030039C: -/* 8030039C D0 41 00 9C */ stfs f2, 0x9c(r1) -/* 803003A0 7F C3 F3 78 */ mr r3, r30 -/* 803003A4 FC 20 F0 90 */ fmr f1, f30 -/* 803003A8 FC 40 F8 90 */ fmr f2, f31 -/* 803003AC C0 62 C8 80 */ lfs f3, lit_1660(r2) -/* 803003B0 FC 80 18 90 */ fmr f4, f3 -/* 803003B4 81 9E 00 00 */ lwz r12, 0(r30) -/* 803003B8 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 803003BC 7D 89 03 A6 */ mtctr r12 -/* 803003C0 4E 80 04 21 */ bctrl -/* 803003C4 38 7E 00 50 */ addi r3, r30, 0x50 -/* 803003C8 38 80 00 00 */ li r4, 0 -/* 803003CC 48 05 FE 81 */ bl GXLoadPosMtxImm -/* 803003D0 38 60 00 00 */ li r3, 0 -/* 803003D4 48 05 FF 19 */ bl GXSetCurrentMtx -/* 803003D8 38 60 00 00 */ li r3, 0 -/* 803003DC 48 05 EC F9 */ bl GXSetNumIndStages -/* 803003E0 3B E0 00 00 */ li r31, 0 -lbl_803003E4: -/* 803003E4 7F E3 FB 78 */ mr r3, r31 -/* 803003E8 48 05 ED 11 */ bl GXSetTevDirect -/* 803003EC 3B FF 00 01 */ addi r31, r31, 1 -/* 803003F0 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 803003F4 41 80 FF F0 */ blt lbl_803003E4 -/* 803003F8 38 60 00 01 */ li r3, 1 -/* 803003FC 48 05 BA 01 */ bl GXSetNumTexGens -/* 80300400 38 60 00 00 */ li r3, 0 -/* 80300404 38 80 00 01 */ li r4, 1 -/* 80300408 38 A0 00 04 */ li r5, 4 -/* 8030040C 38 C0 00 3C */ li r6, 0x3c -/* 80300410 38 E0 00 00 */ li r7, 0 -/* 80300414 39 00 00 7D */ li r8, 0x7d -/* 80300418 48 05 B7 65 */ bl GXSetTexCoordGen2 -/* 8030041C 80 DE 01 24 */ lwz r6, 0x124(r30) -/* 80300420 28 06 00 00 */ cmplwi r6, 0 -/* 80300424 41 82 00 24 */ beq lbl_80300448 -/* 80300428 38 61 00 48 */ addi r3, r1, 0x48 -/* 8030042C C0 22 C8 80 */ lfs f1, lit_1660(r2) -/* 80300430 FC 40 08 90 */ fmr f2, f1 -/* 80300434 88 9E 00 B2 */ lbz r4, 0xb2(r30) -/* 80300438 3C A0 80 3A */ lis r5, J2DTextBox__stringBase0@ha /* 0x803A1C58@ha */ -/* 8030043C 38 A5 1C 58 */ addi r5, r5, J2DTextBox__stringBase0@l /* 0x803A1C58@l */ -/* 80300440 4C C6 32 42 */ crset 6 -/* 80300444 4B FF 43 35 */ bl print__8J2DPrintFffUcPCce -lbl_80300448: -/* 80300448 38 61 00 18 */ addi r3, r1, 0x18 -/* 8030044C 48 04 60 39 */ bl PSMTXIdentity -/* 80300450 38 61 00 18 */ addi r3, r1, 0x18 -/* 80300454 38 80 00 00 */ li r4, 0 -/* 80300458 48 05 FD F5 */ bl GXLoadPosMtxImm -/* 8030045C 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300460 38 80 FF FF */ li r4, -1 -/* 80300464 4B FF 3F BD */ bl __dt__8J2DPrintFv -lbl_80300468: -/* 80300468 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 8030046C CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 80300470 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 80300474 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 80300478 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 8030047C 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 80300480 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80300484 7C 08 03 A6 */ mtlr r0 -/* 80300488 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 8030048C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFfff18J2DTextBoxHBinding.s b/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFfff18J2DTextBoxHBinding.s deleted file mode 100644 index 32ab5b79230..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFfff18J2DTextBoxHBinding.s +++ /dev/null @@ -1,122 +0,0 @@ -lbl_80300490: -/* 80300490 94 21 FF 10 */ stwu r1, -0xf0(r1) -/* 80300494 7C 08 02 A6 */ mflr r0 -/* 80300498 90 01 00 F4 */ stw r0, 0xf4(r1) -/* 8030049C DB E1 00 E0 */ stfd f31, 0xe0(r1) -/* 803004A0 F3 E1 00 E8 */ psq_st f31, 232(r1), 0, 0 /* qr0 */ -/* 803004A4 DB C1 00 D0 */ stfd f30, 0xd0(r1) -/* 803004A8 F3 C1 00 D8 */ psq_st f30, 216(r1), 0, 0 /* qr0 */ -/* 803004AC DB A1 00 C0 */ stfd f29, 0xc0(r1) -/* 803004B0 F3 A1 00 C8 */ psq_st f29, 200(r1), 0, 0 /* qr0 */ -/* 803004B4 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 803004B8 48 06 1D 25 */ bl _savegpr_29 -/* 803004BC 7C 7D 1B 78 */ mr r29, r3 -/* 803004C0 FF A0 08 90 */ fmr f29, f1 -/* 803004C4 FF C0 10 90 */ fmr f30, f2 -/* 803004C8 FF E0 18 90 */ fmr f31, f3 -/* 803004CC 7C 9E 23 78 */ mr r30, r4 -/* 803004D0 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 803004D4 28 00 00 00 */ cmplwi r0, 0 -/* 803004D8 41 82 01 50 */ beq lbl_80300628 -/* 803004DC 80 1D 01 28 */ lwz r0, 0x128(r29) -/* 803004E0 90 01 00 08 */ stw r0, 8(r1) -/* 803004E4 80 1D 01 2C */ lwz r0, 0x12c(r29) -/* 803004E8 90 01 00 0C */ stw r0, 0xc(r1) -/* 803004EC 80 1D 01 08 */ lwz r0, 0x108(r29) -/* 803004F0 90 01 00 10 */ stw r0, 0x10(r1) -/* 803004F4 80 1D 01 04 */ lwz r0, 0x104(r29) -/* 803004F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803004FC 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300500 80 9D 01 00 */ lwz r4, 0x100(r29) -/* 80300504 C0 3D 01 14 */ lfs f1, 0x114(r29) -/* 80300508 C0 5D 01 18 */ lfs f2, 0x118(r29) -/* 8030050C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80300510 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80300514 38 E1 00 0C */ addi r7, r1, 0xc -/* 80300518 39 01 00 08 */ addi r8, r1, 8 -/* 8030051C 4B FF 3E 79 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 80300520 C0 5D 01 20 */ lfs f2, 0x120(r29) -/* 80300524 C0 3D 01 1C */ lfs f1, 0x11c(r29) -/* 80300528 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 8030052C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80300530 40 81 00 08 */ ble lbl_80300538 -/* 80300534 48 00 00 08 */ b lbl_8030053C -lbl_80300538: -/* 80300538 FC 20 00 90 */ fmr f1, f0 -lbl_8030053C: -/* 8030053C D0 21 00 98 */ stfs f1, 0x98(r1) -/* 80300540 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 80300544 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80300548 40 81 00 08 */ ble lbl_80300550 -/* 8030054C 48 00 00 08 */ b lbl_80300554 -lbl_80300550: -/* 80300550 FC 40 00 90 */ fmr f2, f0 -lbl_80300554: -/* 80300554 D0 41 00 9C */ stfs f2, 0x9c(r1) -/* 80300558 7F A3 EB 78 */ mr r3, r29 -/* 8030055C FC 20 E8 90 */ fmr f1, f29 -/* 80300560 FC 40 F0 90 */ fmr f2, f30 -/* 80300564 C0 62 C8 80 */ lfs f3, lit_1660(r2) -/* 80300568 FC 80 18 90 */ fmr f4, f3 -/* 8030056C 81 9D 00 00 */ lwz r12, 0(r29) -/* 80300570 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 80300574 7D 89 03 A6 */ mtctr r12 -/* 80300578 4E 80 04 21 */ bctrl -/* 8030057C 38 7D 00 50 */ addi r3, r29, 0x50 -/* 80300580 38 80 00 00 */ li r4, 0 -/* 80300584 48 05 FC C9 */ bl GXLoadPosMtxImm -/* 80300588 38 60 00 00 */ li r3, 0 -/* 8030058C 48 05 FD 61 */ bl GXSetCurrentMtx -/* 80300590 38 60 00 00 */ li r3, 0 -/* 80300594 48 05 EB 41 */ bl GXSetNumIndStages -/* 80300598 3B E0 00 00 */ li r31, 0 -lbl_8030059C: -/* 8030059C 7F E3 FB 78 */ mr r3, r31 -/* 803005A0 48 05 EB 59 */ bl GXSetTevDirect -/* 803005A4 3B FF 00 01 */ addi r31, r31, 1 -/* 803005A8 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 803005AC 41 80 FF F0 */ blt lbl_8030059C -/* 803005B0 38 60 00 01 */ li r3, 1 -/* 803005B4 48 05 B8 49 */ bl GXSetNumTexGens -/* 803005B8 38 60 00 00 */ li r3, 0 -/* 803005BC 38 80 00 01 */ li r4, 1 -/* 803005C0 38 A0 00 04 */ li r5, 4 -/* 803005C4 38 C0 00 3C */ li r6, 0x3c -/* 803005C8 38 E0 00 00 */ li r7, 0 -/* 803005CC 39 00 00 7D */ li r8, 0x7d -/* 803005D0 48 05 B5 AD */ bl GXSetTexCoordGen2 -/* 803005D4 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 803005D8 28 04 00 00 */ cmplwi r4, 0 -/* 803005DC 41 82 00 2C */ beq lbl_80300608 -/* 803005E0 38 61 00 48 */ addi r3, r1, 0x48 -/* 803005E4 FC 20 F8 90 */ fmr f1, f31 -/* 803005E8 C0 42 C8 80 */ lfs f2, lit_1660(r2) -/* 803005EC 7F C5 F3 78 */ mr r5, r30 -/* 803005F0 38 C0 00 02 */ li r6, 2 -/* 803005F4 FC 60 10 90 */ fmr f3, f2 -/* 803005F8 C0 1D 01 20 */ lfs f0, 0x120(r29) -/* 803005FC FC 80 00 50 */ fneg f4, f0 -/* 80300600 88 FD 00 B2 */ lbz r7, 0xb2(r29) -/* 80300604 4B FF 42 25 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc -lbl_80300608: -/* 80300608 38 61 00 18 */ addi r3, r1, 0x18 -/* 8030060C 48 04 5E 79 */ bl PSMTXIdentity -/* 80300610 38 61 00 18 */ addi r3, r1, 0x18 -/* 80300614 38 80 00 00 */ li r4, 0 -/* 80300618 48 05 FC 35 */ bl GXLoadPosMtxImm -/* 8030061C 38 61 00 48 */ addi r3, r1, 0x48 -/* 80300620 38 80 FF FF */ li r4, -1 -/* 80300624 4B FF 3D FD */ bl __dt__8J2DPrintFv -lbl_80300628: -/* 80300628 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 /* qr0 */ -/* 8030062C CB E1 00 E0 */ lfd f31, 0xe0(r1) -/* 80300630 E3 C1 00 D8 */ psq_l f30, 216(r1), 0, 0 /* qr0 */ -/* 80300634 CB C1 00 D0 */ lfd f30, 0xd0(r1) -/* 80300638 E3 A1 00 C8 */ psq_l f29, 200(r1), 0, 0 /* qr0 */ -/* 8030063C CB A1 00 C0 */ lfd f29, 0xc0(r1) -/* 80300640 39 61 00 C0 */ addi r11, r1, 0xc0 -/* 80300644 48 06 1B E5 */ bl _restgpr_29 -/* 80300648 80 01 00 F4 */ lwz r0, 0xf4(r1) -/* 8030064C 7C 08 03 A6 */ mtlr r0 -/* 80300650 38 21 00 F0 */ addi r1, r1, 0xf0 -/* 80300654 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding.s b/asm/JSystem/J2DGraph/J2DTextBox/initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding.s deleted file mode 100644 index c5604805cd0..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_802FFC58: -/* 802FFC58 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 802FFC5C 7C 08 02 A6 */ mflr r0 -/* 802FFC60 90 01 00 44 */ stw r0, 0x44(r1) -/* 802FFC64 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FFC68 48 06 25 69 */ bl _savegpr_26 -/* 802FFC6C 7C 7B 1B 78 */ mr r27, r3 -/* 802FFC70 7C 9A 23 79 */ or. r26, r4, r4 -/* 802FFC74 7C BC 2B 78 */ mr r28, r5 -/* 802FFC78 7C DD 33 78 */ mr r29, r6 -/* 802FFC7C 7C FE 3B 78 */ mr r30, r7 -/* 802FFC80 7D 1F 43 78 */ mr r31, r8 -/* 802FFC84 41 82 00 28 */ beq lbl_802FFCAC -/* 802FFC88 38 60 00 70 */ li r3, 0x70 -/* 802FFC8C 4B FC EF C1 */ bl __nw__FUl -/* 802FFC90 7C 60 1B 79 */ or. r0, r3, r3 -/* 802FFC94 41 82 00 14 */ beq lbl_802FFCA8 -/* 802FFC98 7F 44 D3 78 */ mr r4, r26 -/* 802FFC9C 38 A0 00 00 */ li r5, 0 -/* 802FFCA0 4B FD F2 F5 */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802FFCA4 7C 60 1B 78 */ mr r0, r3 -lbl_802FFCA8: -/* 802FFCA8 90 1B 01 00 */ stw r0, 0x100(r27) -lbl_802FFCAC: -/* 802FFCAC 38 80 FF FF */ li r4, -1 -/* 802FFCB0 90 9B 01 04 */ stw r4, 0x104(r27) -/* 802FFCB4 90 9B 01 08 */ stw r4, 0x108(r27) -/* 802FFCB8 38 60 00 00 */ li r3, 0 -/* 802FFCBC 90 61 00 0C */ stw r3, 0xc(r1) -/* 802FFCC0 88 01 00 0C */ lbz r0, 0xc(r1) -/* 802FFCC4 98 1B 01 2C */ stb r0, 0x12c(r27) -/* 802FFCC8 88 01 00 0D */ lbz r0, 0xd(r1) -/* 802FFCCC 98 1B 01 2D */ stb r0, 0x12d(r27) -/* 802FFCD0 88 01 00 0E */ lbz r0, 0xe(r1) -/* 802FFCD4 98 1B 01 2E */ stb r0, 0x12e(r27) -/* 802FFCD8 88 01 00 0F */ lbz r0, 0xf(r1) -/* 802FFCDC 98 1B 01 2F */ stb r0, 0x12f(r27) -/* 802FFCE0 90 81 00 08 */ stw r4, 8(r1) -/* 802FFCE4 88 01 00 08 */ lbz r0, 8(r1) -/* 802FFCE8 98 1B 01 28 */ stb r0, 0x128(r27) -/* 802FFCEC 88 01 00 09 */ lbz r0, 9(r1) -/* 802FFCF0 98 1B 01 29 */ stb r0, 0x129(r27) -/* 802FFCF4 88 01 00 0A */ lbz r0, 0xa(r1) -/* 802FFCF8 98 1B 01 2A */ stb r0, 0x12a(r27) -/* 802FFCFC 88 01 00 0B */ lbz r0, 0xb(r1) -/* 802FFD00 98 1B 01 2B */ stb r0, 0x12b(r27) -/* 802FFD04 57 C0 10 3A */ slwi r0, r30, 2 -/* 802FFD08 7C 00 FB 78 */ or r0, r0, r31 -/* 802FFD0C 98 1B 01 30 */ stb r0, 0x130(r27) -/* 802FFD10 B0 7B 01 32 */ sth r3, 0x132(r27) -/* 802FFD14 90 7B 01 24 */ stw r3, 0x124(r27) -/* 802FFD18 28 1C 00 00 */ cmplwi r28, 0 -/* 802FFD1C 41 82 00 7C */ beq lbl_802FFD98 -/* 802FFD20 7F A0 07 35 */ extsh. r0, r29 -/* 802FFD24 41 82 00 74 */ beq lbl_802FFD98 -/* 802FFD28 7F 83 E3 78 */ mr r3, r28 -/* 802FFD2C 48 06 8E B9 */ bl strlen -/* 802FFD30 57 BE 04 3E */ clrlwi r30, r29, 0x10 -/* 802FFD34 7F A0 07 34 */ extsh r0, r29 -/* 802FFD38 2C 00 FF FF */ cmpwi r0, -1 -/* 802FFD3C 40 82 00 1C */ bne lbl_802FFD58 -/* 802FFD40 28 03 FF FF */ cmplwi r3, 0xffff -/* 802FFD44 41 80 00 0C */ blt lbl_802FFD50 -/* 802FFD48 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFE@ha */ -/* 802FFD4C 38 63 FF FE */ addi r3, r3, 0xFFFE /* 0x0000FFFE@l */ -lbl_802FFD50: -/* 802FFD50 38 03 00 01 */ addi r0, r3, 1 -/* 802FFD54 54 1E 04 3E */ clrlwi r30, r0, 0x10 -lbl_802FFD58: -/* 802FFD58 57 C3 04 3E */ clrlwi r3, r30, 0x10 -/* 802FFD5C 4B FC EF 69 */ bl __nwa__FUl -/* 802FFD60 90 7B 01 24 */ stw r3, 0x124(r27) -/* 802FFD64 57 DD 04 3F */ clrlwi. r29, r30, 0x10 -/* 802FFD68 41 82 00 30 */ beq lbl_802FFD98 -/* 802FFD6C 80 7B 01 24 */ lwz r3, 0x124(r27) -/* 802FFD70 28 03 00 00 */ cmplwi r3, 0 -/* 802FFD74 41 82 00 24 */ beq lbl_802FFD98 -/* 802FFD78 7F 84 E3 78 */ mr r4, r28 -/* 802FFD7C 38 BD FF FF */ addi r5, r29, -1 -/* 802FFD80 48 06 8D 69 */ bl strncpy -/* 802FFD84 38 80 00 00 */ li r4, 0 -/* 802FFD88 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 802FFD8C 7C 60 EA 14 */ add r3, r0, r29 -/* 802FFD90 98 83 FF FF */ stb r4, -1(r3) -/* 802FFD94 B3 DB 01 32 */ sth r30, 0x132(r27) -lbl_802FFD98: -/* 802FFD98 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 802FFD9C D0 1B 01 0C */ stfs f0, 0x10c(r27) -/* 802FFDA0 D0 1B 01 10 */ stfs f0, 0x110(r27) -/* 802FFDA4 D0 1B 01 14 */ stfs f0, 0x114(r27) -/* 802FFDA8 80 7B 01 00 */ lwz r3, 0x100(r27) -/* 802FFDAC 28 03 00 00 */ cmplwi r3, 0 -/* 802FFDB0 40 82 00 14 */ bne lbl_802FFDC4 -/* 802FFDB4 D0 1B 01 18 */ stfs f0, 0x118(r27) -/* 802FFDB8 D0 1B 01 1C */ stfs f0, 0x11c(r27) -/* 802FFDBC D0 1B 01 20 */ stfs f0, 0x120(r27) -/* 802FFDC0 48 00 00 9C */ b lbl_802FFE5C -lbl_802FFDC4: -/* 802FFDC4 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFDC8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802FFDCC 7D 89 03 A6 */ mtctr r12 -/* 802FFDD0 4E 80 04 21 */ bctrl -/* 802FFDD4 C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FFDD8 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802FFDDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802FFDE0 3C 00 43 30 */ lis r0, 0x4330 -/* 802FFDE4 90 01 00 10 */ stw r0, 0x10(r1) -/* 802FFDE8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802FFDEC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FFDF0 D0 1B 01 18 */ stfs f0, 0x118(r27) -/* 802FFDF4 80 7B 01 00 */ lwz r3, 0x100(r27) -/* 802FFDF8 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFDFC 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 802FFE00 7D 89 03 A6 */ mtctr r12 -/* 802FFE04 4E 80 04 21 */ bctrl -/* 802FFE08 C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FFE0C 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802FFE10 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802FFE14 3C 00 43 30 */ lis r0, 0x4330 -/* 802FFE18 90 01 00 18 */ stw r0, 0x18(r1) -/* 802FFE1C C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802FFE20 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FFE24 D0 1B 01 1C */ stfs f0, 0x11c(r27) -/* 802FFE28 80 7B 01 00 */ lwz r3, 0x100(r27) -/* 802FFE2C 81 83 00 00 */ lwz r12, 0(r3) -/* 802FFE30 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802FFE34 7D 89 03 A6 */ mtctr r12 -/* 802FFE38 4E 80 04 21 */ bctrl -/* 802FFE3C C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FFE40 6C 60 80 00 */ xoris r0, r3, 0x8000 -/* 802FFE44 90 01 00 24 */ stw r0, 0x24(r1) -/* 802FFE48 3C 00 43 30 */ lis r0, 0x4330 -/* 802FFE4C 90 01 00 20 */ stw r0, 0x20(r1) -/* 802FFE50 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 802FFE54 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FFE58 D0 1B 01 20 */ stfs f0, 0x120(r27) -lbl_802FFE5C: -/* 802FFE5C 3C 60 54 42 */ lis r3, 0x5442 /* 0x54425831@ha */ -/* 802FFE60 38 03 58 31 */ addi r0, r3, 0x5831 /* 0x54425831@l */ -/* 802FFE64 90 1B 00 08 */ stw r0, 8(r27) -/* 802FFE68 38 00 00 01 */ li r0, 1 -/* 802FFE6C 98 1B 01 31 */ stb r0, 0x131(r27) -/* 802FFE70 39 61 00 40 */ addi r11, r1, 0x40 -/* 802FFE74 48 06 23 A9 */ bl _restgpr_26 -/* 802FFE78 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802FFE7C 7C 08 03 A6 */ mtlr r0 -/* 802FFE80 38 21 00 40 */ addi r1, r1, 0x40 -/* 802FFE84 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s deleted file mode 100644 index 67923f58615..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80300BFC: -/* 80300BFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80300C00 7C 08 02 A6 */ mflr r0 -/* 80300C04 90 01 00 14 */ stw r0, 0x14(r1) -/* 80300C08 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80300C0C 93 C1 00 08 */ stw r30, 8(r1) -/* 80300C10 7C 7E 1B 78 */ mr r30, r3 -/* 80300C14 7C 9F 23 78 */ mr r31, r4 -/* 80300C18 80 63 01 00 */ lwz r3, 0x100(r3) -/* 80300C1C 28 03 00 00 */ cmplwi r3, 0 -/* 80300C20 41 82 00 24 */ beq lbl_80300C44 -/* 80300C24 81 83 00 00 */ lwz r12, 0(r3) -/* 80300C28 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80300C2C 7D 89 03 A6 */ mtctr r12 -/* 80300C30 4E 80 04 21 */ bctrl -/* 80300C34 7C 03 F8 40 */ cmplw r3, r31 -/* 80300C38 40 82 00 0C */ bne lbl_80300C44 -/* 80300C3C 38 60 00 01 */ li r3, 1 -/* 80300C40 48 00 00 10 */ b lbl_80300C50 -lbl_80300C44: -/* 80300C44 7F C3 F3 78 */ mr r3, r30 -/* 80300C48 7F E4 FB 78 */ mr r4, r31 -/* 80300C4C 4B FF 68 6D */ bl isUsed__7J2DPaneFPC7ResFONT -lbl_80300C50: -/* 80300C50 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80300C54 83 C1 00 08 */ lwz r30, 8(r1) -/* 80300C58 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80300C5C 7C 08 03 A6 */ mtlr r0 -/* 80300C60 38 21 00 10 */ addi r1, r1, 0x10 -/* 80300C64 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s b/asm/JSystem/J2DGraph/J2DTextBox/private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s deleted file mode 100644 index 067903c9d40..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s +++ /dev/null @@ -1,223 +0,0 @@ -lbl_802FFE88: -/* 802FFE88 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 802FFE8C 7C 08 02 A6 */ mflr r0 -/* 802FFE90 90 01 00 74 */ stw r0, 0x74(r1) -/* 802FFE94 39 61 00 70 */ addi r11, r1, 0x70 -/* 802FFE98 48 06 23 39 */ bl _savegpr_26 -/* 802FFE9C 7C 7C 1B 78 */ mr r28, r3 -/* 802FFEA0 7C 9B 23 78 */ mr r27, r4 -/* 802FFEA4 7C BD 2B 78 */ mr r29, r5 -/* 802FFEA8 7C DA 33 78 */ mr r26, r6 -/* 802FFEAC 7F A3 EB 78 */ mr r3, r29 -/* 802FFEB0 81 9D 00 00 */ lwz r12, 0(r29) -/* 802FFEB4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 802FFEB8 7D 89 03 A6 */ mtctr r12 -/* 802FFEBC 4E 80 04 21 */ bctrl -/* 802FFEC0 7C 7F 1B 78 */ mr r31, r3 -/* 802FFEC4 7F A3 EB 78 */ mr r3, r29 -/* 802FFEC8 38 81 00 30 */ addi r4, r1, 0x30 -/* 802FFECC 38 A0 00 08 */ li r5, 8 -/* 802FFED0 4B FD C3 C9 */ bl read__14JSUInputStreamFPvl -/* 802FFED4 80 01 00 30 */ lwz r0, 0x30(r1) -/* 802FFED8 90 1C 00 08 */ stw r0, 8(r28) -/* 802FFEDC 7F 83 E3 78 */ mr r3, r28 -/* 802FFEE0 7F 64 DB 78 */ mr r4, r27 -/* 802FFEE4 7F A5 EB 78 */ mr r5, r29 -/* 802FFEE8 4B FF 61 DD */ bl makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 802FFEEC 7F A3 EB 78 */ mr r3, r29 -/* 802FFEF0 38 81 00 0A */ addi r4, r1, 0xa -/* 802FFEF4 38 A0 00 01 */ li r5, 1 -/* 802FFEF8 4B FD C3 A1 */ bl read__14JSUInputStreamFPvl -/* 802FFEFC 8B C1 00 0A */ lbz r30, 0xa(r1) -/* 802FFF00 7F 83 E3 78 */ mr r3, r28 -/* 802FFF04 7F A4 EB 78 */ mr r4, r29 -/* 802FFF08 3C A0 46 4F */ lis r5, 0x464F /* 0x464F4E54@ha */ -/* 802FFF0C 38 A5 4E 54 */ addi r5, r5, 0x4E54 /* 0x464F4E54@l */ -/* 802FFF10 7F 46 D3 78 */ mr r6, r26 -/* 802FFF14 4B FF 7E A5 */ bl getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive -/* 802FFF18 7C 7B 1B 79 */ or. r27, r3, r3 -/* 802FFF1C 41 82 00 28 */ beq lbl_802FFF44 -/* 802FFF20 38 60 00 70 */ li r3, 0x70 -/* 802FFF24 4B FC ED 29 */ bl __nw__FUl -/* 802FFF28 7C 60 1B 79 */ or. r0, r3, r3 -/* 802FFF2C 41 82 00 14 */ beq lbl_802FFF40 -/* 802FFF30 7F 64 DB 78 */ mr r4, r27 -/* 802FFF34 38 A0 00 00 */ li r5, 0 -/* 802FFF38 4B FD F0 5D */ bl __ct__10JUTResFontFPC7ResFONTP7JKRHeap -/* 802FFF3C 7C 60 1B 78 */ mr r0, r3 -lbl_802FFF40: -/* 802FFF40 90 1C 01 00 */ stw r0, 0x100(r28) -lbl_802FFF44: -/* 802FFF44 7F A3 EB 78 */ mr r3, r29 -/* 802FFF48 38 81 00 24 */ addi r4, r1, 0x24 -/* 802FFF4C 38 A0 00 04 */ li r5, 4 -/* 802FFF50 4B FD C3 49 */ bl read__14JSUInputStreamFPvl -/* 802FFF54 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802FFF58 90 1C 01 04 */ stw r0, 0x104(r28) -/* 802FFF5C 7F A3 EB 78 */ mr r3, r29 -/* 802FFF60 38 81 00 20 */ addi r4, r1, 0x20 -/* 802FFF64 38 A0 00 04 */ li r5, 4 -/* 802FFF68 4B FD C3 31 */ bl read__14JSUInputStreamFPvl -/* 802FFF6C 80 01 00 20 */ lwz r0, 0x20(r1) -/* 802FFF70 90 1C 01 08 */ stw r0, 0x108(r28) -/* 802FFF74 7F A3 EB 78 */ mr r3, r29 -/* 802FFF78 38 81 00 09 */ addi r4, r1, 9 -/* 802FFF7C 38 A0 00 01 */ li r5, 1 -/* 802FFF80 4B FD C3 19 */ bl read__14JSUInputStreamFPvl -/* 802FFF84 88 01 00 09 */ lbz r0, 9(r1) -/* 802FFF88 98 1C 01 30 */ stb r0, 0x130(r28) -/* 802FFF8C 7F A3 EB 78 */ mr r3, r29 -/* 802FFF90 38 81 00 14 */ addi r4, r1, 0x14 -/* 802FFF94 38 A0 00 02 */ li r5, 2 -/* 802FFF98 4B FD C3 01 */ bl read__14JSUInputStreamFPvl -/* 802FFF9C A8 01 00 14 */ lha r0, 0x14(r1) -/* 802FFFA0 C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FFFA4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FFFA8 90 01 00 3C */ stw r0, 0x3c(r1) -/* 802FFFAC 3C 00 43 30 */ lis r0, 0x4330 -/* 802FFFB0 90 01 00 38 */ stw r0, 0x38(r1) -/* 802FFFB4 C8 01 00 38 */ lfd f0, 0x38(r1) -/* 802FFFB8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FFFBC D0 1C 01 14 */ stfs f0, 0x114(r28) -/* 802FFFC0 7F A3 EB 78 */ mr r3, r29 -/* 802FFFC4 38 81 00 12 */ addi r4, r1, 0x12 -/* 802FFFC8 38 A0 00 02 */ li r5, 2 -/* 802FFFCC 4B FD C2 CD */ bl read__14JSUInputStreamFPvl -/* 802FFFD0 A8 01 00 12 */ lha r0, 0x12(r1) -/* 802FFFD4 C8 22 C8 88 */ lfd f1, lit_1662(r2) -/* 802FFFD8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802FFFDC 90 01 00 44 */ stw r0, 0x44(r1) -/* 802FFFE0 3C 00 43 30 */ lis r0, 0x4330 -/* 802FFFE4 90 01 00 40 */ stw r0, 0x40(r1) -/* 802FFFE8 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 802FFFEC EC 00 08 28 */ fsubs f0, f0, f1 -/* 802FFFF0 D0 1C 01 18 */ stfs f0, 0x118(r28) -/* 802FFFF4 7F A3 EB 78 */ mr r3, r29 -/* 802FFFF8 38 81 00 10 */ addi r4, r1, 0x10 -/* 802FFFFC 38 A0 00 02 */ li r5, 2 -/* 80300000 4B FD C2 99 */ bl read__14JSUInputStreamFPvl -/* 80300004 A0 01 00 10 */ lhz r0, 0x10(r1) -/* 80300008 C8 22 C8 90 */ lfd f1, lit_1665(r2) -/* 8030000C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80300010 3C 00 43 30 */ lis r0, 0x4330 -/* 80300014 90 01 00 48 */ stw r0, 0x48(r1) -/* 80300018 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 8030001C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80300020 D0 1C 01 1C */ stfs f0, 0x11c(r28) -/* 80300024 7F A3 EB 78 */ mr r3, r29 -/* 80300028 38 81 00 0E */ addi r4, r1, 0xe -/* 8030002C 38 A0 00 02 */ li r5, 2 -/* 80300030 4B FD C2 69 */ bl read__14JSUInputStreamFPvl -/* 80300034 A0 01 00 0E */ lhz r0, 0xe(r1) -/* 80300038 C8 22 C8 90 */ lfd f1, lit_1665(r2) -/* 8030003C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80300040 3C 00 43 30 */ lis r0, 0x4330 -/* 80300044 90 01 00 50 */ stw r0, 0x50(r1) -/* 80300048 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 8030004C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80300050 D0 1C 01 20 */ stfs f0, 0x120(r28) -/* 80300054 7F A3 EB 78 */ mr r3, r29 -/* 80300058 38 81 00 0C */ addi r4, r1, 0xc -/* 8030005C 38 A0 00 02 */ li r5, 2 -/* 80300060 4B FD C2 39 */ bl read__14JSUInputStreamFPvl -/* 80300064 A0 01 00 0C */ lhz r0, 0xc(r1) -/* 80300068 7C 1A 07 34 */ extsh r26, r0 -/* 8030006C 3B 7A 00 01 */ addi r27, r26, 1 -/* 80300070 7F 63 DB 78 */ mr r3, r27 -/* 80300074 4B FC EC 51 */ bl __nwa__FUl -/* 80300078 90 7C 01 24 */ stw r3, 0x124(r28) -/* 8030007C 80 9C 01 24 */ lwz r4, 0x124(r28) -/* 80300080 28 04 00 00 */ cmplwi r4, 0 -/* 80300084 41 82 00 24 */ beq lbl_803000A8 -/* 80300088 7F A3 EB 78 */ mr r3, r29 -/* 8030008C 7F 45 D3 78 */ mr r5, r26 -/* 80300090 4B FD C2 09 */ bl read__14JSUInputStreamFPvl -/* 80300094 38 00 00 00 */ li r0, 0 -/* 80300098 80 7C 01 24 */ lwz r3, 0x124(r28) -/* 8030009C 7C 03 D1 AE */ stbx r0, r3, r26 -/* 803000A0 B3 7C 01 32 */ sth r27, 0x132(r28) -/* 803000A4 48 00 00 24 */ b lbl_803000C8 -lbl_803000A8: -/* 803000A8 7F A3 EB 78 */ mr r3, r29 -/* 803000AC 7F 44 D3 78 */ mr r4, r26 -/* 803000B0 81 9D 00 00 */ lwz r12, 0(r29) -/* 803000B4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 803000B8 7D 89 03 A6 */ mtctr r12 -/* 803000BC 4E 80 04 21 */ bctrl -/* 803000C0 38 00 00 00 */ li r0, 0 -/* 803000C4 B0 1C 01 32 */ sth r0, 0x132(r28) -lbl_803000C8: -/* 803000C8 3B DE FF F6 */ addi r30, r30, -10 -/* 803000CC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 803000D0 41 82 00 3C */ beq lbl_8030010C -/* 803000D4 7F A3 EB 78 */ mr r3, r29 -/* 803000D8 38 81 00 08 */ addi r4, r1, 8 -/* 803000DC 38 A0 00 01 */ li r5, 1 -/* 803000E0 4B FD C1 B9 */ bl read__14JSUInputStreamFPvl -/* 803000E4 88 01 00 08 */ lbz r0, 8(r1) -/* 803000E8 28 00 00 00 */ cmplwi r0, 0 -/* 803000EC 41 82 00 1C */ beq lbl_80300108 -/* 803000F0 7F 83 E3 78 */ mr r3, r28 -/* 803000F4 38 80 00 01 */ li r4, 1 -/* 803000F8 81 9C 00 00 */ lwz r12, 0(r28) -/* 803000FC 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80300100 7D 89 03 A6 */ mtctr r12 -/* 80300104 4E 80 04 21 */ bctrl -lbl_80300108: -/* 80300108 3B DE FF FF */ addi r30, r30, -1 -lbl_8030010C: -/* 8030010C 38 00 00 00 */ li r0, 0 -/* 80300110 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80300114 88 01 00 2C */ lbz r0, 0x2c(r1) -/* 80300118 98 1C 01 2C */ stb r0, 0x12c(r28) -/* 8030011C 88 01 00 2D */ lbz r0, 0x2d(r1) -/* 80300120 98 1C 01 2D */ stb r0, 0x12d(r28) -/* 80300124 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 80300128 98 1C 01 2E */ stb r0, 0x12e(r28) -/* 8030012C 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 80300130 98 1C 01 2F */ stb r0, 0x12f(r28) -/* 80300134 38 00 FF FF */ li r0, -1 -/* 80300138 90 01 00 28 */ stw r0, 0x28(r1) -/* 8030013C 88 01 00 28 */ lbz r0, 0x28(r1) -/* 80300140 98 1C 01 28 */ stb r0, 0x128(r28) -/* 80300144 88 01 00 29 */ lbz r0, 0x29(r1) -/* 80300148 98 1C 01 29 */ stb r0, 0x129(r28) -/* 8030014C 88 01 00 2A */ lbz r0, 0x2a(r1) -/* 80300150 98 1C 01 2A */ stb r0, 0x12a(r28) -/* 80300154 88 01 00 2B */ lbz r0, 0x2b(r1) -/* 80300158 98 1C 01 2B */ stb r0, 0x12b(r28) -/* 8030015C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80300160 41 82 00 20 */ beq lbl_80300180 -/* 80300164 7F A3 EB 78 */ mr r3, r29 -/* 80300168 38 81 00 1C */ addi r4, r1, 0x1c -/* 8030016C 38 A0 00 04 */ li r5, 4 -/* 80300170 4B FD C1 29 */ bl read__14JSUInputStreamFPvl -/* 80300174 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80300178 90 1C 01 2C */ stw r0, 0x12c(r28) -/* 8030017C 3B DE FF FF */ addi r30, r30, -1 -lbl_80300180: -/* 80300180 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 80300184 41 82 00 1C */ beq lbl_803001A0 -/* 80300188 7F A3 EB 78 */ mr r3, r29 -/* 8030018C 38 81 00 18 */ addi r4, r1, 0x18 -/* 80300190 38 A0 00 04 */ li r5, 4 -/* 80300194 4B FD C1 05 */ bl read__14JSUInputStreamFPvl -/* 80300198 80 01 00 18 */ lwz r0, 0x18(r1) -/* 8030019C 90 1C 01 28 */ stw r0, 0x128(r28) -lbl_803001A0: -/* 803001A0 C0 02 C8 80 */ lfs f0, lit_1660(r2) -/* 803001A4 D0 1C 01 0C */ stfs f0, 0x10c(r28) -/* 803001A8 D0 1C 01 10 */ stfs f0, 0x110(r28) -/* 803001AC 7F A3 EB 78 */ mr r3, r29 -/* 803001B0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 803001B4 7C 9F 02 14 */ add r4, r31, r0 -/* 803001B8 38 A0 00 00 */ li r5, 0 -/* 803001BC 4B FD C3 21 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 803001C0 38 00 00 01 */ li r0, 1 -/* 803001C4 98 1C 01 31 */ stb r0, 0x131(r28) -/* 803001C8 39 61 00 70 */ addi r11, r1, 0x70 -/* 803001CC 48 06 20 51 */ bl _restgpr_26 -/* 803001D0 80 01 00 74 */ lwz r0, 0x74(r1) -/* 803001D4 7C 08 03 A6 */ mtlr r0 -/* 803001D8 38 21 00 70 */ addi r1, r1, 0x70 -/* 803001DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/resize__10J2DTextBoxFff.s b/asm/JSystem/J2DGraph/J2DTextBox/resize__10J2DTextBoxFff.s deleted file mode 100644 index e01f98e4fd4..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/resize__10J2DTextBoxFff.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80300AF8: -/* 80300AF8 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80300AFC 7C 08 02 A6 */ mflr r0 -/* 80300B00 90 01 00 34 */ stw r0, 0x34(r1) -/* 80300B04 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80300B08 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80300B0C DB C1 00 10 */ stfd f30, 0x10(r1) -/* 80300B10 F3 C1 00 18 */ psq_st f30, 24(r1), 0, 0 /* qr0 */ -/* 80300B14 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80300B18 93 C1 00 08 */ stw r30, 8(r1) -/* 80300B1C 7C 7E 1B 78 */ mr r30, r3 -/* 80300B20 FF C0 08 90 */ fmr f30, f1 -/* 80300B24 FF E0 10 90 */ fmr f31, f2 -/* 80300B28 88 03 00 B5 */ lbz r0, 0xb5(r3) -/* 80300B2C 28 00 00 00 */ cmplwi r0, 0 -/* 80300B30 41 82 00 94 */ beq lbl_80300BC4 -/* 80300B34 34 1E 00 DC */ addic. r0, r30, 0xdc -/* 80300B38 41 82 00 8C */ beq lbl_80300BC4 -/* 80300B3C 80 7E 00 EC */ lwz r3, 0xec(r30) -/* 80300B40 28 03 00 00 */ cmplwi r3, 0 -/* 80300B44 41 82 00 80 */ beq lbl_80300BC4 -/* 80300B48 83 E3 00 0C */ lwz r31, 0xc(r3) -/* 80300B4C 7F E3 FB 78 */ mr r3, r31 -/* 80300B50 81 9F 00 00 */ lwz r12, 0(r31) -/* 80300B54 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80300B58 7D 89 03 A6 */ mtctr r12 -/* 80300B5C 4E 80 04 21 */ bctrl -/* 80300B60 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 80300B64 28 00 00 11 */ cmplwi r0, 0x11 -/* 80300B68 40 82 00 5C */ bne lbl_80300BC4 -/* 80300B6C 7F E3 FB 78 */ mr r3, r31 -/* 80300B70 C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80300B74 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80300B78 EC 41 00 28 */ fsubs f2, f1, f0 -/* 80300B7C C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80300B80 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80300B84 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80300B88 EC 1E 00 28 */ fsubs f0, f30, f0 -/* 80300B8C EC 22 00 2A */ fadds f1, f2, f0 -/* 80300B90 C0 5F 00 2C */ lfs f2, 0x2c(r31) -/* 80300B94 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80300B98 EC 62 00 28 */ fsubs f3, f2, f0 -/* 80300B9C C0 5E 00 2C */ lfs f2, 0x2c(r30) -/* 80300BA0 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 80300BA4 EC 02 00 28 */ fsubs f0, f2, f0 -/* 80300BA8 EC 1F 00 28 */ fsubs f0, f31, f0 -/* 80300BAC EC 43 00 2A */ fadds f2, f3, f0 -/* 80300BB0 81 9F 00 00 */ lwz r12, 0(r31) -/* 80300BB4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80300BB8 7D 89 03 A6 */ mtctr r12 -/* 80300BBC 4E 80 04 21 */ bctrl -/* 80300BC0 48 00 00 14 */ b lbl_80300BD4 -lbl_80300BC4: -/* 80300BC4 7F C3 F3 78 */ mr r3, r30 -/* 80300BC8 FC 20 F0 90 */ fmr f1, f30 -/* 80300BCC FC 40 F8 90 */ fmr f2, f31 -/* 80300BD0 4B FF 64 29 */ bl resize__7J2DPaneFff -lbl_80300BD4: -/* 80300BD4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80300BD8 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80300BDC E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 /* qr0 */ -/* 80300BE0 CB C1 00 10 */ lfd f30, 0x10(r1) -/* 80300BE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80300BE8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80300BEC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80300BF0 7C 08 03 A6 */ mtlr r0 -/* 80300BF4 38 21 00 30 */ addi r1, r1, 0x30 -/* 80300BF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s b/asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s deleted file mode 100644 index ab3020ab51d..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80300870: -/* 80300870 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80300874 7C 08 02 A6 */ mflr r0 -/* 80300878 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030087C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80300880 93 C1 00 08 */ stw r30, 8(r1) -/* 80300884 7C 7E 1B 78 */ mr r30, r3 -/* 80300888 7C 9F 23 78 */ mr r31, r4 -/* 8030088C 80 63 00 EC */ lwz r3, 0xec(r3) -/* 80300890 28 03 00 00 */ cmplwi r3, 0 -/* 80300894 40 82 00 0C */ bne lbl_803008A0 -/* 80300898 38 60 00 00 */ li r3, 0 -/* 8030089C 48 00 00 34 */ b lbl_803008D0 -lbl_803008A0: -/* 803008A0 80 63 00 0C */ lwz r3, 0xc(r3) -/* 803008A4 81 83 00 00 */ lwz r12, 0(r3) -/* 803008A8 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 803008AC 7D 89 03 A6 */ mtctr r12 -/* 803008B0 4E 80 04 21 */ bctrl -/* 803008B4 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 803008B8 28 00 00 11 */ cmplwi r0, 0x11 -/* 803008BC 41 82 00 0C */ beq lbl_803008C8 -/* 803008C0 38 60 00 00 */ li r3, 0 -/* 803008C4 48 00 00 0C */ b lbl_803008D0 -lbl_803008C8: -/* 803008C8 9B FE 00 B5 */ stb r31, 0xb5(r30) -/* 803008CC 7F E3 FB 78 */ mr r3, r31 -lbl_803008D0: -/* 803008D0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803008D4 83 C1 00 08 */ lwz r30, 8(r1) -/* 803008D8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803008DC 7C 08 03 A6 */ mtlr r0 -/* 803008E0 38 21 00 10 */ addi r1, r1, 0x10 -/* 803008E4 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s b/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s deleted file mode 100644 index f3a26895fa6..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80300660: -/* 80300660 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80300664 7C 08 02 A6 */ mflr r0 -/* 80300668 90 01 00 94 */ stw r0, 0x94(r1) -/* 8030066C 39 61 00 90 */ addi r11, r1, 0x90 -/* 80300670 48 06 1B 6D */ bl _savegpr_29 -/* 80300674 7C 7D 1B 78 */ mr r29, r3 -/* 80300678 7C 9E 23 78 */ mr r30, r4 -/* 8030067C 40 86 00 24 */ bne cr1, lbl_803006A0 -/* 80300680 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 80300684 D8 41 00 30 */ stfd f2, 0x30(r1) -/* 80300688 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 8030068C D8 81 00 40 */ stfd f4, 0x40(r1) -/* 80300690 D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 80300694 D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 80300698 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 8030069C D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_803006A0: -/* 803006A0 90 61 00 08 */ stw r3, 8(r1) -/* 803006A4 90 81 00 0C */ stw r4, 0xc(r1) -/* 803006A8 90 A1 00 10 */ stw r5, 0x10(r1) -/* 803006AC 90 C1 00 14 */ stw r6, 0x14(r1) -/* 803006B0 90 E1 00 18 */ stw r7, 0x18(r1) -/* 803006B4 91 01 00 1C */ stw r8, 0x1c(r1) -/* 803006B8 91 21 00 20 */ stw r9, 0x20(r1) -/* 803006BC 91 41 00 24 */ stw r10, 0x24(r1) -/* 803006C0 3C 00 02 00 */ lis r0, 0x200 -/* 803006C4 90 01 00 68 */ stw r0, 0x68(r1) -/* 803006C8 38 01 00 98 */ addi r0, r1, 0x98 -/* 803006CC 90 01 00 6C */ stw r0, 0x6c(r1) -/* 803006D0 38 01 00 08 */ addi r0, r1, 8 -/* 803006D4 90 01 00 70 */ stw r0, 0x70(r1) -/* 803006D8 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 803006DC 4B FC E6 85 */ bl __dla__FPv -/* 803006E0 7F C3 F3 78 */ mr r3, r30 -/* 803006E4 48 06 85 01 */ bl strlen -/* 803006E8 7C 7F 1B 78 */ mr r31, r3 -/* 803006EC 28 1F FF FF */ cmplwi r31, 0xffff -/* 803006F0 41 80 00 0C */ blt lbl_803006FC -/* 803006F4 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFE@ha */ -/* 803006F8 3B E3 FF FE */ addi r31, r3, 0xFFFE /* 0x0000FFFE@l */ -lbl_803006FC: -/* 803006FC 38 00 00 00 */ li r0, 0 -/* 80300700 B0 1D 01 32 */ sth r0, 0x132(r29) -/* 80300704 38 7F 00 01 */ addi r3, r31, 1 -/* 80300708 4B FC E5 BD */ bl __nwa__FUl -/* 8030070C 90 7D 01 24 */ stw r3, 0x124(r29) -/* 80300710 80 1D 01 24 */ lwz r0, 0x124(r29) -/* 80300714 28 00 00 00 */ cmplwi r0, 0 -/* 80300718 41 82 00 18 */ beq lbl_80300730 -/* 8030071C 38 1F 00 01 */ addi r0, r31, 1 -/* 80300720 B0 1D 01 32 */ sth r0, 0x132(r29) -/* 80300724 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 80300728 7F C4 F3 78 */ mr r4, r30 -/* 8030072C 48 06 84 01 */ bl strcpy -lbl_80300730: -/* 80300730 7F E3 FB 78 */ mr r3, r31 -/* 80300734 39 61 00 90 */ addi r11, r1, 0x90 -/* 80300738 48 06 1A F1 */ bl _restgpr_29 -/* 8030073C 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80300740 7C 08 03 A6 */ mtlr r0 -/* 80300744 38 21 00 90 */ addi r1, r1, 0x90 -/* 80300748 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s b/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s deleted file mode 100644 index 6ab93bca237..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8030074C: -/* 8030074C 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80300750 7C 08 02 A6 */ mflr r0 -/* 80300754 90 01 00 94 */ stw r0, 0x94(r1) -/* 80300758 39 61 00 90 */ addi r11, r1, 0x90 -/* 8030075C 48 06 1A 79 */ bl _savegpr_27 -/* 80300760 7C 7F 1B 78 */ mr r31, r3 -/* 80300764 7C 9B 23 78 */ mr r27, r4 -/* 80300768 7C BE 2B 78 */ mr r30, r5 -/* 8030076C 40 86 00 24 */ bne cr1, lbl_80300790 -/* 80300770 D8 21 00 28 */ stfd f1, 0x28(r1) -/* 80300774 D8 41 00 30 */ stfd f2, 0x30(r1) -/* 80300778 D8 61 00 38 */ stfd f3, 0x38(r1) -/* 8030077C D8 81 00 40 */ stfd f4, 0x40(r1) -/* 80300780 D8 A1 00 48 */ stfd f5, 0x48(r1) -/* 80300784 D8 C1 00 50 */ stfd f6, 0x50(r1) -/* 80300788 D8 E1 00 58 */ stfd f7, 0x58(r1) -/* 8030078C D9 01 00 60 */ stfd f8, 0x60(r1) -lbl_80300790: -/* 80300790 90 61 00 08 */ stw r3, 8(r1) -/* 80300794 90 81 00 0C */ stw r4, 0xc(r1) -/* 80300798 90 A1 00 10 */ stw r5, 0x10(r1) -/* 8030079C 90 C1 00 14 */ stw r6, 0x14(r1) -/* 803007A0 90 E1 00 18 */ stw r7, 0x18(r1) -/* 803007A4 91 01 00 1C */ stw r8, 0x1c(r1) -/* 803007A8 91 21 00 20 */ stw r9, 0x20(r1) -/* 803007AC 91 41 00 24 */ stw r10, 0x24(r1) -/* 803007B0 3C 00 03 00 */ lis r0, 0x300 -/* 803007B4 90 01 00 68 */ stw r0, 0x68(r1) -/* 803007B8 38 01 00 98 */ addi r0, r1, 0x98 -/* 803007BC 90 01 00 6C */ stw r0, 0x6c(r1) -/* 803007C0 38 01 00 08 */ addi r0, r1, 8 -/* 803007C4 90 01 00 70 */ stw r0, 0x70(r1) -/* 803007C8 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 803007CC 4B FC E5 95 */ bl __dla__FPv -/* 803007D0 38 00 00 00 */ li r0, 0 -/* 803007D4 90 1F 01 24 */ stw r0, 0x124(r31) -/* 803007D8 7F C3 F3 78 */ mr r3, r30 -/* 803007DC 48 06 84 09 */ bl strlen -/* 803007E0 7C 7D 1B 78 */ mr r29, r3 -/* 803007E4 57 7C 04 3E */ clrlwi r28, r27, 0x10 -/* 803007E8 7F 60 07 34 */ extsh r0, r27 -/* 803007EC 2C 00 FF FF */ cmpwi r0, -1 -/* 803007F0 40 82 00 1C */ bne lbl_8030080C -/* 803007F4 28 1D FF FF */ cmplwi r29, 0xffff -/* 803007F8 41 80 00 0C */ blt lbl_80300804 -/* 803007FC 3C 60 00 01 */ lis r3, 0x0001 /* 0x0000FFFE@ha */ -/* 80300800 3B A3 FF FE */ addi r29, r3, 0xFFFE /* 0x0000FFFE@l */ -lbl_80300804: -/* 80300804 38 1D 00 01 */ addi r0, r29, 1 -/* 80300808 54 1C 04 3E */ clrlwi r28, r0, 0x10 -lbl_8030080C: -/* 8030080C 38 00 00 00 */ li r0, 0 -/* 80300810 B0 1F 01 32 */ sth r0, 0x132(r31) -/* 80300814 57 83 04 3F */ clrlwi. r3, r28, 0x10 -/* 80300818 41 82 00 0C */ beq lbl_80300824 -/* 8030081C 4B FC E4 A9 */ bl __nwa__FUl -/* 80300820 90 7F 01 24 */ stw r3, 0x124(r31) -lbl_80300824: -/* 80300824 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 80300828 28 03 00 00 */ cmplwi r3, 0 -/* 8030082C 41 82 00 28 */ beq lbl_80300854 -/* 80300830 7F C4 F3 78 */ mr r4, r30 -/* 80300834 57 9E 04 3E */ clrlwi r30, r28, 0x10 -/* 80300838 38 BE FF FF */ addi r5, r30, -1 -/* 8030083C 48 06 82 AD */ bl strncpy -/* 80300840 38 80 00 00 */ li r4, 0 -/* 80300844 80 1F 01 24 */ lwz r0, 0x124(r31) -/* 80300848 7C 60 F2 14 */ add r3, r0, r30 -/* 8030084C 98 83 FF FF */ stb r4, -1(r3) -/* 80300850 B3 9F 01 32 */ sth r28, 0x132(r31) -lbl_80300854: -/* 80300854 7F A3 EB 78 */ mr r3, r29 -/* 80300858 39 61 00 90 */ addi r11, r1, 0x90 -/* 8030085C 48 06 19 C5 */ bl _restgpr_27 -/* 80300860 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80300864 7C 08 03 A6 */ mtlr r0 -/* 80300868 38 21 00 90 */ addi r1, r1, 0x90 -/* 8030086C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s deleted file mode 100644 index 7d1d547352f..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s +++ /dev/null @@ -1,212 +0,0 @@ -lbl_803071E4: -/* 803071E4 94 21 FF 80 */ stwu r1, -0x80(r1) -/* 803071E8 7C 08 02 A6 */ mflr r0 -/* 803071EC 90 01 00 84 */ stw r0, 0x84(r1) -/* 803071F0 39 61 00 80 */ addi r11, r1, 0x80 -/* 803071F4 48 05 AF D9 */ bl _savegpr_25 -/* 803071F8 7C 7B 1B 78 */ mr r27, r3 -/* 803071FC 7C 99 23 78 */ mr r25, r4 -/* 80307200 7C BC 2B 78 */ mr r28, r5 -/* 80307204 7C DD 33 78 */ mr r29, r6 -/* 80307208 7C FE 3B 78 */ mr r30, r7 -/* 8030720C 4B FF 84 55 */ bl __ct__10J2DTextBoxFv -/* 80307210 3C 60 80 3D */ lis r3, __vt__12J2DTextBoxEx@ha /* 0x803CD608@ha */ -/* 80307214 38 03 D6 08 */ addi r0, r3, __vt__12J2DTextBoxEx@l /* 0x803CD608@l */ -/* 80307218 90 1B 00 00 */ stw r0, 0(r27) -/* 8030721C 38 00 00 00 */ li r0, 0 -/* 80307220 90 1B 01 44 */ stw r0, 0x144(r27) -/* 80307224 7F 83 E3 78 */ mr r3, r28 -/* 80307228 81 9C 00 00 */ lwz r12, 0(r28) -/* 8030722C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80307230 7D 89 03 A6 */ mtctr r12 -/* 80307234 4E 80 04 21 */ bctrl -/* 80307238 7C 7F 1B 78 */ mr r31, r3 -/* 8030723C 7F 83 E3 78 */ mr r3, r28 -/* 80307240 38 81 00 18 */ addi r4, r1, 0x18 -/* 80307244 38 A0 00 08 */ li r5, 8 -/* 80307248 4B FD 50 51 */ bl read__14JSUInputStreamFPvl -/* 8030724C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80307250 90 1B 00 08 */ stw r0, 8(r27) -/* 80307254 7F 83 E3 78 */ mr r3, r28 -/* 80307258 81 9C 00 00 */ lwz r12, 0(r28) -/* 8030725C 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80307260 7D 89 03 A6 */ mtctr r12 -/* 80307264 4E 80 04 21 */ bctrl -/* 80307268 7C 7A 1B 78 */ mr r26, r3 -/* 8030726C 7F 83 E3 78 */ mr r3, r28 -/* 80307270 38 81 00 10 */ addi r4, r1, 0x10 -/* 80307274 38 A0 00 08 */ li r5, 8 -/* 80307278 4B FD 51 E1 */ bl peek__20JSURandomInputStreamFPvl -/* 8030727C 7F 63 DB 78 */ mr r3, r27 -/* 80307280 7F 24 CB 78 */ mr r4, r25 -/* 80307284 7F 85 E3 78 */ mr r5, r28 -/* 80307288 4B FF 08 91 */ bl makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream -/* 8030728C 7F 83 E3 78 */ mr r3, r28 -/* 80307290 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80307294 7C 9A 02 14 */ add r4, r26, r0 -/* 80307298 38 A0 00 00 */ li r5, 0 -/* 8030729C 4B FD 52 41 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 803072A0 7F 83 E3 78 */ mr r3, r28 -/* 803072A4 38 81 00 20 */ addi r4, r1, 0x20 -/* 803072A8 38 A0 00 20 */ li r5, 0x20 -/* 803072AC 4B FD 4F ED */ bl read__14JSUInputStreamFPvl -/* 803072B0 A0 01 00 22 */ lhz r0, 0x22(r1) -/* 803072B4 B0 1B 01 3C */ sth r0, 0x13c(r27) -/* 803072B8 A0 01 00 24 */ lhz r0, 0x24(r1) -/* 803072BC B0 1B 01 3E */ sth r0, 0x13e(r27) -/* 803072C0 38 00 00 00 */ li r0, 0 -/* 803072C4 90 1B 01 38 */ stw r0, 0x138(r27) -/* 803072C8 A0 1B 01 3E */ lhz r0, 0x13e(r27) -/* 803072CC 28 00 FF FF */ cmplwi r0, 0xffff -/* 803072D0 41 82 00 60 */ beq lbl_80307330 -/* 803072D4 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 803072D8 7C 1E 02 14 */ add r0, r30, r0 -/* 803072DC 90 1B 01 38 */ stw r0, 0x138(r27) -/* 803072E0 A0 1B 01 3E */ lhz r0, 0x13e(r27) -/* 803072E4 1C 00 00 88 */ mulli r0, r0, 0x88 -/* 803072E8 7C 7E 02 14 */ add r3, r30, r0 -/* 803072EC 93 63 00 04 */ stw r27, 4(r3) -/* 803072F0 7F 63 DB 78 */ mr r3, r27 -/* 803072F4 81 9B 00 00 */ lwz r12, 0(r27) -/* 803072F8 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 803072FC 7D 89 03 A6 */ mtctr r12 -/* 80307300 4E 80 04 21 */ bctrl -/* 80307304 80 7B 01 38 */ lwz r3, 0x138(r27) -/* 80307308 28 03 00 00 */ cmplwi r3, 0 -/* 8030730C 41 82 00 24 */ beq lbl_80307330 -/* 80307310 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307314 28 03 00 00 */ cmplwi r3, 0 -/* 80307318 41 82 00 18 */ beq lbl_80307330 -/* 8030731C 81 83 00 00 */ lwz r12, 0(r3) -/* 80307320 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80307324 7D 89 03 A6 */ mtctr r12 -/* 80307328 4E 80 04 21 */ bctrl -/* 8030732C 90 7B 01 00 */ stw r3, 0x100(r27) -lbl_80307330: -/* 80307330 A8 01 00 26 */ lha r0, 0x26(r1) -/* 80307334 C8 22 C8 E0 */ lfd f1, lit_1536(r2) -/* 80307338 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030733C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80307340 3C 60 43 30 */ lis r3, 0x4330 -/* 80307344 90 61 00 40 */ stw r3, 0x40(r1) -/* 80307348 C8 01 00 40 */ lfd f0, 0x40(r1) -/* 8030734C EC 00 08 28 */ fsubs f0, f0, f1 -/* 80307350 D0 1B 01 14 */ stfs f0, 0x114(r27) -/* 80307354 A8 01 00 28 */ lha r0, 0x28(r1) -/* 80307358 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030735C 90 01 00 4C */ stw r0, 0x4c(r1) -/* 80307360 90 61 00 48 */ stw r3, 0x48(r1) -/* 80307364 C8 01 00 48 */ lfd f0, 0x48(r1) -/* 80307368 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8030736C D0 1B 01 18 */ stfs f0, 0x118(r27) -/* 80307370 A0 01 00 2A */ lhz r0, 0x2a(r1) -/* 80307374 C8 22 C8 E8 */ lfd f1, lit_1539(r2) -/* 80307378 90 01 00 54 */ stw r0, 0x54(r1) -/* 8030737C 90 61 00 50 */ stw r3, 0x50(r1) -/* 80307380 C8 01 00 50 */ lfd f0, 0x50(r1) -/* 80307384 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80307388 D0 1B 01 1C */ stfs f0, 0x11c(r27) -/* 8030738C A0 01 00 2C */ lhz r0, 0x2c(r1) -/* 80307390 90 01 00 5C */ stw r0, 0x5c(r1) -/* 80307394 90 61 00 58 */ stw r3, 0x58(r1) -/* 80307398 C8 01 00 58 */ lfd f0, 0x58(r1) -/* 8030739C EC 00 08 28 */ fsubs f0, f0, f1 -/* 803073A0 D0 1B 01 20 */ stfs f0, 0x120(r27) -/* 803073A4 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 803073A8 54 03 10 3A */ slwi r3, r0, 2 -/* 803073AC 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 803073B0 7C 60 03 78 */ or r0, r3, r0 -/* 803073B4 98 1B 01 30 */ stb r0, 0x130(r27) -/* 803073B8 80 01 00 30 */ lwz r0, 0x30(r1) -/* 803073BC 90 01 00 0C */ stw r0, 0xc(r1) -/* 803073C0 88 01 00 0C */ lbz r0, 0xc(r1) -/* 803073C4 98 1B 01 04 */ stb r0, 0x104(r27) -/* 803073C8 88 01 00 0D */ lbz r0, 0xd(r1) -/* 803073CC 98 1B 01 05 */ stb r0, 0x105(r27) -/* 803073D0 88 01 00 0E */ lbz r0, 0xe(r1) -/* 803073D4 98 1B 01 06 */ stb r0, 0x106(r27) -/* 803073D8 88 01 00 0F */ lbz r0, 0xf(r1) -/* 803073DC 98 1B 01 07 */ stb r0, 0x107(r27) -/* 803073E0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 803073E4 90 01 00 08 */ stw r0, 8(r1) -/* 803073E8 88 01 00 08 */ lbz r0, 8(r1) -/* 803073EC 98 1B 01 08 */ stb r0, 0x108(r27) -/* 803073F0 88 01 00 09 */ lbz r0, 9(r1) -/* 803073F4 98 1B 01 09 */ stb r0, 0x109(r27) -/* 803073F8 88 01 00 0A */ lbz r0, 0xa(r1) -/* 803073FC 98 1B 01 0A */ stb r0, 0x10a(r27) -/* 80307400 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80307404 98 1B 01 0B */ stb r0, 0x10b(r27) -/* 80307408 7F 63 DB 78 */ mr r3, r27 -/* 8030740C 88 81 00 38 */ lbz r4, 0x38(r1) -/* 80307410 30 04 FF FF */ addic r0, r4, -1 -/* 80307414 7C 00 21 10 */ subfe r0, r0, r4 -/* 80307418 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8030741C 81 9B 00 00 */ lwz r12, 0(r27) -/* 80307420 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 80307424 7D 89 03 A6 */ mtctr r12 -/* 80307428 4E 80 04 21 */ bctrl -/* 8030742C 3B 40 00 00 */ li r26, 0 -/* 80307430 57 A0 01 8D */ rlwinm. r0, r29, 0, 6, 6 -/* 80307434 40 82 00 24 */ bne lbl_80307458 -/* 80307438 A0 01 00 3C */ lhz r0, 0x3c(r1) -/* 8030743C 7C 1A 03 78 */ mr r26, r0 -/* 80307440 7C 00 07 34 */ extsh r0, r0 -/* 80307444 2C 00 FF FF */ cmpwi r0, -1 -/* 80307448 40 82 00 10 */ bne lbl_80307458 -/* 8030744C A0 61 00 3E */ lhz r3, 0x3e(r1) -/* 80307450 38 03 00 01 */ addi r0, r3, 1 -/* 80307454 54 1A 04 3E */ clrlwi r26, r0, 0x10 -lbl_80307458: -/* 80307458 38 00 00 00 */ li r0, 0 -/* 8030745C B0 1B 01 32 */ sth r0, 0x132(r27) -/* 80307460 90 1B 01 24 */ stw r0, 0x124(r27) -/* 80307464 57 43 04 3F */ clrlwi. r3, r26, 0x10 -/* 80307468 41 82 00 0C */ beq lbl_80307474 -/* 8030746C 4B FC 78 59 */ bl __nwa__FUl -/* 80307470 90 7B 01 24 */ stw r3, 0x124(r27) -lbl_80307474: -/* 80307474 80 1B 01 24 */ lwz r0, 0x124(r27) -/* 80307478 28 00 00 00 */ cmplwi r0, 0 -/* 8030747C 41 82 00 40 */ beq lbl_803074BC -/* 80307480 B3 5B 01 32 */ sth r26, 0x132(r27) -/* 80307484 57 43 04 3E */ clrlwi r3, r26, 0x10 -/* 80307488 38 03 FF FF */ addi r0, r3, -1 -/* 8030748C A3 41 00 3E */ lhz r26, 0x3e(r1) -/* 80307490 7C 00 D0 00 */ cmpw r0, r26 -/* 80307494 40 80 00 08 */ bge lbl_8030749C -/* 80307498 54 1A 04 3E */ clrlwi r26, r0, 0x10 -lbl_8030749C: -/* 8030749C 7F 83 E3 78 */ mr r3, r28 -/* 803074A0 80 9B 01 24 */ lwz r4, 0x124(r27) -/* 803074A4 57 45 04 3E */ clrlwi r5, r26, 0x10 -/* 803074A8 4B FD 4F B1 */ bl peek__20JSURandomInputStreamFPvl -/* 803074AC 38 80 00 00 */ li r4, 0 -/* 803074B0 80 7B 01 24 */ lwz r3, 0x124(r27) -/* 803074B4 57 40 04 3E */ clrlwi r0, r26, 0x10 -/* 803074B8 7C 83 01 AE */ stbx r4, r3, r0 -lbl_803074BC: -/* 803074BC 7F 83 E3 78 */ mr r3, r28 -/* 803074C0 A0 81 00 3E */ lhz r4, 0x3e(r1) -/* 803074C4 81 9C 00 00 */ lwz r12, 0(r28) -/* 803074C8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 803074CC 7D 89 03 A6 */ mtctr r12 -/* 803074D0 4E 80 04 21 */ bctrl -/* 803074D4 7F 83 E3 78 */ mr r3, r28 -/* 803074D8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803074DC 7C 9F 02 14 */ add r4, r31, r0 -/* 803074E0 38 A0 00 00 */ li r5, 0 -/* 803074E4 4B FD 4F F9 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom -/* 803074E8 C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 803074EC D0 1B 01 0C */ stfs f0, 0x10c(r27) -/* 803074F0 D0 1B 01 10 */ stfs f0, 0x110(r27) -/* 803074F4 38 00 00 00 */ li r0, 0 -/* 803074F8 98 1B 01 31 */ stb r0, 0x131(r27) -/* 803074FC 98 1B 01 40 */ stb r0, 0x140(r27) -/* 80307500 7F 63 DB 78 */ mr r3, r27 -/* 80307504 39 61 00 80 */ addi r11, r1, 0x80 -/* 80307508 48 05 AD 11 */ bl _restgpr_25 -/* 8030750C 80 01 00 84 */ lwz r0, 0x84(r1) -/* 80307510 7C 08 03 A6 */ mtlr r0 -/* 80307514 38 21 00 80 */ addi r1, r1, 0x80 -/* 80307518 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/__dt__12J2DTextBoxExFv.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/__dt__12J2DTextBoxExFv.s deleted file mode 100644 index 6f1297cb4e5..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/__dt__12J2DTextBoxExFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_8030751C: -/* 8030751C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80307520 7C 08 02 A6 */ mflr r0 -/* 80307524 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307528 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8030752C 93 C1 00 08 */ stw r30, 8(r1) -/* 80307530 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80307534 7C 9F 23 78 */ mr r31, r4 -/* 80307538 41 82 00 58 */ beq lbl_80307590 -/* 8030753C 3C 60 80 3D */ lis r3, __vt__12J2DTextBoxEx@ha /* 0x803CD608@ha */ -/* 80307540 38 03 D6 08 */ addi r0, r3, __vt__12J2DTextBoxEx@l /* 0x803CD608@l */ -/* 80307544 90 1E 00 00 */ stw r0, 0(r30) -/* 80307548 88 1E 01 40 */ lbz r0, 0x140(r30) -/* 8030754C 28 00 00 00 */ cmplwi r0, 0 -/* 80307550 41 82 00 24 */ beq lbl_80307574 -/* 80307554 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307558 28 03 00 00 */ cmplwi r3, 0 -/* 8030755C 41 82 00 18 */ beq lbl_80307574 -/* 80307560 38 80 00 01 */ li r4, 1 -/* 80307564 81 83 00 00 */ lwz r12, 0(r3) -/* 80307568 81 8C 00 08 */ lwz r12, 8(r12) -/* 8030756C 7D 89 03 A6 */ mtctr r12 -/* 80307570 4E 80 04 21 */ bctrl -lbl_80307574: -/* 80307574 7F C3 F3 78 */ mr r3, r30 -/* 80307578 38 80 00 00 */ li r4, 0 -/* 8030757C 4B FF 8C 65 */ bl __dt__10J2DTextBoxFv -/* 80307580 7F E0 07 35 */ extsh. r0, r31 -/* 80307584 40 81 00 0C */ ble lbl_80307590 -/* 80307588 7F C3 F3 78 */ mr r3, r30 -/* 8030758C 4B FC 77 B1 */ bl __dl__FPv -lbl_80307590: -/* 80307590 7F C3 F3 78 */ mr r3, r30 -/* 80307594 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80307598 83 C1 00 08 */ lwz r30, 8(r1) -/* 8030759C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803075A0 7C 08 03 A6 */ mtlr r0 -/* 803075A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 803075A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/drawSelf__12J2DTextBoxExFffPA3_A4_f.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/drawSelf__12J2DTextBoxExFffPA3_A4_f.s deleted file mode 100644 index 75c3737b29f..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/drawSelf__12J2DTextBoxExFffPA3_A4_f.s +++ /dev/null @@ -1,201 +0,0 @@ -lbl_803075AC: -/* 803075AC 94 21 FE E0 */ stwu r1, -0x120(r1) -/* 803075B0 7C 08 02 A6 */ mflr r0 -/* 803075B4 90 01 01 24 */ stw r0, 0x124(r1) -/* 803075B8 DB E1 01 10 */ stfd f31, 0x110(r1) -/* 803075BC F3 E1 01 18 */ psq_st f31, 280(r1), 0, 0 /* qr0 */ -/* 803075C0 DB C1 01 00 */ stfd f30, 0x100(r1) -/* 803075C4 F3 C1 01 08 */ psq_st f30, 264(r1), 0, 0 /* qr0 */ -/* 803075C8 93 E1 00 FC */ stw r31, 0xfc(r1) -/* 803075CC 93 C1 00 F8 */ stw r30, 0xf8(r1) -/* 803075D0 7C 7E 1B 78 */ mr r30, r3 -/* 803075D4 FF C0 08 90 */ fmr f30, f1 -/* 803075D8 FF E0 10 90 */ fmr f31, f2 -/* 803075DC 7C 9F 23 78 */ mr r31, r4 -/* 803075E0 38 80 00 00 */ li r4, 0 -/* 803075E4 80 63 01 38 */ lwz r3, 0x138(r3) -/* 803075E8 28 03 00 00 */ cmplwi r3, 0 -/* 803075EC 41 82 00 24 */ beq lbl_80307610 -/* 803075F0 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803075F4 28 03 00 00 */ cmplwi r3, 0 -/* 803075F8 41 82 00 18 */ beq lbl_80307610 -/* 803075FC 81 83 00 00 */ lwz r12, 0(r3) -/* 80307600 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80307604 7D 89 03 A6 */ mtctr r12 -/* 80307608 4E 80 04 21 */ bctrl -/* 8030760C 7C 64 1B 78 */ mr r4, r3 -lbl_80307610: -/* 80307610 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80307614 90 01 00 10 */ stw r0, 0x10(r1) -/* 80307618 80 1E 01 2C */ lwz r0, 0x12c(r30) -/* 8030761C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307620 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 80307624 90 01 00 18 */ stw r0, 0x18(r1) -/* 80307628 80 1E 01 04 */ lwz r0, 0x104(r30) -/* 8030762C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80307630 38 61 00 50 */ addi r3, r1, 0x50 -/* 80307634 C0 1E 01 14 */ lfs f0, 0x114(r30) -/* 80307638 FC 00 00 1E */ fctiwz f0, f0 -/* 8030763C D8 01 00 B0 */ stfd f0, 0xb0(r1) -/* 80307640 80 01 00 B4 */ lwz r0, 0xb4(r1) -/* 80307644 C8 42 C8 E0 */ lfd f2, lit_1536(r2) -/* 80307648 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8030764C 90 01 00 BC */ stw r0, 0xbc(r1) -/* 80307650 3C A0 43 30 */ lis r5, 0x4330 -/* 80307654 90 A1 00 B8 */ stw r5, 0xb8(r1) -/* 80307658 C8 01 00 B8 */ lfd f0, 0xb8(r1) -/* 8030765C EC 20 10 28 */ fsubs f1, f0, f2 -/* 80307660 C0 1E 01 18 */ lfs f0, 0x118(r30) -/* 80307664 FC 00 00 1E */ fctiwz f0, f0 -/* 80307668 D8 01 00 C0 */ stfd f0, 0xc0(r1) -/* 8030766C 80 01 00 C4 */ lwz r0, 0xc4(r1) -/* 80307670 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80307674 90 01 00 CC */ stw r0, 0xcc(r1) -/* 80307678 90 A1 00 C8 */ stw r5, 0xc8(r1) -/* 8030767C C8 01 00 C8 */ lfd f0, 0xc8(r1) -/* 80307680 EC 40 10 28 */ fsubs f2, f0, f2 -/* 80307684 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80307688 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8030768C 38 E1 00 14 */ addi r7, r1, 0x14 -/* 80307690 39 01 00 10 */ addi r8, r1, 0x10 -/* 80307694 4B FE CD 01 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 80307698 C0 1E 01 20 */ lfs f0, 0x120(r30) -/* 8030769C FC 00 00 1E */ fctiwz f0, f0 -/* 803076A0 D8 01 00 D0 */ stfd f0, 0xd0(r1) -/* 803076A4 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 803076A8 C8 22 C8 E0 */ lfd f1, lit_1536(r2) -/* 803076AC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 803076B0 90 01 00 DC */ stw r0, 0xdc(r1) -/* 803076B4 3C 60 43 30 */ lis r3, 0x4330 -/* 803076B8 90 61 00 D8 */ stw r3, 0xd8(r1) -/* 803076BC C8 01 00 D8 */ lfd f0, 0xd8(r1) -/* 803076C0 EC 40 08 28 */ fsubs f2, f0, f1 -/* 803076C4 C0 1E 01 1C */ lfs f0, 0x11c(r30) -/* 803076C8 FC 00 00 1E */ fctiwz f0, f0 -/* 803076CC D8 01 00 E0 */ stfd f0, 0xe0(r1) -/* 803076D0 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 803076D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 803076D8 90 01 00 EC */ stw r0, 0xec(r1) -/* 803076DC 90 61 00 E8 */ stw r3, 0xe8(r1) -/* 803076E0 C8 01 00 E8 */ lfd f0, 0xe8(r1) -/* 803076E4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 803076E8 C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 803076EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 803076F0 40 81 00 08 */ ble lbl_803076F8 -/* 803076F4 48 00 00 08 */ b lbl_803076FC -lbl_803076F8: -/* 803076F8 FC 20 00 90 */ fmr f1, f0 -lbl_803076FC: -/* 803076FC D0 21 00 A0 */ stfs f1, 0xa0(r1) -/* 80307700 C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 80307704 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80307708 40 81 00 08 */ ble lbl_80307710 -/* 8030770C 48 00 00 08 */ b lbl_80307714 -lbl_80307710: -/* 80307710 FC 40 00 90 */ fmr f2, f0 -lbl_80307714: -/* 80307714 D0 41 00 A4 */ stfs f2, 0xa4(r1) -/* 80307718 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 8030771C 28 03 00 00 */ cmplwi r3, 0 -/* 80307720 41 82 01 58 */ beq lbl_80307878 -/* 80307724 4B FE 2C 69 */ bl setGX__11J2DMaterialFv -/* 80307728 7F E3 FB 78 */ mr r3, r31 -/* 8030772C 38 9E 00 80 */ addi r4, r30, 0x80 -/* 80307730 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80307734 48 03 ED B1 */ bl PSMTXConcat -/* 80307738 38 61 00 20 */ addi r3, r1, 0x20 -/* 8030773C 38 80 00 00 */ li r4, 0 -/* 80307740 48 05 8B 0D */ bl GXLoadPosMtxImm -/* 80307744 48 05 3E 49 */ bl GXClearVtxDesc -/* 80307748 38 60 00 09 */ li r3, 9 -/* 8030774C 38 80 00 01 */ li r4, 1 -/* 80307750 48 05 37 69 */ bl GXSetVtxDesc -/* 80307754 38 60 00 0B */ li r3, 0xb -/* 80307758 38 80 00 01 */ li r4, 1 -/* 8030775C 48 05 37 5D */ bl GXSetVtxDesc -/* 80307760 38 60 00 0D */ li r3, 0xd -/* 80307764 38 80 00 01 */ li r4, 1 -/* 80307768 48 05 37 51 */ bl GXSetVtxDesc -/* 8030776C 38 61 00 50 */ addi r3, r1, 0x50 -/* 80307770 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80307774 EC 3E 00 2A */ fadds f1, f30, f0 -/* 80307778 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 8030777C EC 5F 00 2A */ fadds f2, f31, f0 -/* 80307780 4B FE CF DD */ bl locate__8J2DPrintFff -/* 80307784 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307788 88 03 00 0E */ lbz r0, 0xe(r3) -/* 8030778C 28 00 00 00 */ cmplwi r0, 0 -/* 80307790 41 82 00 E8 */ beq lbl_80307878 -/* 80307794 80 1E 01 24 */ lwz r0, 0x124(r30) -/* 80307798 28 00 00 00 */ cmplwi r0, 0 -/* 8030779C 41 82 00 DC */ beq lbl_80307878 -/* 803077A0 3B E0 00 FF */ li r31, 0xff -/* 803077A4 A0 03 00 1C */ lhz r0, 0x1c(r3) -/* 803077A8 54 00 07 FE */ clrlwi r0, r0, 0x1f -/* 803077AC 28 00 00 01 */ cmplwi r0, 1 -/* 803077B0 40 82 00 18 */ bne lbl_803077C8 -/* 803077B4 88 03 00 0F */ lbz r0, 0xf(r3) -/* 803077B8 2C 00 00 01 */ cmpwi r0, 1 -/* 803077BC 40 82 00 30 */ bne lbl_803077EC -/* 803077C0 8B FE 00 B3 */ lbz r31, 0xb3(r30) -/* 803077C4 48 00 00 28 */ b lbl_803077EC -lbl_803077C8: -/* 803077C8 88 1E 00 B4 */ lbz r0, 0xb4(r30) -/* 803077CC 28 00 00 00 */ cmplwi r0, 0 -/* 803077D0 41 82 00 1C */ beq lbl_803077EC -/* 803077D4 88 1E 00 B3 */ lbz r0, 0xb3(r30) -/* 803077D8 90 01 00 08 */ stw r0, 8(r1) -/* 803077DC 90 01 00 0C */ stw r0, 0xc(r1) -/* 803077E0 38 60 00 02 */ li r3, 2 -/* 803077E4 38 81 00 0C */ addi r4, r1, 0xc -/* 803077E8 48 05 62 61 */ bl GXSetChanMatColor -lbl_803077EC: -/* 803077EC 88 DE 01 30 */ lbz r6, 0x130(r30) -/* 803077F0 38 61 00 50 */ addi r3, r1, 0x50 -/* 803077F4 80 9E 01 24 */ lwz r4, 0x124(r30) -/* 803077F8 C0 42 C8 F0 */ lfs f2, lit_1731(r2) -/* 803077FC C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 80307800 C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80307804 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80307808 EC 02 00 2A */ fadds f0, f2, f0 -/* 8030780C FC 00 00 1E */ fctiwz f0, f0 -/* 80307810 D8 01 00 E8 */ stfd f0, 0xe8(r1) -/* 80307814 80 01 00 EC */ lwz r0, 0xec(r1) -/* 80307818 C8 62 C8 E0 */ lfd f3, lit_1536(r2) -/* 8030781C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80307820 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80307824 3C A0 43 30 */ lis r5, 0x4330 -/* 80307828 90 A1 00 E0 */ stw r5, 0xe0(r1) -/* 8030782C C8 01 00 E0 */ lfd f0, 0xe0(r1) -/* 80307830 EC 20 18 28 */ fsubs f1, f0, f3 -/* 80307834 C0 5E 00 2C */ lfs f2, 0x2c(r30) -/* 80307838 C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 8030783C EC 02 00 28 */ fsubs f0, f2, f0 -/* 80307840 FC 00 00 1E */ fctiwz f0, f0 -/* 80307844 D8 01 00 D8 */ stfd f0, 0xd8(r1) -/* 80307848 80 01 00 DC */ lwz r0, 0xdc(r1) -/* 8030784C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80307850 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 80307854 90 A1 00 D0 */ stw r5, 0xd0(r1) -/* 80307858 C8 01 00 D0 */ lfd f0, 0xd0(r1) -/* 8030785C EC 40 18 28 */ fsubs f2, f0, f3 -/* 80307860 54 C5 F7 BE */ rlwinm r5, r6, 0x1e, 0x1e, 0x1f -/* 80307864 54 C6 07 BE */ clrlwi r6, r6, 0x1e -/* 80307868 C0 7E 01 0C */ lfs f3, 0x10c(r30) -/* 8030786C C0 9E 01 10 */ lfs f4, 0x110(r30) -/* 80307870 7F E7 FB 78 */ mr r7, r31 -/* 80307874 4B FE CF B5 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc -lbl_80307878: -/* 80307878 38 61 00 50 */ addi r3, r1, 0x50 -/* 8030787C 38 80 FF FF */ li r4, -1 -/* 80307880 4B FE CB A1 */ bl __dt__8J2DPrintFv -/* 80307884 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* qr0 */ -/* 80307888 CB E1 01 10 */ lfd f31, 0x110(r1) -/* 8030788C E3 C1 01 08 */ psq_l f30, 264(r1), 0, 0 /* qr0 */ -/* 80307890 CB C1 01 00 */ lfd f30, 0x100(r1) -/* 80307894 83 E1 00 FC */ lwz r31, 0xfc(r1) -/* 80307898 83 C1 00 F8 */ lwz r30, 0xf8(r1) -/* 8030789C 80 01 01 24 */ lwz r0, 0x124(r1) -/* 803078A0 7C 08 03 A6 */ mtlr r0 -/* 803078A4 38 21 01 20 */ addi r1, r1, 0x120 -/* 803078A8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFff.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFff.s deleted file mode 100644 index fef990b08fc..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFff.s +++ /dev/null @@ -1,158 +0,0 @@ -lbl_803078AC: -/* 803078AC 94 21 FF 30 */ stwu r1, -0xd0(r1) -/* 803078B0 7C 08 02 A6 */ mflr r0 -/* 803078B4 90 01 00 D4 */ stw r0, 0xd4(r1) -/* 803078B8 DB E1 00 C0 */ stfd f31, 0xc0(r1) -/* 803078BC F3 E1 00 C8 */ psq_st f31, 200(r1), 0, 0 /* qr0 */ -/* 803078C0 DB C1 00 B0 */ stfd f30, 0xb0(r1) -/* 803078C4 F3 C1 00 B8 */ psq_st f30, 184(r1), 0, 0 /* qr0 */ -/* 803078C8 93 E1 00 AC */ stw r31, 0xac(r1) -/* 803078CC 7C 7F 1B 78 */ mr r31, r3 -/* 803078D0 FF C0 08 90 */ fmr f30, f1 -/* 803078D4 FF E0 10 90 */ fmr f31, f2 -/* 803078D8 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 803078DC 28 00 00 00 */ cmplwi r0, 0 -/* 803078E0 41 82 01 EC */ beq lbl_80307ACC -/* 803078E4 38 80 00 00 */ li r4, 0 -/* 803078E8 80 7F 01 38 */ lwz r3, 0x138(r31) -/* 803078EC 28 03 00 00 */ cmplwi r3, 0 -/* 803078F0 41 82 00 24 */ beq lbl_80307914 -/* 803078F4 80 63 00 70 */ lwz r3, 0x70(r3) -/* 803078F8 28 03 00 00 */ cmplwi r3, 0 -/* 803078FC 41 82 00 18 */ beq lbl_80307914 -/* 80307900 81 83 00 00 */ lwz r12, 0(r3) -/* 80307904 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80307908 7D 89 03 A6 */ mtctr r12 -/* 8030790C 4E 80 04 21 */ bctrl -/* 80307910 7C 64 1B 78 */ mr r4, r3 -lbl_80307914: -/* 80307914 80 1F 01 28 */ lwz r0, 0x128(r31) -/* 80307918 90 01 00 08 */ stw r0, 8(r1) -/* 8030791C 80 1F 01 2C */ lwz r0, 0x12c(r31) -/* 80307920 90 01 00 0C */ stw r0, 0xc(r1) -/* 80307924 80 1F 01 08 */ lwz r0, 0x108(r31) -/* 80307928 90 01 00 10 */ stw r0, 0x10(r1) -/* 8030792C 80 1F 01 04 */ lwz r0, 0x104(r31) -/* 80307930 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307934 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307938 C0 3F 01 14 */ lfs f1, 0x114(r31) -/* 8030793C C0 5F 01 18 */ lfs f2, 0x118(r31) -/* 80307940 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80307944 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80307948 38 E1 00 0C */ addi r7, r1, 0xc -/* 8030794C 39 01 00 08 */ addi r8, r1, 8 -/* 80307950 4B FE CA 45 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 80307954 C0 5F 01 20 */ lfs f2, 0x120(r31) -/* 80307958 C0 3F 01 1C */ lfs f1, 0x11c(r31) -/* 8030795C C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 80307960 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80307964 40 81 00 08 */ ble lbl_8030796C -/* 80307968 48 00 00 08 */ b lbl_80307970 -lbl_8030796C: -/* 8030796C FC 20 00 90 */ fmr f1, f0 -lbl_80307970: -/* 80307970 D0 21 00 98 */ stfs f1, 0x98(r1) -/* 80307974 C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 80307978 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8030797C 40 81 00 08 */ ble lbl_80307984 -/* 80307980 48 00 00 08 */ b lbl_80307988 -lbl_80307984: -/* 80307984 FC 40 00 90 */ fmr f2, f0 -lbl_80307988: -/* 80307988 D0 41 00 9C */ stfs f2, 0x9c(r1) -/* 8030798C 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 80307990 98 1F 00 B3 */ stb r0, 0xb3(r31) -/* 80307994 80 7F 01 38 */ lwz r3, 0x138(r31) -/* 80307998 28 03 00 00 */ cmplwi r3, 0 -/* 8030799C 41 82 01 24 */ beq lbl_80307AC0 -/* 803079A0 4B FE 29 ED */ bl setGX__11J2DMaterialFv -/* 803079A4 7F E3 FB 78 */ mr r3, r31 -/* 803079A8 FC 20 F0 90 */ fmr f1, f30 -/* 803079AC FC 40 F8 90 */ fmr f2, f31 -/* 803079B0 C0 62 C8 D8 */ lfs f3, lit_1534(r2) -/* 803079B4 FC 80 18 90 */ fmr f4, f3 -/* 803079B8 81 9F 00 00 */ lwz r12, 0(r31) -/* 803079BC 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 803079C0 7D 89 03 A6 */ mtctr r12 -/* 803079C4 4E 80 04 21 */ bctrl -/* 803079C8 38 7F 00 50 */ addi r3, r31, 0x50 -/* 803079CC 38 80 00 00 */ li r4, 0 -/* 803079D0 48 05 88 7D */ bl GXLoadPosMtxImm -/* 803079D4 38 60 00 00 */ li r3, 0 -/* 803079D8 48 05 89 15 */ bl GXSetCurrentMtx -/* 803079DC 80 7F 01 38 */ lwz r3, 0x138(r31) -/* 803079E0 88 03 00 0E */ lbz r0, 0xe(r3) -/* 803079E4 28 00 00 00 */ cmplwi r0, 0 -/* 803079E8 40 82 00 14 */ bne lbl_803079FC -/* 803079EC 38 61 00 48 */ addi r3, r1, 0x48 -/* 803079F0 38 80 FF FF */ li r4, -1 -/* 803079F4 4B FE CA 2D */ bl __dt__8J2DPrintFv -/* 803079F8 48 00 00 D4 */ b lbl_80307ACC -lbl_803079FC: -/* 803079FC 48 05 3B 91 */ bl GXClearVtxDesc -/* 80307A00 38 60 00 09 */ li r3, 9 -/* 80307A04 38 80 00 01 */ li r4, 1 -/* 80307A08 48 05 34 B1 */ bl GXSetVtxDesc -/* 80307A0C 38 60 00 0B */ li r3, 0xb -/* 80307A10 38 80 00 01 */ li r4, 1 -/* 80307A14 48 05 34 A5 */ bl GXSetVtxDesc -/* 80307A18 38 60 00 0D */ li r3, 0xd -/* 80307A1C 38 80 00 01 */ li r4, 1 -/* 80307A20 48 05 34 99 */ bl GXSetVtxDesc -/* 80307A24 80 DF 01 24 */ lwz r6, 0x124(r31) -/* 80307A28 28 06 00 00 */ cmplwi r6, 0 -/* 80307A2C 41 82 00 38 */ beq lbl_80307A64 -/* 80307A30 38 80 00 FF */ li r4, 0xff -/* 80307A34 80 7F 01 38 */ lwz r3, 0x138(r31) -/* 80307A38 88 03 00 0F */ lbz r0, 0xf(r3) -/* 80307A3C 2C 00 00 01 */ cmpwi r0, 1 -/* 80307A40 40 82 00 08 */ bne lbl_80307A48 -/* 80307A44 88 9F 00 B3 */ lbz r4, 0xb3(r31) -lbl_80307A48: -/* 80307A48 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307A4C C0 22 C8 D8 */ lfs f1, lit_1534(r2) -/* 80307A50 FC 40 08 90 */ fmr f2, f1 -/* 80307A54 3C A0 80 3A */ lis r5, J2DTextBoxEx__stringBase0@ha /* 0x803A1DF0@ha */ -/* 80307A58 38 A5 1D F0 */ addi r5, r5, J2DTextBoxEx__stringBase0@l /* 0x803A1DF0@l */ -/* 80307A5C 4C C6 32 42 */ crset 6 -/* 80307A60 4B FE CD 19 */ bl print__8J2DPrintFffUcPCce -lbl_80307A64: -/* 80307A64 3B E0 00 00 */ li r31, 0 -lbl_80307A68: -/* 80307A68 7F E3 FB 78 */ mr r3, r31 -/* 80307A6C 38 80 00 00 */ li r4, 0 -/* 80307A70 38 A0 00 01 */ li r5, 1 -/* 80307A74 38 C0 00 02 */ li r6, 2 -/* 80307A78 38 E0 00 03 */ li r7, 3 -/* 80307A7C 48 05 7B 29 */ bl GXSetTevSwapModeTable -/* 80307A80 3B FF 00 01 */ addi r31, r31, 1 -/* 80307A84 2C 1F 00 04 */ cmpwi r31, 4 -/* 80307A88 41 80 FF E0 */ blt lbl_80307A68 -/* 80307A8C 38 60 00 00 */ li r3, 0 -/* 80307A90 48 05 76 45 */ bl GXSetNumIndStages -/* 80307A94 3B E0 00 00 */ li r31, 0 -lbl_80307A98: -/* 80307A98 7F E3 FB 78 */ mr r3, r31 -/* 80307A9C 48 05 76 5D */ bl GXSetTevDirect -/* 80307AA0 3B FF 00 01 */ addi r31, r31, 1 -/* 80307AA4 2C 1F 00 10 */ cmpwi r31, 0x10 -/* 80307AA8 41 80 FF F0 */ blt lbl_80307A98 -/* 80307AAC 38 61 00 18 */ addi r3, r1, 0x18 -/* 80307AB0 48 03 E9 D5 */ bl PSMTXIdentity -/* 80307AB4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80307AB8 38 80 00 00 */ li r4, 0 -/* 80307ABC 48 05 87 91 */ bl GXLoadPosMtxImm -lbl_80307AC0: -/* 80307AC0 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307AC4 38 80 FF FF */ li r4, -1 -/* 80307AC8 4B FE C9 59 */ bl __dt__8J2DPrintFv -lbl_80307ACC: -/* 80307ACC E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* qr0 */ -/* 80307AD0 CB E1 00 C0 */ lfd f31, 0xc0(r1) -/* 80307AD4 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, 0 /* qr0 */ -/* 80307AD8 CB C1 00 B0 */ lfd f30, 0xb0(r1) -/* 80307ADC 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 80307AE0 80 01 00 D4 */ lwz r0, 0xd4(r1) -/* 80307AE4 7C 08 03 A6 */ mtlr r0 -/* 80307AE8 38 21 00 D0 */ addi r1, r1, 0xd0 -/* 80307AEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFfff18J2DTextBoxHBinding.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFfff18J2DTextBoxHBinding.s deleted file mode 100644 index 515045bd975..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFfff18J2DTextBoxHBinding.s +++ /dev/null @@ -1,168 +0,0 @@ -lbl_80307AF0: -/* 80307AF0 94 21 FF 20 */ stwu r1, -0xe0(r1) -/* 80307AF4 7C 08 02 A6 */ mflr r0 -/* 80307AF8 90 01 00 E4 */ stw r0, 0xe4(r1) -/* 80307AFC DB E1 00 D0 */ stfd f31, 0xd0(r1) -/* 80307B00 F3 E1 00 D8 */ psq_st f31, 216(r1), 0, 0 /* qr0 */ -/* 80307B04 DB C1 00 C0 */ stfd f30, 0xc0(r1) -/* 80307B08 F3 C1 00 C8 */ psq_st f30, 200(r1), 0, 0 /* qr0 */ -/* 80307B0C DB A1 00 B0 */ stfd f29, 0xb0(r1) -/* 80307B10 F3 A1 00 B8 */ psq_st f29, 184(r1), 0, 0 /* qr0 */ -/* 80307B14 93 E1 00 AC */ stw r31, 0xac(r1) -/* 80307B18 93 C1 00 A8 */ stw r30, 0xa8(r1) -/* 80307B1C 7C 7E 1B 78 */ mr r30, r3 -/* 80307B20 FF A0 08 90 */ fmr f29, f1 -/* 80307B24 FF C0 10 90 */ fmr f30, f2 -/* 80307B28 FF E0 18 90 */ fmr f31, f3 -/* 80307B2C 7C 9F 23 78 */ mr r31, r4 -/* 80307B30 88 03 00 B0 */ lbz r0, 0xb0(r3) -/* 80307B34 28 00 00 00 */ cmplwi r0, 0 -/* 80307B38 41 82 01 F4 */ beq lbl_80307D2C -/* 80307B3C 38 80 00 00 */ li r4, 0 -/* 80307B40 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307B44 28 03 00 00 */ cmplwi r3, 0 -/* 80307B48 41 82 00 24 */ beq lbl_80307B6C -/* 80307B4C 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307B50 28 03 00 00 */ cmplwi r3, 0 -/* 80307B54 41 82 00 18 */ beq lbl_80307B6C -/* 80307B58 81 83 00 00 */ lwz r12, 0(r3) -/* 80307B5C 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80307B60 7D 89 03 A6 */ mtctr r12 -/* 80307B64 4E 80 04 21 */ bctrl -/* 80307B68 7C 64 1B 78 */ mr r4, r3 -lbl_80307B6C: -/* 80307B6C 80 1E 01 28 */ lwz r0, 0x128(r30) -/* 80307B70 90 01 00 08 */ stw r0, 8(r1) -/* 80307B74 80 1E 01 2C */ lwz r0, 0x12c(r30) -/* 80307B78 90 01 00 0C */ stw r0, 0xc(r1) -/* 80307B7C 80 1E 01 08 */ lwz r0, 0x108(r30) -/* 80307B80 90 01 00 10 */ stw r0, 0x10(r1) -/* 80307B84 80 1E 01 04 */ lwz r0, 0x104(r30) -/* 80307B88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307B8C 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307B90 C0 3E 01 14 */ lfs f1, 0x114(r30) -/* 80307B94 C0 5E 01 18 */ lfs f2, 0x118(r30) -/* 80307B98 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80307B9C 38 C1 00 10 */ addi r6, r1, 0x10 -/* 80307BA0 38 E1 00 0C */ addi r7, r1, 0xc -/* 80307BA4 39 01 00 08 */ addi r8, r1, 8 -/* 80307BA8 4B FE C7 ED */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -/* 80307BAC C0 5E 01 20 */ lfs f2, 0x120(r30) -/* 80307BB0 C0 3E 01 1C */ lfs f1, 0x11c(r30) -/* 80307BB4 C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 80307BB8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80307BBC 40 81 00 08 */ ble lbl_80307BC4 -/* 80307BC0 48 00 00 08 */ b lbl_80307BC8 -lbl_80307BC4: -/* 80307BC4 FC 20 00 90 */ fmr f1, f0 -lbl_80307BC8: -/* 80307BC8 D0 21 00 98 */ stfs f1, 0x98(r1) -/* 80307BCC C0 02 C8 D8 */ lfs f0, lit_1534(r2) -/* 80307BD0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80307BD4 40 81 00 08 */ ble lbl_80307BDC -/* 80307BD8 48 00 00 08 */ b lbl_80307BE0 -lbl_80307BDC: -/* 80307BDC FC 40 00 90 */ fmr f2, f0 -lbl_80307BE0: -/* 80307BE0 D0 41 00 9C */ stfs f2, 0x9c(r1) -/* 80307BE4 88 1E 00 B2 */ lbz r0, 0xb2(r30) -/* 80307BE8 98 1E 00 B3 */ stb r0, 0xb3(r30) -/* 80307BEC 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307BF0 28 03 00 00 */ cmplwi r3, 0 -/* 80307BF4 41 82 01 2C */ beq lbl_80307D20 -/* 80307BF8 4B FE 27 95 */ bl setGX__11J2DMaterialFv -/* 80307BFC 7F C3 F3 78 */ mr r3, r30 -/* 80307C00 FC 20 E8 90 */ fmr f1, f29 -/* 80307C04 FC 40 F0 90 */ fmr f2, f30 -/* 80307C08 C0 62 C8 D8 */ lfs f3, lit_1534(r2) -/* 80307C0C FC 80 18 90 */ fmr f4, f3 -/* 80307C10 81 9E 00 00 */ lwz r12, 0(r30) -/* 80307C14 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 80307C18 7D 89 03 A6 */ mtctr r12 -/* 80307C1C 4E 80 04 21 */ bctrl -/* 80307C20 38 7E 00 50 */ addi r3, r30, 0x50 -/* 80307C24 38 80 00 00 */ li r4, 0 -/* 80307C28 48 05 86 25 */ bl GXLoadPosMtxImm -/* 80307C2C 38 60 00 00 */ li r3, 0 -/* 80307C30 48 05 86 BD */ bl GXSetCurrentMtx -/* 80307C34 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307C38 88 03 00 0E */ lbz r0, 0xe(r3) -/* 80307C3C 28 00 00 00 */ cmplwi r0, 0 -/* 80307C40 40 82 00 14 */ bne lbl_80307C54 -/* 80307C44 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307C48 38 80 FF FF */ li r4, -1 -/* 80307C4C 4B FE C7 D5 */ bl __dt__8J2DPrintFv -/* 80307C50 48 00 00 DC */ b lbl_80307D2C -lbl_80307C54: -/* 80307C54 48 05 39 39 */ bl GXClearVtxDesc -/* 80307C58 38 60 00 09 */ li r3, 9 -/* 80307C5C 38 80 00 01 */ li r4, 1 -/* 80307C60 48 05 32 59 */ bl GXSetVtxDesc -/* 80307C64 38 60 00 0B */ li r3, 0xb -/* 80307C68 38 80 00 01 */ li r4, 1 -/* 80307C6C 48 05 32 4D */ bl GXSetVtxDesc -/* 80307C70 38 60 00 0D */ li r3, 0xd -/* 80307C74 38 80 00 01 */ li r4, 1 -/* 80307C78 48 05 32 41 */ bl GXSetVtxDesc -/* 80307C7C 80 9E 01 24 */ lwz r4, 0x124(r30) -/* 80307C80 28 04 00 00 */ cmplwi r4, 0 -/* 80307C84 41 82 00 40 */ beq lbl_80307CC4 -/* 80307C88 38 E0 00 FF */ li r7, 0xff -/* 80307C8C 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307C90 88 03 00 0F */ lbz r0, 0xf(r3) -/* 80307C94 2C 00 00 01 */ cmpwi r0, 1 -/* 80307C98 40 82 00 08 */ bne lbl_80307CA0 -/* 80307C9C 88 FE 00 B3 */ lbz r7, 0xb3(r30) -lbl_80307CA0: -/* 80307CA0 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307CA4 FC 20 F8 90 */ fmr f1, f31 -/* 80307CA8 C0 42 C8 D8 */ lfs f2, lit_1534(r2) -/* 80307CAC 7F E5 FB 78 */ mr r5, r31 -/* 80307CB0 38 C0 00 02 */ li r6, 2 -/* 80307CB4 FC 60 10 90 */ fmr f3, f2 -/* 80307CB8 C0 1E 01 20 */ lfs f0, 0x120(r30) -/* 80307CBC FC 80 00 50 */ fneg f4, f0 -/* 80307CC0 4B FE CB 69 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc -lbl_80307CC4: -/* 80307CC4 3B C0 00 00 */ li r30, 0 -lbl_80307CC8: -/* 80307CC8 7F C3 F3 78 */ mr r3, r30 -/* 80307CCC 38 80 00 00 */ li r4, 0 -/* 80307CD0 38 A0 00 01 */ li r5, 1 -/* 80307CD4 38 C0 00 02 */ li r6, 2 -/* 80307CD8 38 E0 00 03 */ li r7, 3 -/* 80307CDC 48 05 78 C9 */ bl GXSetTevSwapModeTable -/* 80307CE0 3B DE 00 01 */ addi r30, r30, 1 -/* 80307CE4 2C 1E 00 04 */ cmpwi r30, 4 -/* 80307CE8 41 80 FF E0 */ blt lbl_80307CC8 -/* 80307CEC 38 60 00 00 */ li r3, 0 -/* 80307CF0 48 05 73 E5 */ bl GXSetNumIndStages -/* 80307CF4 3B C0 00 00 */ li r30, 0 -lbl_80307CF8: -/* 80307CF8 7F C3 F3 78 */ mr r3, r30 -/* 80307CFC 48 05 73 FD */ bl GXSetTevDirect -/* 80307D00 3B DE 00 01 */ addi r30, r30, 1 -/* 80307D04 2C 1E 00 10 */ cmpwi r30, 0x10 -/* 80307D08 41 80 FF F0 */ blt lbl_80307CF8 -/* 80307D0C 38 61 00 18 */ addi r3, r1, 0x18 -/* 80307D10 48 03 E7 75 */ bl PSMTXIdentity -/* 80307D14 38 61 00 18 */ addi r3, r1, 0x18 -/* 80307D18 38 80 00 00 */ li r4, 0 -/* 80307D1C 48 05 85 31 */ bl GXLoadPosMtxImm -lbl_80307D20: -/* 80307D20 38 61 00 48 */ addi r3, r1, 0x48 -/* 80307D24 38 80 FF FF */ li r4, -1 -/* 80307D28 4B FE C6 F9 */ bl __dt__8J2DPrintFv -lbl_80307D2C: -/* 80307D2C E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* qr0 */ -/* 80307D30 CB E1 00 D0 */ lfd f31, 0xd0(r1) -/* 80307D34 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, 0 /* qr0 */ -/* 80307D38 CB C1 00 C0 */ lfd f30, 0xc0(r1) -/* 80307D3C E3 A1 00 B8 */ psq_l f29, 184(r1), 0, 0 /* qr0 */ -/* 80307D40 CB A1 00 B0 */ lfd f29, 0xb0(r1) -/* 80307D44 83 E1 00 AC */ lwz r31, 0xac(r1) -/* 80307D48 83 C1 00 A8 */ lwz r30, 0xa8(r1) -/* 80307D4C 80 01 00 E4 */ lwz r0, 0xe4(r1) -/* 80307D50 7C 08 03 A6 */ mtlr r0 -/* 80307D54 38 21 00 E0 */ addi r1, r1, 0xe0 -/* 80307D58 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s deleted file mode 100644 index 491e13ca072..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80307DC0: -/* 80307DC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80307DC4 7C 08 02 A6 */ mflr r0 -/* 80307DC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307DCC 80 63 01 38 */ lwz r3, 0x138(r3) -/* 80307DD0 28 03 00 00 */ cmplwi r3, 0 -/* 80307DD4 41 82 00 24 */ beq lbl_80307DF8 -/* 80307DD8 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307DDC 28 03 00 00 */ cmplwi r3, 0 -/* 80307DE0 41 82 00 18 */ beq lbl_80307DF8 -/* 80307DE4 81 83 00 00 */ lwz r12, 0(r3) -/* 80307DE8 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 80307DEC 7D 89 03 A6 */ mtctr r12 -/* 80307DF0 4E 80 04 21 */ bctrl -/* 80307DF4 48 00 00 08 */ b lbl_80307DFC -lbl_80307DF8: -/* 80307DF8 38 60 00 00 */ li r3, 0 -lbl_80307DFC: -/* 80307DFC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80307E00 7C 08 03 A6 */ mtlr r0 -/* 80307E04 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307E08 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResFONT.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResFONT.s deleted file mode 100644 index 8d805e37783..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResFONT.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80308828: -/* 80308828 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030882C 7C 08 02 A6 */ mflr r0 -/* 80308830 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308834 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80308838 93 C1 00 08 */ stw r30, 8(r1) -/* 8030883C 7C 7E 1B 78 */ mr r30, r3 -/* 80308840 7C 9F 23 78 */ mr r31, r4 -/* 80308844 81 83 00 00 */ lwz r12, 0(r3) -/* 80308848 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 8030884C 7D 89 03 A6 */ mtctr r12 -/* 80308850 4E 80 04 21 */ bctrl -/* 80308854 28 03 00 00 */ cmplwi r3, 0 -/* 80308858 41 82 00 38 */ beq lbl_80308890 -/* 8030885C 7F C3 F3 78 */ mr r3, r30 -/* 80308860 81 9E 00 00 */ lwz r12, 0(r30) -/* 80308864 81 8C 00 A0 */ lwz r12, 0xa0(r12) -/* 80308868 7D 89 03 A6 */ mtctr r12 -/* 8030886C 4E 80 04 21 */ bctrl -/* 80308870 81 83 00 00 */ lwz r12, 0(r3) -/* 80308874 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80308878 7D 89 03 A6 */ mtctr r12 -/* 8030887C 4E 80 04 21 */ bctrl -/* 80308880 7C 03 F8 40 */ cmplw r3, r31 -/* 80308884 40 82 00 0C */ bne lbl_80308890 -/* 80308888 38 60 00 01 */ li r3, 1 -/* 8030888C 48 00 00 10 */ b lbl_8030889C -lbl_80308890: -/* 80308890 7F C3 F3 78 */ mr r3, r30 -/* 80308894 7F E4 FB 78 */ mr r4, r31 -/* 80308898 4B FE EC 21 */ bl isUsed__7J2DPaneFPC7ResFONT -lbl_8030889C: -/* 8030889C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 803088A0 83 C1 00 08 */ lwz r30, 8(r1) -/* 803088A4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803088A8 7C 08 03 A6 */ mtlr r0 -/* 803088AC 38 21 00 10 */ addi r1, r1, 0x10 -/* 803088B0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResTIMG.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResTIMG.s deleted file mode 100644 index 1b457054154..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResTIMG.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80308A28: -/* 80308A28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80308A2C 7C 08 02 A6 */ mflr r0 -/* 80308A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308A34 4B FE E9 FD */ bl isUsed__7J2DPaneFPC7ResTIMG -/* 80308A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308A3C 7C 08 03 A6 */ mtlr r0 -/* 80308A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308A44 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/rewriteAlpha__12J2DTextBoxExFv.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/rewriteAlpha__12J2DTextBoxExFv.s deleted file mode 100644 index cc05c2bb4a4..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/rewriteAlpha__12J2DTextBoxExFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80308810: -/* 80308810 80 83 01 38 */ lwz r4, 0x138(r3) -/* 80308814 28 04 00 00 */ cmplwi r4, 0 -/* 80308818 4D 82 00 20 */ beqlr -/* 8030881C 88 04 00 13 */ lbz r0, 0x13(r4) -/* 80308820 98 03 00 B2 */ stb r0, 0xb2(r3) -/* 80308824 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAlpha__12J2DTextBoxExFUc.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAlpha__12J2DTextBoxExFUc.s deleted file mode 100644 index a47a1d1361c..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAlpha__12J2DTextBoxExFUc.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_803087BC: -/* 803087BC 98 83 00 B2 */ stb r4, 0xb2(r3) -/* 803087C0 80 63 01 38 */ lwz r3, 0x138(r3) -/* 803087C4 28 03 00 00 */ cmplwi r3, 0 -/* 803087C8 4D 82 00 20 */ beqlr -/* 803087CC 34 63 00 10 */ addic. r3, r3, 0x10 -/* 803087D0 4D 82 00 20 */ beqlr -/* 803087D4 98 83 00 03 */ stb r4, 3(r3) -/* 803087D8 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP10J2DAnmBase.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP10J2DAnmBase.s deleted file mode 100644 index a73225bee82..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP10J2DAnmBase.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_80308A4C: -/* 80308A4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80308A50 7C 08 02 A6 */ mflr r0 -/* 80308A54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308A58 4B FE F4 9D */ bl setAnimation__7J2DPaneFP10J2DAnmBase -/* 80308A5C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308A60 7C 08 03 A6 */ mtlr r0 -/* 80308A64 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308A68 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP11J2DAnmColor.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP11J2DAnmColor.s deleted file mode 100644 index e3e73288fc5..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP11J2DAnmColor.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_803088B4: -/* 803088B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803088B8 7C 08 02 A6 */ mflr r0 -/* 803088BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 803088C0 80 63 01 38 */ lwz r3, 0x138(r3) -/* 803088C4 28 03 00 00 */ cmplwi r3, 0 -/* 803088C8 41 82 00 08 */ beq lbl_803088D0 -/* 803088CC 4B FE 1F D1 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor -lbl_803088D0: -/* 803088D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 803088D4 7C 08 03 A6 */ mtlr r0 -/* 803088D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 803088DC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey.s deleted file mode 100644 index 8dd8adbca09..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80308938: -/* 80308938 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8030893C 7C 08 02 A6 */ mflr r0 -/* 80308940 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308944 80 63 01 38 */ lwz r3, 0x138(r3) -/* 80308948 28 03 00 00 */ cmplwi r3, 0 -/* 8030894C 41 82 00 08 */ beq lbl_80308954 -/* 80308950 4B FE 21 BD */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey -lbl_80308954: -/* 80308954 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308958 7C 08 03 A6 */ mtlr r0 -/* 8030895C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308960 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern.s deleted file mode 100644 index b25cad576a7..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_8030890C: -/* 8030890C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80308910 7C 08 02 A6 */ mflr r0 -/* 80308914 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308918 80 63 01 38 */ lwz r3, 0x138(r3) -/* 8030891C 28 03 00 00 */ cmplwi r3, 0 -/* 80308920 41 82 00 08 */ beq lbl_80308928 -/* 80308924 4B FE 21 09 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern -lbl_80308928: -/* 80308928 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8030892C 7C 08 03 A6 */ mtlr r0 -/* 80308930 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308934 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s deleted file mode 100644 index 03ab7a2aab0..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_803088E0: -/* 803088E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803088E4 7C 08 02 A6 */ mflr r0 -/* 803088E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 803088EC 80 63 01 38 */ lwz r3, 0x138(r3) -/* 803088F0 28 03 00 00 */ cmplwi r3, 0 -/* 803088F4 41 82 00 08 */ beq lbl_803088FC -/* 803088F8 4B FE 20 55 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey -lbl_803088FC: -/* 803088FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308900 7C 08 03 A6 */ mtlr r0 -/* 80308904 38 21 00 10 */ addi r1, r1, 0x10 -/* 80308908 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setBlack__12J2DTextBoxExFQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setBlack__12J2DTextBoxExFQ28JUtility6TColor.s deleted file mode 100644 index edbdad13938..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setBlack__12J2DTextBoxExFQ28JUtility6TColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_8030823C: -/* 8030823C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80308240 7C 08 02 A6 */ mflr r0 -/* 80308244 90 01 00 24 */ stw r0, 0x24(r1) -/* 80308248 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8030824C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80308250 7C 7E 1B 78 */ mr r30, r3 -/* 80308254 7C 9F 23 78 */ mr r31, r4 -/* 80308258 38 00 FF FF */ li r0, -1 -/* 8030825C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80308260 90 01 00 10 */ stw r0, 0x10(r1) -/* 80308264 38 81 00 14 */ addi r4, r1, 0x14 -/* 80308268 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8030826C 48 00 02 61 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 80308270 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80308274 40 82 00 0C */ bne lbl_80308280 -/* 80308278 38 60 00 00 */ li r3, 0 -/* 8030827C 48 00 00 30 */ b lbl_803082AC -lbl_80308280: -/* 80308280 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80308284 90 01 00 08 */ stw r0, 8(r1) -/* 80308288 80 1F 00 00 */ lwz r0, 0(r31) -/* 8030828C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80308290 7F C3 F3 78 */ mr r3, r30 -/* 80308294 38 81 00 0C */ addi r4, r1, 0xc -/* 80308298 38 A1 00 08 */ addi r5, r1, 8 -/* 8030829C 81 9E 00 00 */ lwz r12, 0(r30) -/* 803082A0 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 803082A4 7D 89 03 A6 */ mtctr r12 -/* 803082A8 4E 80 04 21 */ bctrl -lbl_803082AC: -/* 803082AC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 803082B0 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 803082B4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803082B8 7C 08 03 A6 */ mtlr r0 -/* 803082BC 38 21 00 20 */ addi r1, r1, 0x20 -/* 803082C0 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setCullBack__12J2DTextBoxExF11_GXCullMode.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setCullBack__12J2DTextBoxExF11_GXCullMode.s deleted file mode 100644 index 836fe7f408d..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setCullBack__12J2DTextBoxExF11_GXCullMode.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_803087DC: -/* 803087DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 803087E0 7C 08 02 A6 */ mflr r0 -/* 803087E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803087E8 98 83 00 B1 */ stb r4, 0xb1(r3) -/* 803087EC 80 A3 01 38 */ lwz r5, 0x138(r3) -/* 803087F0 28 05 00 00 */ cmplwi r5, 0 -/* 803087F4 41 82 00 08 */ beq lbl_803087FC -/* 803087F8 98 85 00 22 */ stb r4, 0x22(r5) -lbl_803087FC: -/* 803087FC 4B FE EE 85 */ bl setCullBack__7J2DPaneF11_GXCullMode -/* 80308800 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308804 7C 08 03 A6 */ mtlr r0 -/* 80308808 38 21 00 10 */ addi r1, r1, 0x10 -/* 8030880C 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setFont__12J2DTextBoxExFP7JUTFont.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setFont__12J2DTextBoxExFP7JUTFont.s deleted file mode 100644 index a39b2efcfff..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setFont__12J2DTextBoxExFP7JUTFont.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_80307D5C: -/* 80307D5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80307D60 7C 08 02 A6 */ mflr r0 -/* 80307D64 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307D68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80307D6C 93 C1 00 08 */ stw r30, 8(r1) -/* 80307D70 7C 7E 1B 78 */ mr r30, r3 -/* 80307D74 7C 9F 23 79 */ or. r31, r4, r4 -/* 80307D78 41 82 00 30 */ beq lbl_80307DA8 -/* 80307D7C 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307D80 28 03 00 00 */ cmplwi r3, 0 -/* 80307D84 41 82 00 24 */ beq lbl_80307DA8 -/* 80307D88 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307D8C 28 03 00 00 */ cmplwi r3, 0 -/* 80307D90 41 82 00 18 */ beq lbl_80307DA8 -/* 80307D94 81 83 00 00 */ lwz r12, 0(r3) -/* 80307D98 81 8C 00 94 */ lwz r12, 0x94(r12) -/* 80307D9C 7D 89 03 A6 */ mtctr r12 -/* 80307DA0 4E 80 04 21 */ bctrl -/* 80307DA4 93 FE 01 00 */ stw r31, 0x100(r30) -lbl_80307DA8: -/* 80307DA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80307DAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80307DB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80307DB4 7C 08 03 A6 */ mtlr r0 -/* 80307DB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307DBC 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevStage__12J2DTextBoxExFb.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevStage__12J2DTextBoxExFb.s deleted file mode 100644 index e7c800ce6ca..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setTevStage__12J2DTextBoxExFb.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_80307EF0: -/* 80307EF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80307EF4 7C 08 02 A6 */ mflr r0 -/* 80307EF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80307EFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80307F00 93 C1 00 08 */ stw r30, 8(r1) -/* 80307F04 7C 7E 1B 78 */ mr r30, r3 -/* 80307F08 7C 9F 23 78 */ mr r31, r4 -/* 80307F0C 80 63 01 38 */ lwz r3, 0x138(r3) -/* 80307F10 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307F14 38 80 00 00 */ li r4, 0 -/* 80307F18 81 83 00 00 */ lwz r12, 0(r3) -/* 80307F1C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80307F20 7D 89 03 A6 */ mtctr r12 -/* 80307F24 4E 80 04 21 */ bctrl -/* 80307F28 7C 64 1B 78 */ mr r4, r3 -/* 80307F2C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 80307F30 40 82 00 14 */ bne lbl_80307F44 -/* 80307F34 7F C3 F3 78 */ mr r3, r30 -/* 80307F38 38 A0 00 00 */ li r5, 0 -/* 80307F3C 48 00 00 59 */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum -/* 80307F40 48 00 00 3C */ b lbl_80307F7C -lbl_80307F44: -/* 80307F44 7F C3 F3 78 */ mr r3, r30 -/* 80307F48 38 A0 00 01 */ li r5, 1 -/* 80307F4C 48 00 00 49 */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum -/* 80307F50 80 7E 01 38 */ lwz r3, 0x138(r30) -/* 80307F54 80 63 00 70 */ lwz r3, 0x70(r3) -/* 80307F58 38 80 00 01 */ li r4, 1 -/* 80307F5C 81 83 00 00 */ lwz r12, 0(r3) -/* 80307F60 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 80307F64 7D 89 03 A6 */ mtctr r12 -/* 80307F68 4E 80 04 21 */ bctrl -/* 80307F6C 7C 64 1B 78 */ mr r4, r3 -/* 80307F70 7F C3 F3 78 */ mr r3, r30 -/* 80307F74 38 A0 00 02 */ li r5, 2 -/* 80307F78 48 00 00 1D */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum -lbl_80307F7C: -/* 80307F7C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80307F80 83 C1 00 08 */ lwz r30, 8(r1) -/* 80307F84 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80307F88 7C 08 03 A6 */ mtlr r0 -/* 80307F8C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80307F90 4E 80 00 20 */ blr diff --git a/asm/JSystem/J2DGraph/J2DTextBoxEx/setWhite__12J2DTextBoxExFQ28JUtility6TColor.s b/asm/JSystem/J2DGraph/J2DTextBoxEx/setWhite__12J2DTextBoxExFQ28JUtility6TColor.s deleted file mode 100644 index aef694cb628..00000000000 --- a/asm/JSystem/J2DGraph/J2DTextBoxEx/setWhite__12J2DTextBoxExFQ28JUtility6TColor.s +++ /dev/null @@ -1,37 +0,0 @@ -lbl_803082C4: -/* 803082C4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 803082C8 7C 08 02 A6 */ mflr r0 -/* 803082CC 90 01 00 24 */ stw r0, 0x24(r1) -/* 803082D0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 803082D4 93 C1 00 18 */ stw r30, 0x18(r1) -/* 803082D8 7C 7E 1B 78 */ mr r30, r3 -/* 803082DC 7C 9F 23 78 */ mr r31, r4 -/* 803082E0 38 00 FF FF */ li r0, -1 -/* 803082E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803082E8 90 01 00 10 */ stw r0, 0x10(r1) -/* 803082EC 38 81 00 14 */ addi r4, r1, 0x14 -/* 803082F0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 803082F4 48 00 01 D9 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor -/* 803082F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 803082FC 40 82 00 0C */ bne lbl_80308308 -/* 80308300 38 60 00 00 */ li r3, 0 -/* 80308304 48 00 00 30 */ b lbl_80308334 -lbl_80308308: -/* 80308308 80 1F 00 00 */ lwz r0, 0(r31) -/* 8030830C 90 01 00 08 */ stw r0, 8(r1) -/* 80308310 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80308314 90 01 00 0C */ stw r0, 0xc(r1) -/* 80308318 7F C3 F3 78 */ mr r3, r30 -/* 8030831C 38 81 00 0C */ addi r4, r1, 0xc -/* 80308320 38 A1 00 08 */ addi r5, r1, 8 -/* 80308324 81 9E 00 00 */ lwz r12, 0(r30) -/* 80308328 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 8030832C 7D 89 03 A6 */ mtctr r12 -/* 80308330 4E 80 04 21 */ bctrl -lbl_80308334: -/* 80308334 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80308338 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8030833C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80308340 7C 08 03 A6 */ mtlr r0 -/* 80308344 38 21 00 20 */ addi r1, r1, 0x20 -/* 80308348 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrameMax__Q26JStage6TActorCFv.s b/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrameMax__Q26JStage6TActorCFv.s deleted file mode 100644 index 9b5744f8353..00000000000 --- a/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrameMax__Q26JStage6TActorCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280AEC: -/* 80280AEC C0 22 B9 C8 */ lfs f1, lit_343(r2) -/* 80280AF0 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrame__Q26JStage6TActorCFv.s b/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrame__Q26JStage6TActorCFv.s deleted file mode 100644 index 157a0ef2180..00000000000 --- a/asm/JSystem/JStage/JSGActor/JSGGetAnimationFrame__Q26JStage6TActorCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280AE0: -/* 80280AE0 C0 22 B9 C8 */ lfs f1, lit_343(r2) -/* 80280AE4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/JSGGetAnimationTransition__Q26JStage6TActorCFv.s b/asm/JSystem/JStage/JSGActor/JSGGetAnimationTransition__Q26JStage6TActorCFv.s deleted file mode 100644 index f18c09fe45d..00000000000 --- a/asm/JSystem/JStage/JSGActor/JSGGetAnimationTransition__Q26JStage6TActorCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280AF4: -/* 80280AF4 C0 22 B9 C8 */ lfs f1, lit_343(r2) -/* 80280AF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv.s b/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv.s deleted file mode 100644 index 62f73644f37..00000000000 --- a/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280B18: -/* 80280B18 C0 22 B9 C8 */ lfs f1, lit_343(r2) -/* 80280B1C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrame__Q26JStage6TActorCFv.s b/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrame__Q26JStage6TActorCFv.s deleted file mode 100644 index 576fb76fd7d..00000000000 --- a/asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrame__Q26JStage6TActorCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280B0C: -/* 80280B0C C0 22 B9 C8 */ lfs f1, lit_343(r2) -/* 80280B10 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGActor/__dt__Q26JStage6TActorFv.s b/asm/JSystem/JStage/JSGActor/__dt__Q26JStage6TActorFv.s deleted file mode 100644 index 119099ba6f5..00000000000 --- a/asm/JSystem/JStage/JSGActor/__dt__Q26JStage6TActorFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280A48: -/* 80280A48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280A4C 7C 08 02 A6 */ mflr r0 -/* 80280A50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280A54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280A58 93 C1 00 08 */ stw r30, 8(r1) -/* 80280A5C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280A60 7C 9F 23 78 */ mr r31, r4 -/* 80280A64 41 82 00 28 */ beq lbl_80280A8C -/* 80280A68 3C 80 80 3C */ lis r4, __vt__Q26JStage6TActor@ha /* 0x803C45A8@ha */ -/* 80280A6C 38 04 45 A8 */ addi r0, r4, __vt__Q26JStage6TActor@l /* 0x803C45A8@l */ -/* 80280A70 90 1E 00 00 */ stw r0, 0(r30) -/* 80280A74 38 80 00 00 */ li r4, 0 -/* 80280A78 48 00 03 5D */ bl __dt__Q26JStage7TObjectFv -/* 80280A7C 7F E0 07 35 */ extsh. r0, r31 -/* 80280A80 40 81 00 0C */ ble lbl_80280A8C -/* 80280A84 7F C3 F3 78 */ mr r3, r30 -/* 80280A88 48 04 E2 B5 */ bl __dl__FPv -lbl_80280A8C: -/* 80280A8C 7F C3 F3 78 */ mr r3, r30 -/* 80280A90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280A94 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280A98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280A9C 7C 08 03 A6 */ mtlr r0 -/* 80280AA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280AA4 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGAmbientLight/JSGGetColor__Q26JStage13TAmbientLightCFv.s b/asm/JSystem/JStage/JSGAmbientLight/JSGGetColor__Q26JStage13TAmbientLightCFv.s deleted file mode 100644 index 7925acf45c6..00000000000 --- a/asm/JSystem/JStage/JSGAmbientLight/JSGGetColor__Q26JStage13TAmbientLightCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80280B88: -/* 80280B88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280B8C 80 62 B9 D0 */ lwz r3, lit_302(r2) -/* 80280B90 90 61 00 08 */ stw r3, 8(r1) -/* 80280B94 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280B98 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGAmbientLight/__dt__Q26JStage13TAmbientLightFv.s b/asm/JSystem/JStage/JSGAmbientLight/__dt__Q26JStage13TAmbientLightFv.s deleted file mode 100644 index 8762b70b5e5..00000000000 --- a/asm/JSystem/JStage/JSGAmbientLight/__dt__Q26JStage13TAmbientLightFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280B20: -/* 80280B20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280B24 7C 08 02 A6 */ mflr r0 -/* 80280B28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280B2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280B30 93 C1 00 08 */ stw r30, 8(r1) -/* 80280B34 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280B38 7C 9F 23 78 */ mr r31, r4 -/* 80280B3C 41 82 00 28 */ beq lbl_80280B64 -/* 80280B40 3C 80 80 3C */ lis r4, __vt__Q26JStage13TAmbientLight@ha /* 0x803C4638@ha */ -/* 80280B44 38 04 46 38 */ addi r0, r4, __vt__Q26JStage13TAmbientLight@l /* 0x803C4638@l */ -/* 80280B48 90 1E 00 00 */ stw r0, 0(r30) -/* 80280B4C 38 80 00 00 */ li r4, 0 -/* 80280B50 48 00 02 85 */ bl __dt__Q26JStage7TObjectFv -/* 80280B54 7F E0 07 35 */ extsh. r0, r31 -/* 80280B58 40 81 00 0C */ ble lbl_80280B64 -/* 80280B5C 7F C3 F3 78 */ mr r3, r30 -/* 80280B60 48 04 E1 DD */ bl __dl__FPv -lbl_80280B64: -/* 80280B64 7F C3 F3 78 */ mr r3, r30 -/* 80280B68 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280B6C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280B70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280B74 7C 08 03 A6 */ mtlr r0 -/* 80280B78 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280B7C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionAspect__Q26JStage7TCameraCFv.s b/asm/JSystem/JStage/JSGCamera/JSGGetProjectionAspect__Q26JStage7TCameraCFv.s deleted file mode 100644 index 7b579a00692..00000000000 --- a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionAspect__Q26JStage7TCameraCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280C3C: -/* 80280C3C C0 22 B9 D8 */ lfs f1, lit_319(r2) -/* 80280C40 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFar__Q26JStage7TCameraCFv.s b/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFar__Q26JStage7TCameraCFv.s deleted file mode 100644 index a697d839072..00000000000 --- a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFar__Q26JStage7TCameraCFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80280C20: -/* 80280C20 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 80280C24 C0 23 0A E8 */ lfs f1, __float_max@l(r3) /* 0x80450AE8@l */ -/* 80280C28 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFovy__Q26JStage7TCameraCFv.s b/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFovy__Q26JStage7TCameraCFv.s deleted file mode 100644 index f922337f736..00000000000 --- a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionFovy__Q26JStage7TCameraCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280C30: -/* 80280C30 C0 22 B9 D8 */ lfs f1, lit_319(r2) -/* 80280C34 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionNear__Q26JStage7TCameraCFv.s b/asm/JSystem/JStage/JSGCamera/JSGGetProjectionNear__Q26JStage7TCameraCFv.s deleted file mode 100644 index 967c2578238..00000000000 --- a/asm/JSystem/JStage/JSGCamera/JSGGetProjectionNear__Q26JStage7TCameraCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280C14: -/* 80280C14 C0 22 B9 D8 */ lfs f1, lit_319(r2) -/* 80280C18 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/JSGGetViewRoll__Q26JStage7TCameraCFv.s b/asm/JSystem/JStage/JSGCamera/JSGGetViewRoll__Q26JStage7TCameraCFv.s deleted file mode 100644 index fbfdf5401f6..00000000000 --- a/asm/JSystem/JStage/JSGCamera/JSGGetViewRoll__Q26JStage7TCameraCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280C74: -/* 80280C74 C0 22 B9 D8 */ lfs f1, lit_319(r2) -/* 80280C78 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGCamera/__dt__Q26JStage7TCameraFv.s b/asm/JSystem/JStage/JSGCamera/__dt__Q26JStage7TCameraFv.s deleted file mode 100644 index bdca5eb15b2..00000000000 --- a/asm/JSystem/JStage/JSGCamera/__dt__Q26JStage7TCameraFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280BA0: -/* 80280BA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280BA4 7C 08 02 A6 */ mflr r0 -/* 80280BA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280BAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280BB0 93 C1 00 08 */ stw r30, 8(r1) -/* 80280BB4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280BB8 7C 9F 23 78 */ mr r31, r4 -/* 80280BBC 41 82 00 28 */ beq lbl_80280BE4 -/* 80280BC0 3C 80 80 3C */ lis r4, __vt__Q26JStage7TCamera@ha /* 0x803C4680@ha */ -/* 80280BC4 38 04 46 80 */ addi r0, r4, __vt__Q26JStage7TCamera@l /* 0x803C4680@l */ -/* 80280BC8 90 1E 00 00 */ stw r0, 0(r30) -/* 80280BCC 38 80 00 00 */ li r4, 0 -/* 80280BD0 48 00 02 05 */ bl __dt__Q26JStage7TObjectFv -/* 80280BD4 7F E0 07 35 */ extsh. r0, r31 -/* 80280BD8 40 81 00 0C */ ble lbl_80280BE4 -/* 80280BDC 7F C3 F3 78 */ mr r3, r30 -/* 80280BE0 48 04 E1 5D */ bl __dl__FPv -lbl_80280BE4: -/* 80280BE4 7F C3 F3 78 */ mr r3, r30 -/* 80280BE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280BEC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280BF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280BF4 7C 08 03 A6 */ mtlr r0 -/* 80280BF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280BFC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGFog/JSGGetColor__Q26JStage4TFogCFv.s b/asm/JSystem/JStage/JSGFog/JSGGetColor__Q26JStage4TFogCFv.s deleted file mode 100644 index 3797cda0eaa..00000000000 --- a/asm/JSystem/JStage/JSGFog/JSGGetColor__Q26JStage4TFogCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80280D10: -/* 80280D10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280D14 80 62 B9 E4 */ lwz r3, lit_336(r2) -/* 80280D18 90 61 00 08 */ stw r3, 8(r1) -/* 80280D1C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280D20 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s b/asm/JSystem/JStage/JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s deleted file mode 100644 index 1f4f4a62412..00000000000 --- a/asm/JSystem/JStage/JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80280D00: -/* 80280D00 3C 60 80 45 */ lis r3, __float_max@ha /* 0x80450AE8@ha */ -/* 80280D04 C0 23 0A E8 */ lfs f1, __float_max@l(r3) /* 0x80450AE8@l */ -/* 80280D08 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s b/asm/JSystem/JStage/JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s deleted file mode 100644 index 40d8969d4e0..00000000000 --- a/asm/JSystem/JStage/JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s +++ /dev/null @@ -1,3 +0,0 @@ -lbl_80280CF4: -/* 80280CF4 C0 22 B9 E0 */ lfs f1, lit_319(r2) -/* 80280CF8 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGFog/__dt__Q26JStage4TFogFv.s b/asm/JSystem/JStage/JSGFog/__dt__Q26JStage4TFogFv.s deleted file mode 100644 index ba7a3feee51..00000000000 --- a/asm/JSystem/JStage/JSGFog/__dt__Q26JStage4TFogFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280C80: -/* 80280C80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280C84 7C 08 02 A6 */ mflr r0 -/* 80280C88 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280C8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280C90 93 C1 00 08 */ stw r30, 8(r1) -/* 80280C94 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280C98 7C 9F 23 78 */ mr r31, r4 -/* 80280C9C 41 82 00 28 */ beq lbl_80280CC4 -/* 80280CA0 3C 80 80 3C */ lis r4, __vt__Q26JStage4TFog@ha /* 0x803C4718@ha */ -/* 80280CA4 38 04 47 18 */ addi r0, r4, __vt__Q26JStage4TFog@l /* 0x803C4718@l */ -/* 80280CA8 90 1E 00 00 */ stw r0, 0(r30) -/* 80280CAC 38 80 00 00 */ li r4, 0 -/* 80280CB0 48 00 01 25 */ bl __dt__Q26JStage7TObjectFv -/* 80280CB4 7F E0 07 35 */ extsh. r0, r31 -/* 80280CB8 40 81 00 0C */ ble lbl_80280CC4 -/* 80280CBC 7F C3 F3 78 */ mr r3, r30 -/* 80280CC0 48 04 E0 7D */ bl __dl__FPv -lbl_80280CC4: -/* 80280CC4 7F C3 F3 78 */ mr r3, r30 -/* 80280CC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280CCC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280CD0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280CD4 7C 08 03 A6 */ mtlr r0 -/* 80280CD8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280CDC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGLight/JSGGetColor__Q26JStage6TLightCFv.s b/asm/JSystem/JStage/JSGLight/JSGGetColor__Q26JStage6TLightCFv.s deleted file mode 100644 index 01e6b0c0431..00000000000 --- a/asm/JSystem/JStage/JSGLight/JSGGetColor__Q26JStage6TLightCFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80280D9C: -/* 80280D9C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280DA0 80 62 B9 E8 */ lwz r3, lit_311(r2) -/* 80280DA4 90 61 00 08 */ stw r3, 8(r1) -/* 80280DA8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280DAC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGLight/__dt__Q26JStage6TLightFv.s b/asm/JSystem/JStage/JSGLight/__dt__Q26JStage6TLightFv.s deleted file mode 100644 index f3b33938330..00000000000 --- a/asm/JSystem/JStage/JSGLight/__dt__Q26JStage6TLightFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280D28: -/* 80280D28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280D2C 7C 08 02 A6 */ mflr r0 -/* 80280D30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280D34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280D38 93 C1 00 08 */ stw r30, 8(r1) -/* 80280D3C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280D40 7C 9F 23 78 */ mr r31, r4 -/* 80280D44 41 82 00 28 */ beq lbl_80280D6C -/* 80280D48 3C 80 80 3C */ lis r4, __vt__Q26JStage6TLight@ha /* 0x803C4778@ha */ -/* 80280D4C 38 04 47 78 */ addi r0, r4, __vt__Q26JStage6TLight@l /* 0x803C4778@l */ -/* 80280D50 90 1E 00 00 */ stw r0, 0(r30) -/* 80280D54 38 80 00 00 */ li r4, 0 -/* 80280D58 48 00 00 7D */ bl __dt__Q26JStage7TObjectFv -/* 80280D5C 7F E0 07 35 */ extsh. r0, r31 -/* 80280D60 40 81 00 0C */ ble lbl_80280D6C -/* 80280D64 7F C3 F3 78 */ mr r3, r30 -/* 80280D68 48 04 DF D5 */ bl __dl__FPv -lbl_80280D6C: -/* 80280D6C 7F C3 F3 78 */ mr r3, r30 -/* 80280D70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280D74 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280D78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280D7C 7C 08 03 A6 */ mtlr r0 -/* 80280D80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280D84 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGObject/JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f.s b/asm/JSystem/JStage/JSGObject/JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f.s deleted file mode 100644 index 46edd51455e..00000000000 --- a/asm/JSystem/JStage/JSGObject/JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_80280E54: -/* 80280E54 C0 02 B9 F0 */ lfs f0, lit_338(r2) -/* 80280E58 D0 05 00 00 */ stfs f0, 0(r5) -/* 80280E5C D0 05 00 04 */ stfs f0, 4(r5) -/* 80280E60 D0 05 00 08 */ stfs f0, 8(r5) -/* 80280E64 D0 05 00 0C */ stfs f0, 0xc(r5) -/* 80280E68 D0 05 00 10 */ stfs f0, 0x10(r5) -/* 80280E6C D0 05 00 14 */ stfs f0, 0x14(r5) -/* 80280E70 D0 05 00 18 */ stfs f0, 0x18(r5) -/* 80280E74 D0 05 00 1C */ stfs f0, 0x1c(r5) -/* 80280E78 D0 05 00 20 */ stfs f0, 0x20(r5) -/* 80280E7C D0 05 00 24 */ stfs f0, 0x24(r5) -/* 80280E80 D0 05 00 28 */ stfs f0, 0x28(r5) -/* 80280E84 D0 05 00 2C */ stfs f0, 0x2c(r5) -/* 80280E88 38 60 00 00 */ li r3, 0 -/* 80280E8C 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGObject/__dt__Q26JStage7TObjectFv.s b/asm/JSystem/JStage/JSGObject/__dt__Q26JStage7TObjectFv.s deleted file mode 100644 index 0f2d014cc92..00000000000 --- a/asm/JSystem/JStage/JSGObject/__dt__Q26JStage7TObjectFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80280DD4: -/* 80280DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280DD8 7C 08 02 A6 */ mflr r0 -/* 80280DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280DE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280DE4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80280DE8 41 82 00 1C */ beq lbl_80280E04 -/* 80280DEC 3C A0 80 3C */ lis r5, __vt__Q26JStage7TObject@ha /* 0x803C47E8@ha */ -/* 80280DF0 38 05 47 E8 */ addi r0, r5, __vt__Q26JStage7TObject@l /* 0x803C47E8@l */ -/* 80280DF4 90 1F 00 00 */ stw r0, 0(r31) -/* 80280DF8 7C 80 07 35 */ extsh. r0, r4 -/* 80280DFC 40 81 00 08 */ ble lbl_80280E04 -/* 80280E00 48 04 DF 3D */ bl __dl__FPv -lbl_80280E04: -/* 80280E04 7F E3 FB 78 */ mr r3, r31 -/* 80280E08 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280E0C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280E10 7C 08 03 A6 */ mtlr r0 -/* 80280E14 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280E18 4E 80 00 20 */ blr diff --git a/asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s b/asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s deleted file mode 100644 index 92f94186228..00000000000 --- a/asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80280E90: -/* 80280E90 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80280E94 7C 08 02 A6 */ mflr r0 -/* 80280E98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80280E9C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80280EA0 93 C1 00 08 */ stw r30, 8(r1) -/* 80280EA4 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80280EA8 7C 9F 23 78 */ mr r31, r4 -/* 80280EAC 41 82 00 28 */ beq lbl_80280ED4 -/* 80280EB0 3C 80 80 3C */ lis r4, __vt__Q26JStage7TSystem@ha /* 0x803C4828@ha */ -/* 80280EB4 38 04 48 28 */ addi r0, r4, __vt__Q26JStage7TSystem@l /* 0x803C4828@l */ -/* 80280EB8 90 1E 00 00 */ stw r0, 0(r30) -/* 80280EBC 38 80 00 00 */ li r4, 0 -/* 80280EC0 4B FF FF 15 */ bl __dt__Q26JStage7TObjectFv -/* 80280EC4 7F E0 07 35 */ extsh. r0, r31 -/* 80280EC8 40 81 00 0C */ ble lbl_80280ED4 -/* 80280ECC 7F C3 F3 78 */ mr r3, r30 -/* 80280ED0 48 04 DE 6D */ bl __dl__FPv -lbl_80280ED4: -/* 80280ED4 7F C3 F3 78 */ mr r3, r30 -/* 80280ED8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80280EDC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80280EE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80280EE4 7C 08 03 A6 */ mtlr r0 -/* 80280EE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80280EEC 4E 80 00 20 */ blr diff --git a/asm/JSystem/JUtility/JUTConsole/doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType.s b/asm/JSystem/JUtility/JUTConsole/doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType.s deleted file mode 100644 index 2c7051dc394..00000000000 --- a/asm/JSystem/JUtility/JUTConsole/doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType.s +++ /dev/null @@ -1,365 +0,0 @@ -lbl_802E7648: -/* 802E7648 94 21 FD 50 */ stwu r1, -0x2b0(r1) -/* 802E764C 7C 08 02 A6 */ mflr r0 -/* 802E7650 90 01 02 B4 */ stw r0, 0x2b4(r1) -/* 802E7654 DB E1 02 A0 */ stfd f31, 0x2a0(r1) -/* 802E7658 F3 E1 02 A8 */ psq_st f31, 680(r1), 0, 0 /* qr0 */ -/* 802E765C DB C1 02 90 */ stfd f30, 0x290(r1) -/* 802E7660 F3 C1 02 98 */ psq_st f30, 664(r1), 0, 0 /* qr0 */ -/* 802E7664 DB A1 02 80 */ stfd f29, 0x280(r1) -/* 802E7668 F3 A1 02 88 */ psq_st f29, 648(r1), 0, 0 /* qr0 */ -/* 802E766C DB 81 02 70 */ stfd f28, 0x270(r1) -/* 802E7670 F3 81 02 78 */ psq_st f28, 632(r1), 0, 0 /* qr0 */ -/* 802E7674 DB 61 02 60 */ stfd f27, 0x260(r1) -/* 802E7678 F3 61 02 68 */ psq_st f27, 616(r1), 0, 0 /* qr0 */ -/* 802E767C 39 61 02 60 */ addi r11, r1, 0x260 -/* 802E7680 48 07 AB 39 */ bl _savegpr_20 -/* 802E7684 7C 79 1B 78 */ mr r25, r3 -/* 802E7688 7C 9A 23 78 */ mr r26, r4 -/* 802E768C 88 03 00 68 */ lbz r0, 0x68(r3) -/* 802E7690 28 00 00 00 */ cmplwi r0, 0 -/* 802E7694 41 82 04 E4 */ beq lbl_802E7B78 -/* 802E7698 80 19 00 4C */ lwz r0, 0x4c(r25) -/* 802E769C 28 00 00 00 */ cmplwi r0, 0 -/* 802E76A0 40 82 00 0C */ bne lbl_802E76AC -/* 802E76A4 2C 1A 00 02 */ cmpwi r26, 2 -/* 802E76A8 40 82 04 D0 */ bne lbl_802E7B78 -lbl_802E76AC: -/* 802E76AC 80 F9 00 48 */ lwz r7, 0x48(r25) -/* 802E76B0 28 07 00 00 */ cmplwi r7, 0 -/* 802E76B4 41 82 04 C4 */ beq lbl_802E7B78 -/* 802E76B8 7F 40 00 34 */ cntlzw r0, r26 -/* 802E76BC 54 1E D9 7E */ srwi r30, r0, 5 -/* 802E76C0 C0 22 C7 18 */ lfs f1, lit_2460(r2) -/* 802E76C4 C0 19 00 54 */ lfs f0, 0x54(r25) -/* 802E76C8 EF E1 00 2A */ fadds f31, f1, f0 -/* 802E76CC 2C 1A 00 02 */ cmpwi r26, 2 -/* 802E76D0 41 82 02 D4 */ beq lbl_802E79A4 -/* 802E76D4 80 6D 8F B8 */ lwz r3, sManager__8JUTVideo(r13) -/* 802E76D8 28 03 00 00 */ cmplwi r3, 0 -/* 802E76DC 40 82 00 48 */ bne lbl_802E7724 -/* 802E76E0 38 61 01 08 */ addi r3, r1, 0x108 -/* 802E76E4 C0 22 C7 1C */ lfs f1, lit_2461(r2) -/* 802E76E8 FC 40 08 90 */ fmr f2, f1 -/* 802E76EC C0 62 C7 20 */ lfs f3, lit_2462(r2) -/* 802E76F0 C0 82 C7 24 */ lfs f4, lit_2463(r2) -/* 802E76F4 C0 A2 C7 28 */ lfs f5, lit_2464(r2) -/* 802E76F8 C0 C2 C7 2C */ lfs f6, lit_2465(r2) -/* 802E76FC 48 00 1F D5 */ bl __ct__13J2DOrthoGraphFffffff -/* 802E7700 38 61 01 08 */ addi r3, r1, 0x108 -/* 802E7704 48 00 20 B1 */ bl setPort__13J2DOrthoGraphFv -/* 802E7708 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E770C 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E7710 90 01 01 08 */ stw r0, 0x108(r1) -/* 802E7714 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E7718 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E771C 90 01 01 08 */ stw r0, 0x108(r1) -/* 802E7720 48 00 00 70 */ b lbl_802E7790 -lbl_802E7724: -/* 802E7724 80 63 00 04 */ lwz r3, 4(r3) -/* 802E7728 A0 83 00 06 */ lhz r4, 6(r3) -/* 802E772C A0 03 00 04 */ lhz r0, 4(r3) -/* 802E7730 38 61 00 34 */ addi r3, r1, 0x34 -/* 802E7734 C0 22 C7 1C */ lfs f1, lit_2461(r2) -/* 802E7738 FC 40 08 90 */ fmr f2, f1 -/* 802E773C C8 82 C7 38 */ lfd f4, lit_2469(r2) -/* 802E7740 90 01 01 E4 */ stw r0, 0x1e4(r1) -/* 802E7744 3C 00 43 30 */ lis r0, 0x4330 -/* 802E7748 90 01 01 E0 */ stw r0, 0x1e0(r1) -/* 802E774C C8 01 01 E0 */ lfd f0, 0x1e0(r1) -/* 802E7750 EC 60 20 28 */ fsubs f3, f0, f4 -/* 802E7754 90 81 01 EC */ stw r4, 0x1ec(r1) -/* 802E7758 90 01 01 E8 */ stw r0, 0x1e8(r1) -/* 802E775C C8 01 01 E8 */ lfd f0, 0x1e8(r1) -/* 802E7760 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802E7764 C0 A2 C7 28 */ lfs f5, lit_2464(r2) -/* 802E7768 C0 C2 C7 2C */ lfs f6, lit_2465(r2) -/* 802E776C 48 00 1F 65 */ bl __ct__13J2DOrthoGraphFffffff -/* 802E7770 38 61 00 34 */ addi r3, r1, 0x34 -/* 802E7774 48 00 20 41 */ bl setPort__13J2DOrthoGraphFv -/* 802E7778 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 802E777C 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 802E7780 90 01 00 34 */ stw r0, 0x34(r1) -/* 802E7784 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 802E7788 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 802E778C 90 01 00 34 */ stw r0, 0x34(r1) -lbl_802E7790: -/* 802E7790 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802E7794 41 82 00 0C */ beq lbl_802E77A0 -/* 802E7798 38 79 00 60 */ addi r3, r25, 0x60 -/* 802E779C 48 00 00 08 */ b lbl_802E77A4 -lbl_802E77A0: -/* 802E77A0 38 79 00 5C */ addi r3, r25, 0x5c -lbl_802E77A4: -/* 802E77A4 80 03 00 00 */ lwz r0, 0(r3) -/* 802E77A8 90 01 00 30 */ stw r0, 0x30(r1) -/* 802E77AC 80 79 00 40 */ lwz r3, 0x40(r25) -/* 802E77B0 38 03 FF FE */ addi r0, r3, -2 -/* 802E77B4 C8 C2 C7 40 */ lfd f6, lit_2471(r2) -/* 802E77B8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E77BC 90 01 01 EC */ stw r0, 0x1ec(r1) -/* 802E77C0 3C 60 43 30 */ lis r3, 0x4330 -/* 802E77C4 90 61 01 E8 */ stw r3, 0x1e8(r1) -/* 802E77C8 C8 01 01 E8 */ lfd f0, 0x1e8(r1) -/* 802E77CC EC 20 30 28 */ fsubs f1, f0, f6 -/* 802E77D0 80 19 00 44 */ lwz r0, 0x44(r25) -/* 802E77D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E77D8 90 01 01 E4 */ stw r0, 0x1e4(r1) -/* 802E77DC 90 61 01 E0 */ stw r3, 0x1e0(r1) -/* 802E77E0 C8 01 01 E0 */ lfd f0, 0x1e0(r1) -/* 802E77E4 EC 00 30 28 */ fsubs f0, f0, f6 -/* 802E77E8 EC 00 F8 28 */ fsubs f0, f0, f31 -/* 802E77EC FC 00 00 1E */ fctiwz f0, f0 -/* 802E77F0 D8 01 01 F0 */ stfd f0, 0x1f0(r1) -/* 802E77F4 80 01 01 F4 */ lwz r0, 0x1f4(r1) -/* 802E77F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E77FC 90 01 01 FC */ stw r0, 0x1fc(r1) -/* 802E7800 90 61 01 F8 */ stw r3, 0x1f8(r1) -/* 802E7804 C8 01 01 F8 */ lfd f0, 0x1f8(r1) -/* 802E7808 EC 40 30 28 */ fsubs f2, f0, f6 -/* 802E780C C0 A2 C7 30 */ lfs f5, lit_2466(r2) -/* 802E7810 C0 79 00 50 */ lfs f3, 0x50(r25) -/* 802E7814 80 19 00 20 */ lwz r0, 0x20(r25) -/* 802E7818 C8 82 C7 38 */ lfd f4, lit_2469(r2) -/* 802E781C 90 01 02 04 */ stw r0, 0x204(r1) -/* 802E7820 90 61 02 00 */ stw r3, 0x200(r1) -/* 802E7824 C8 01 02 00 */ lfd f0, 0x200(r1) -/* 802E7828 EC 00 20 28 */ fsubs f0, f0, f4 -/* 802E782C EC 03 00 32 */ fmuls f0, f3, f0 -/* 802E7830 EC 05 00 2A */ fadds f0, f5, f0 -/* 802E7834 FC 00 00 1E */ fctiwz f0, f0 -/* 802E7838 D8 01 02 08 */ stfd f0, 0x208(r1) -/* 802E783C 80 01 02 0C */ lwz r0, 0x20c(r1) -/* 802E7840 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E7844 90 01 02 14 */ stw r0, 0x214(r1) -/* 802E7848 90 61 02 10 */ stw r3, 0x210(r1) -/* 802E784C C8 01 02 10 */ lfd f0, 0x210(r1) -/* 802E7850 EC 60 30 28 */ fsubs f3, f0, f6 -/* 802E7854 80 19 00 48 */ lwz r0, 0x48(r25) -/* 802E7858 90 01 02 1C */ stw r0, 0x21c(r1) -/* 802E785C 90 61 02 18 */ stw r3, 0x218(r1) -/* 802E7860 C8 01 02 18 */ lfd f0, 0x218(r1) -/* 802E7864 EC 00 20 28 */ fsubs f0, f0, f4 -/* 802E7868 EC 1F 00 32 */ fmuls f0, f31, f0 -/* 802E786C FC 00 00 1E */ fctiwz f0, f0 -/* 802E7870 D8 01 02 20 */ stfd f0, 0x220(r1) -/* 802E7874 80 01 02 24 */ lwz r0, 0x224(r1) -/* 802E7878 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E787C 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802E7880 90 61 02 28 */ stw r3, 0x228(r1) -/* 802E7884 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802E7888 EC 80 30 28 */ fsubs f4, f0, f6 -/* 802E788C 38 61 00 30 */ addi r3, r1, 0x30 -/* 802E7890 48 00 22 35 */ bl J2DFillBox__FffffQ28JUtility6TColor -/* 802E7894 80 79 00 4C */ lwz r3, 0x4c(r25) -/* 802E7898 81 83 00 00 */ lwz r12, 0(r3) -/* 802E789C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802E78A0 7D 89 03 A6 */ mtctr r12 -/* 802E78A4 4E 80 04 21 */ bctrl -/* 802E78A8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 -/* 802E78AC 41 82 00 C8 */ beq lbl_802E7974 -/* 802E78B0 80 B9 00 30 */ lwz r5, 0x30(r25) -/* 802E78B4 80 19 00 38 */ lwz r0, 0x38(r25) -/* 802E78B8 7C 85 00 51 */ subf. r4, r5, r0 -/* 802E78BC 80 79 00 48 */ lwz r3, 0x48(r25) -/* 802E78C0 41 80 00 08 */ blt lbl_802E78C8 -/* 802E78C4 48 00 00 0C */ b lbl_802E78D0 -lbl_802E78C8: -/* 802E78C8 80 19 00 24 */ lwz r0, 0x24(r25) -/* 802E78CC 7C 84 02 14 */ add r4, r4, r0 -lbl_802E78D0: -/* 802E78D0 7C 63 20 50 */ subf r3, r3, r4 -/* 802E78D4 34 03 00 01 */ addic. r0, r3, 1 -/* 802E78D8 41 81 00 30 */ bgt lbl_802E7908 -/* 802E78DC 38 00 00 FF */ li r0, 0xff -/* 802E78E0 98 01 00 28 */ stb r0, 0x28(r1) -/* 802E78E4 98 01 00 29 */ stb r0, 0x29(r1) -/* 802E78E8 98 01 00 2A */ stb r0, 0x2a(r1) -/* 802E78EC 98 01 00 2B */ stb r0, 0x2b(r1) -/* 802E78F0 80 01 00 28 */ lwz r0, 0x28(r1) -/* 802E78F4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802E78F8 80 79 00 4C */ lwz r3, 0x4c(r25) -/* 802E78FC 38 81 00 2C */ addi r4, r1, 0x2c -/* 802E7900 4B FF 74 71 */ bl setCharColor__7JUTFontFQ28JUtility6TColor -/* 802E7904 48 00 01 18 */ b lbl_802E7A1C -lbl_802E7908: -/* 802E7908 80 19 00 34 */ lwz r0, 0x34(r25) -/* 802E790C 7C 05 00 00 */ cmpw r5, r0 -/* 802E7910 40 82 00 34 */ bne lbl_802E7944 -/* 802E7914 38 60 00 FF */ li r3, 0xff -/* 802E7918 98 61 00 20 */ stb r3, 0x20(r1) -/* 802E791C 38 00 00 E6 */ li r0, 0xe6 -/* 802E7920 98 01 00 21 */ stb r0, 0x21(r1) -/* 802E7924 98 01 00 22 */ stb r0, 0x22(r1) -/* 802E7928 98 61 00 23 */ stb r3, 0x23(r1) -/* 802E792C 80 01 00 20 */ lwz r0, 0x20(r1) -/* 802E7930 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E7934 80 79 00 4C */ lwz r3, 0x4c(r25) -/* 802E7938 38 81 00 24 */ addi r4, r1, 0x24 -/* 802E793C 4B FF 74 35 */ bl setCharColor__7JUTFontFQ28JUtility6TColor -/* 802E7940 48 00 00 DC */ b lbl_802E7A1C -lbl_802E7944: -/* 802E7944 38 00 00 E6 */ li r0, 0xe6 -/* 802E7948 98 01 00 18 */ stb r0, 0x18(r1) -/* 802E794C 98 01 00 19 */ stb r0, 0x19(r1) -/* 802E7950 38 00 00 FF */ li r0, 0xff -/* 802E7954 98 01 00 1A */ stb r0, 0x1a(r1) -/* 802E7958 98 01 00 1B */ stb r0, 0x1b(r1) -/* 802E795C 80 01 00 18 */ lwz r0, 0x18(r1) -/* 802E7960 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802E7964 80 79 00 4C */ lwz r3, 0x4c(r25) -/* 802E7968 38 81 00 1C */ addi r4, r1, 0x1c -/* 802E796C 4B FF 74 05 */ bl setCharColor__7JUTFontFQ28JUtility6TColor -/* 802E7970 48 00 00 AC */ b lbl_802E7A1C -lbl_802E7974: -/* 802E7974 38 00 00 E6 */ li r0, 0xe6 -/* 802E7978 98 01 00 10 */ stb r0, 0x10(r1) -/* 802E797C 98 01 00 11 */ stb r0, 0x11(r1) -/* 802E7980 98 01 00 12 */ stb r0, 0x12(r1) -/* 802E7984 38 00 00 FF */ li r0, 0xff -/* 802E7988 98 01 00 13 */ stb r0, 0x13(r1) -/* 802E798C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 802E7990 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E7994 80 79 00 4C */ lwz r3, 0x4c(r25) -/* 802E7998 38 81 00 14 */ addi r4, r1, 0x14 -/* 802E799C 4B FF 73 D5 */ bl setCharColor__7JUTFontFQ28JUtility6TColor -/* 802E79A0 48 00 00 7C */ b lbl_802E7A1C -lbl_802E79A4: -/* 802E79A4 80 6D 8F A8 */ lwz r3, sDirectPrint__14JUTDirectPrint(r13) -/* 802E79A8 80 99 00 40 */ lwz r4, 0x40(r25) -/* 802E79AC 38 84 FF FD */ addi r4, r4, -3 -/* 802E79B0 80 B9 00 44 */ lwz r5, 0x44(r25) -/* 802E79B4 38 A5 FF FE */ addi r5, r5, -2 -/* 802E79B8 80 19 00 20 */ lwz r0, 0x20(r25) -/* 802E79BC 1C C0 00 06 */ mulli r6, r0, 6 -/* 802E79C0 38 C6 00 06 */ addi r6, r6, 6 -/* 802E79C4 C8 22 C7 38 */ lfd f1, lit_2469(r2) -/* 802E79C8 90 E1 02 2C */ stw r7, 0x22c(r1) -/* 802E79CC 3C 00 43 30 */ lis r0, 0x4330 -/* 802E79D0 90 01 02 28 */ stw r0, 0x228(r1) -/* 802E79D4 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802E79D8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 802E79DC EC 1F 00 32 */ fmuls f0, f31, f0 -/* 802E79E0 FC 00 00 1E */ fctiwz f0, f0 -/* 802E79E4 D8 01 02 20 */ stfd f0, 0x220(r1) -/* 802E79E8 80 E1 02 24 */ lwz r7, 0x224(r1) -/* 802E79EC 38 E7 00 04 */ addi r7, r7, 4 -/* 802E79F0 4B FF C8 99 */ bl erase__14JUTDirectPrintFiiii -/* 802E79F4 38 00 00 FF */ li r0, 0xff -/* 802E79F8 98 01 00 08 */ stb r0, 8(r1) -/* 802E79FC 98 01 00 09 */ stb r0, 9(r1) -/* 802E7A00 98 01 00 0A */ stb r0, 0xa(r1) -/* 802E7A04 98 01 00 0B */ stb r0, 0xb(r1) -/* 802E7A08 80 01 00 08 */ lwz r0, 8(r1) -/* 802E7A0C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802E7A10 80 6D 8F A8 */ lwz r3, sDirectPrint__14JUTDirectPrint(r13) -/* 802E7A14 38 81 00 0C */ addi r4, r1, 0xc -/* 802E7A18 4B FF CD 81 */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor -lbl_802E7A1C: -/* 802E7A1C 83 99 00 30 */ lwz r28, 0x30(r25) -/* 802E7A20 3B 60 00 00 */ li r27, 0 -/* 802E7A24 82 B9 00 24 */ lwz r21, 0x24(r25) -/* 802E7A28 6E B6 80 00 */ xoris r22, r21, 0x8000 -/* 802E7A2C 82 F9 00 48 */ lwz r23, 0x48(r25) -/* 802E7A30 83 19 00 34 */ lwz r24, 0x34(r25) -/* 802E7A34 83 D9 00 28 */ lwz r30, 0x28(r25) -/* 802E7A38 80 79 00 20 */ lwz r3, 0x20(r25) -/* 802E7A3C 3B E3 00 02 */ addi r31, r3, 2 -lbl_802E7A40: -/* 802E7A40 7C 7F E1 D6 */ mullw r3, r31, r28 -/* 802E7A44 3B A3 00 01 */ addi r29, r3, 1 -/* 802E7A48 7F BE EA 14 */ add r29, r30, r29 -/* 802E7A4C 88 1D FF FF */ lbz r0, -1(r29) -/* 802E7A50 28 00 00 00 */ cmplwi r0, 0 -/* 802E7A54 41 82 01 24 */ beq lbl_802E7B78 -/* 802E7A58 2C 1A 00 02 */ cmpwi r26, 2 -/* 802E7A5C 41 82 00 94 */ beq lbl_802E7AF0 -/* 802E7A60 C3 79 00 54 */ lfs f27, 0x54(r25) -/* 802E7A64 C3 99 00 50 */ lfs f28, 0x50(r25) -/* 802E7A68 80 19 00 44 */ lwz r0, 0x44(r25) -/* 802E7A6C C8 42 C7 40 */ lfd f2, lit_2471(r2) -/* 802E7A70 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E7A74 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802E7A78 3C 60 43 30 */ lis r3, 0x4330 -/* 802E7A7C 90 61 02 28 */ stw r3, 0x228(r1) -/* 802E7A80 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802E7A84 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802E7A88 6F 60 80 00 */ xoris r0, r27, 0x8000 -/* 802E7A8C 90 01 02 24 */ stw r0, 0x224(r1) -/* 802E7A90 90 61 02 20 */ stw r3, 0x220(r1) -/* 802E7A94 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 802E7A98 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802E7A9C EC 00 07 F2 */ fmuls f0, f0, f31 -/* 802E7AA0 EF A1 00 2A */ fadds f29, f1, f0 -/* 802E7AA4 80 19 00 40 */ lwz r0, 0x40(r25) -/* 802E7AA8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E7AAC 90 01 02 1C */ stw r0, 0x21c(r1) -/* 802E7AB0 90 61 02 18 */ stw r3, 0x218(r1) -/* 802E7AB4 C8 01 02 18 */ lfd f0, 0x218(r1) -/* 802E7AB8 EF C0 10 28 */ fsubs f30, f0, f2 -/* 802E7ABC 82 99 00 4C */ lwz r20, 0x4c(r25) -/* 802E7AC0 7F A3 EB 78 */ mr r3, r29 -/* 802E7AC4 48 08 11 21 */ bl strlen -/* 802E7AC8 7C 65 1B 78 */ mr r5, r3 -/* 802E7ACC 7E 83 A3 78 */ mr r3, r20 -/* 802E7AD0 FC 20 F0 90 */ fmr f1, f30 -/* 802E7AD4 FC 40 E8 90 */ fmr f2, f29 -/* 802E7AD8 FC 60 E0 90 */ fmr f3, f28 -/* 802E7ADC FC 80 D8 90 */ fmr f4, f27 -/* 802E7AE0 7F A4 EB 78 */ mr r4, r29 -/* 802E7AE4 38 C0 00 01 */ li r6, 1 -/* 802E7AE8 4B FF 73 41 */ bl drawString_size_scale__7JUTFontFffffPCcUlb -/* 802E7AEC 48 00 00 60 */ b lbl_802E7B4C -lbl_802E7AF0: -/* 802E7AF0 80 6D 8F A8 */ lwz r3, sDirectPrint__14JUTDirectPrint(r13) -/* 802E7AF4 80 19 00 40 */ lwz r0, 0x40(r25) -/* 802E7AF8 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 802E7AFC 80 19 00 44 */ lwz r0, 0x44(r25) -/* 802E7B00 C8 42 C7 40 */ lfd f2, lit_2471(r2) -/* 802E7B04 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802E7B08 90 01 02 2C */ stw r0, 0x22c(r1) -/* 802E7B0C 3C A0 43 30 */ lis r5, 0x4330 -/* 802E7B10 90 A1 02 28 */ stw r5, 0x228(r1) -/* 802E7B14 C8 01 02 28 */ lfd f0, 0x228(r1) -/* 802E7B18 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802E7B1C 6F 60 80 00 */ xoris r0, r27, 0x8000 -/* 802E7B20 90 01 02 24 */ stw r0, 0x224(r1) -/* 802E7B24 90 A1 02 20 */ stw r5, 0x220(r1) -/* 802E7B28 C8 01 02 20 */ lfd f0, 0x220(r1) -/* 802E7B2C EC 00 10 28 */ fsubs f0, f0, f2 -/* 802E7B30 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 802E7B34 EC 01 00 2A */ fadds f0, f1, f0 -/* 802E7B38 FC 00 00 1E */ fctiwz f0, f0 -/* 802E7B3C D8 01 02 18 */ stfd f0, 0x218(r1) -/* 802E7B40 80 A1 02 1C */ lwz r5, 0x21c(r1) -/* 802E7B44 7F A6 EB 78 */ mr r6, r29 -/* 802E7B48 4B FF CB 91 */ bl drawString__14JUTDirectPrintFUsUsPc -lbl_802E7B4C: -/* 802E7B4C 38 7C 00 01 */ addi r3, r28, 1 -/* 802E7B50 7C 15 18 50 */ subf r0, r21, r3 -/* 802E7B54 7C 00 B0 14 */ addc r0, r0, r22 -/* 802E7B58 7C 00 01 10 */ subfe r0, r0, r0 -/* 802E7B5C 7C 60 00 78 */ andc r0, r3, r0 -/* 802E7B60 7C 1C 03 78 */ mr r28, r0 -/* 802E7B64 3B 7B 00 01 */ addi r27, r27, 1 -/* 802E7B68 7C 1B B8 40 */ cmplw r27, r23 -/* 802E7B6C 40 80 00 0C */ bge lbl_802E7B78 -/* 802E7B70 7C 00 C0 00 */ cmpw r0, r24 -/* 802E7B74 40 82 FE CC */ bne lbl_802E7A40 -lbl_802E7B78: -/* 802E7B78 E3 E1 02 A8 */ psq_l f31, 680(r1), 0, 0 /* qr0 */ -/* 802E7B7C CB E1 02 A0 */ lfd f31, 0x2a0(r1) -/* 802E7B80 E3 C1 02 98 */ psq_l f30, 664(r1), 0, 0 /* qr0 */ -/* 802E7B84 CB C1 02 90 */ lfd f30, 0x290(r1) -/* 802E7B88 E3 A1 02 88 */ psq_l f29, 648(r1), 0, 0 /* qr0 */ -/* 802E7B8C CB A1 02 80 */ lfd f29, 0x280(r1) -/* 802E7B90 E3 81 02 78 */ psq_l f28, 632(r1), 0, 0 /* qr0 */ -/* 802E7B94 CB 81 02 70 */ lfd f28, 0x270(r1) -/* 802E7B98 E3 61 02 68 */ psq_l f27, 616(r1), 0, 0 /* qr0 */ -/* 802E7B9C CB 61 02 60 */ lfd f27, 0x260(r1) -/* 802E7BA0 39 61 02 60 */ addi r11, r1, 0x260 -/* 802E7BA4 48 07 A6 61 */ bl _restgpr_20 -/* 802E7BA8 80 01 02 B4 */ lwz r0, 0x2b4(r1) -/* 802E7BAC 7C 08 03 A6 */ mtlr r0 -/* 802E7BB0 38 21 02 B0 */ addi r1, r1, 0x2b0 -/* 802E7BB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkLv4BossRoom__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkLv4BossRoom__9daAlink_cFv.s deleted file mode 100644 index 11b16664ef1..00000000000 --- a/asm/d/a/d_a_alink/checkLv4BossRoom__9daAlink_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8010DAFC: -/* 8010DAFC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010DB00 7C 08 02 A6 */ mflr r0 -/* 8010DB04 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010DB08 3C 60 80 39 */ lis r3, d_a_d_a_alink__stringBase0@ha /* 0x80392094@ha */ -/* 8010DB0C 38 63 20 94 */ addi r3, r3, d_a_d_a_alink__stringBase0@l /* 0x80392094@l */ -/* 8010DB10 38 63 00 9D */ addi r3, r3, 0x9d -/* 8010DB14 4B F8 FF 4D */ bl checkStageName__9daAlink_cFPCc -/* 8010DB18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010DB1C 7C 08 03 A6 */ mtlr r0 -/* 8010DB20 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010DB24 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s b/asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s deleted file mode 100644 index f4d9b589d75..00000000000 --- a/asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_8010DA98: -/* 8010DA98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010DA9C 7C 08 02 A6 */ mflr r0 -/* 8010DAA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010DAA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010DAA8 7C 7F 1B 78 */ mr r31, r3 -/* 8010DAAC 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8010DAB0 81 8C 01 98 */ lwz r12, 0x198(r12) -/* 8010DAB4 7D 89 03 A6 */ mtctr r12 -/* 8010DAB8 4E 80 04 21 */ bctrl -/* 8010DABC 28 03 00 00 */ cmplwi r3, 0 -/* 8010DAC0 41 82 00 24 */ beq lbl_8010DAE4 -/* 8010DAC4 80 7F 28 18 */ lwz r3, 0x2818(r31) -/* 8010DAC8 28 03 00 00 */ cmplwi r3, 0 -/* 8010DACC 41 82 00 18 */ beq lbl_8010DAE4 -/* 8010DAD0 80 03 0A 64 */ lwz r0, 0xa64(r3) -/* 8010DAD4 28 00 00 00 */ cmplwi r0, 0 -/* 8010DAD8 41 82 00 0C */ beq lbl_8010DAE4 -/* 8010DADC 38 60 00 01 */ li r3, 1 -/* 8010DAE0 48 00 00 08 */ b lbl_8010DAE8 -lbl_8010DAE4: -/* 8010DAE4 38 60 00 00 */ li r3, 0 -lbl_8010DAE8: -/* 8010DAE8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010DAEC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010DAF0 7C 08 03 A6 */ mtlr r0 -/* 8010DAF4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010DAF8 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getDirectionFromAngle__9daAlink_cFs.s b/asm/d/a/d_a_alink/getDirectionFromAngle__9daAlink_cFs.s deleted file mode 100644 index 3a5c814d5ec..00000000000 --- a/asm/d/a/d_a_alink/getDirectionFromAngle__9daAlink_cFs.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_800B3494: -/* 800B3494 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800B3498 7C 08 02 A6 */ mflr r0 -/* 800B349C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800B34A0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800B34A4 7C 7F 1B 78 */ mr r31, r3 -/* 800B34A8 7F E3 07 34 */ extsh r3, r31 -/* 800B34AC 48 2B 1C 25 */ bl abs -/* 800B34B0 2C 03 60 00 */ cmpwi r3, 0x6000 -/* 800B34B4 40 81 00 0C */ ble lbl_800B34C0 -/* 800B34B8 38 60 00 01 */ li r3, 1 -/* 800B34BC 48 00 00 30 */ b lbl_800B34EC -lbl_800B34C0: -/* 800B34C0 7F E0 07 34 */ extsh r0, r31 -/* 800B34C4 2C 00 20 00 */ cmpwi r0, 0x2000 -/* 800B34C8 41 80 00 0C */ blt lbl_800B34D4 -/* 800B34CC 38 60 00 02 */ li r3, 2 -/* 800B34D0 48 00 00 1C */ b lbl_800B34EC -lbl_800B34D4: -/* 800B34D4 6C 03 80 00 */ xoris r3, r0, 0x8000 -/* 800B34D8 20 00 E0 00 */ subfic r0, r0, -8192 -/* 800B34DC 7C 00 18 14 */ addc r0, r0, r3 -/* 800B34E0 7C 60 01 10 */ subfe r3, r0, r0 -/* 800B34E4 38 00 00 03 */ li r0, 3 -/* 800B34E8 7C 03 18 38 */ and r3, r0, r3 -lbl_800B34EC: -/* 800B34EC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800B34F0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800B34F4 7C 08 03 A6 */ mtlr r0 -/* 800B34F8 38 21 00 10 */ addi r1, r1, 0x10 -/* 800B34FC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerGravity__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerGravity__9daAlink_cCFv.s deleted file mode 100644 index 6c2cbd5c154..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerGravity__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010D93C: -/* 8010D93C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D940 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D944 C0 23 00 20 */ lfs f1, 0x20(r3) -/* 8010D948 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerJumpRate__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerJumpRate__9daAlink_cCFv.s deleted file mode 100644 index b0c5ecfe04e..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerJumpRate__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010D95C: -/* 8010D95C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D960 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D964 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 8010D968 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerMaxFallSpeed__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerMaxFallSpeed__9daAlink_cCFv.s deleted file mode 100644 index 0d856382429..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerMaxFallSpeed__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010D94C: -/* 8010D94C 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D950 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D954 C0 23 00 24 */ lfs f1, 0x24(r3) -/* 8010D958 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMax__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMax__9daAlink_cCFv.s deleted file mode 100644 index 19896bdb25e..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMax__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010D9F4: -/* 8010D9F4 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D9F8 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D9FC C0 23 00 30 */ lfs f1, 0x30(r3) -/* 8010DA00 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMin__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMin__9daAlink_cCFv.s deleted file mode 100644 index 53b966e0d52..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedMin__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010DA04: -/* 8010DA04 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010DA08 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010DA0C C0 23 00 34 */ lfs f1, 0x34(r3) -/* 8010DA10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedRate__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerRideDecSpeedRate__9daAlink_cCFv.s deleted file mode 100644 index 95138f73e76..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideDecSpeedRate__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010DA14: -/* 8010DA14 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010DA18 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010DA1C C0 23 00 38 */ lfs f1, 0x38(r3) -/* 8010DA20 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideMoveTime__9daAlink_cFv.s b/asm/d/a/d_a_alink/getSpinnerRideMoveTime__9daAlink_cFv.s deleted file mode 100644 index 01e8b217854..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideMoveTime__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8010D96C: -/* 8010D96C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010D970 7C 08 02 A6 */ mflr r0 -/* 8010D974 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010D978 48 00 01 85 */ bl checkLv4BossRoom__9daAlink_cFv -/* 8010D97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010D980 41 82 00 14 */ beq lbl_8010D994 -/* 8010D984 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D988 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D98C A8 63 00 1C */ lha r3, 0x1c(r3) -/* 8010D990 48 00 00 10 */ b lbl_8010D9A0 -lbl_8010D994: -/* 8010D994 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D998 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D99C A8 63 00 14 */ lha r3, 0x14(r3) -lbl_8010D9A0: -/* 8010D9A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010D9A4 7C 08 03 A6 */ mtlr r0 -/* 8010D9A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010D9AC 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideRotAngleMax__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerRideRotAngleMax__9daAlink_cCFv.s deleted file mode 100644 index 969d76ec697..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideRotAngleMax__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010DA24: -/* 8010DA24 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010DA28 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010DA2C A8 63 00 18 */ lha r3, 0x18(r3) -/* 8010DA30 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideRotAngleMin__9daAlink_cCFv.s b/asm/d/a/d_a_alink/getSpinnerRideRotAngleMin__9daAlink_cCFv.s deleted file mode 100644 index c573bf98885..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideRotAngleMin__9daAlink_cCFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_8010DA34: -/* 8010DA34 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010DA38 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010DA3C A8 63 00 1A */ lha r3, 0x1a(r3) -/* 8010DA40 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/getSpinnerRideSpeedF__9daAlink_cFv.s b/asm/d/a/d_a_alink/getSpinnerRideSpeedF__9daAlink_cFv.s deleted file mode 100644 index 00a6886bf2c..00000000000 --- a/asm/d/a/d_a_alink/getSpinnerRideSpeedF__9daAlink_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_8010D9B0: -/* 8010D9B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010D9B4 7C 08 02 A6 */ mflr r0 -/* 8010D9B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010D9BC 48 00 01 41 */ bl checkLv4BossRoom__9daAlink_cFv -/* 8010D9C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8010D9C4 41 82 00 14 */ beq lbl_8010D9D8 -/* 8010D9C8 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D9CC 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D9D0 C0 23 00 3C */ lfs f1, 0x3c(r3) -/* 8010D9D4 48 00 00 10 */ b lbl_8010D9E4 -lbl_8010D9D8: -/* 8010D9D8 3C 60 80 39 */ lis r3, m__21daAlinkHIO_spinner_c0@ha /* 0x8038EA30@ha */ -/* 8010D9DC 38 63 EA 30 */ addi r3, r3, m__21daAlinkHIO_spinner_c0@l /* 0x8038EA30@l */ -/* 8010D9E0 C0 23 00 2C */ lfs f1, 0x2c(r3) -lbl_8010D9E4: -/* 8010D9E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010D9E8 7C 08 03 A6 */ mtlr r0 -/* 8010D9EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010D9F0 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadModelDVD__9daAlink_cFv.s b/asm/d/a/d_a_alink/loadModelDVD__9daAlink_cFv.s deleted file mode 100644 index 958e449e77d..00000000000 --- a/asm/d/a/d_a_alink/loadModelDVD__9daAlink_cFv.s +++ /dev/null @@ -1,111 +0,0 @@ -lbl_80140070: -/* 80140070 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80140074 7C 08 02 A6 */ mflr r0 -/* 80140078 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014007C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80140080 7C 7F 1B 78 */ mr r31, r3 -/* 80140084 88 83 2F BF */ lbz r4, 0x2fbf(r3) -/* 80140088 28 04 00 00 */ cmplwi r4, 0 -/* 8014008C 41 82 01 4C */ beq lbl_801401D8 -/* 80140090 38 04 FF FF */ addi r0, r4, -1 -/* 80140094 98 1F 2F BF */ stb r0, 0x2fbf(r31) -/* 80140098 88 1F 2F BF */ lbz r0, 0x2fbf(r31) -/* 8014009C 28 00 00 02 */ cmplwi r0, 2 -/* 801400A0 40 82 00 94 */ bne lbl_80140134 -/* 801400A4 38 7F 21 88 */ addi r3, r31, 0x2188 -/* 801400A8 4B F5 C9 81 */ bl remove__8dEyeHL_cFv -/* 801400AC 38 7F 21 9C */ addi r3, r31, 0x219c -/* 801400B0 4B F5 C9 79 */ bl remove__8dEyeHL_cFv -/* 801400B4 38 00 00 00 */ li r0, 0 -/* 801400B8 90 1F 07 9C */ stw r0, 0x79c(r31) -/* 801400BC 90 1F 07 A0 */ stw r0, 0x7a0(r31) -/* 801400C0 90 1F 07 A4 */ stw r0, 0x7a4(r31) -/* 801400C4 90 1F 07 A8 */ stw r0, 0x7a8(r31) -/* 801400C8 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 801400CC 74 00 00 28 */ andis. r0, r0, 0x28 -/* 801400D0 40 82 01 10 */ bne lbl_801401E0 -/* 801400D4 38 7F 06 2C */ addi r3, r31, 0x62c -/* 801400D8 80 9F 06 34 */ lwz r4, 0x634(r31) -/* 801400DC 4B EE CF 2D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 801400E0 38 7F 06 2C */ addi r3, r31, 0x62c -/* 801400E4 48 12 65 41 */ bl cPhs_Reset__FP30request_of_phase_process_class -/* 801400E8 80 7F 06 38 */ lwz r3, 0x638(r31) -/* 801400EC 48 18 E4 E1 */ bl freeAll__7JKRHeapFv -/* 801400F0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 801400F4 28 00 01 4D */ cmplwi r0, 0x14d -/* 801400F8 41 82 00 0C */ beq lbl_80140104 -/* 801400FC 28 00 01 4E */ cmplwi r0, 0x14e -/* 80140100 40 82 00 20 */ bne lbl_80140120 -lbl_80140104: -/* 80140104 7F E3 FB 78 */ mr r3, r31 -/* 80140108 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 8014010C 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 -/* 80140110 7C 00 00 34 */ cntlzw r0, r0 -/* 80140114 54 04 DE 3E */ rlwinm r4, r0, 0x1b, 0x18, 0x1f -/* 80140118 4B FF FE 11 */ bl setArcName__9daAlink_cFi -/* 8014011C 48 00 00 C4 */ b lbl_801401E0 -lbl_80140120: -/* 80140120 7F E3 FB 78 */ mr r3, r31 -/* 80140124 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80140128 54 04 01 8C */ rlwinm r4, r0, 0, 6, 6 -/* 8014012C 4B FF FD FD */ bl setArcName__9daAlink_cFi -/* 80140130 48 00 00 B0 */ b lbl_801401E0 -lbl_80140134: -/* 80140134 28 00 00 01 */ cmplwi r0, 1 -/* 80140138 40 82 00 A8 */ bne lbl_801401E0 -/* 8014013C 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80140140 74 00 00 28 */ andis. r0, r0, 0x28 -/* 80140144 41 82 00 18 */ beq lbl_8014015C -/* 80140148 38 00 00 00 */ li r0, 0 -/* 8014014C 98 1F 2F BF */ stb r0, 0x2fbf(r31) -/* 80140150 38 80 00 01 */ li r4, 1 -/* 80140154 4B FE 6D E9 */ bl changeLink__9daAlink_cFi -/* 80140158 48 00 00 88 */ b lbl_801401E0 -lbl_8014015C: -/* 8014015C 38 7F 06 2C */ addi r3, r31, 0x62c -/* 80140160 80 9F 06 34 */ lwz r4, 0x634(r31) -/* 80140164 80 BF 06 38 */ lwz r5, 0x638(r31) -/* 80140168 4B EE CE 59 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap -/* 8014016C 2C 03 00 04 */ cmpwi r3, 4 -/* 80140170 40 82 00 5C */ bne lbl_801401CC -/* 80140174 38 00 00 00 */ li r0, 0 -/* 80140178 98 1F 2F BF */ stb r0, 0x2fbf(r31) -/* 8014017C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) -/* 80140180 28 00 01 4D */ cmplwi r0, 0x14d -/* 80140184 41 82 00 0C */ beq lbl_80140190 -/* 80140188 28 00 01 4E */ cmplwi r0, 0x14e -/* 8014018C 40 82 00 2C */ bne lbl_801401B8 -lbl_80140190: -/* 80140190 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80140194 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140198 41 82 00 14 */ beq lbl_801401AC -/* 8014019C 7F E3 FB 78 */ mr r3, r31 -/* 801401A0 38 80 00 00 */ li r4, 0 -/* 801401A4 4B FE 6D 99 */ bl changeLink__9daAlink_cFi -/* 801401A8 48 00 00 1C */ b lbl_801401C4 -lbl_801401AC: -/* 801401AC 7F E3 FB 78 */ mr r3, r31 -/* 801401B0 4B FE 67 79 */ bl changeWolf__9daAlink_cFv -/* 801401B4 48 00 00 10 */ b lbl_801401C4 -lbl_801401B8: -/* 801401B8 7F E3 FB 78 */ mr r3, r31 -/* 801401BC 38 80 00 01 */ li r4, 1 -/* 801401C0 4B FE 6D 7D */ bl changeLink__9daAlink_cFi -lbl_801401C4: -/* 801401C4 38 60 00 01 */ li r3, 1 -/* 801401C8 48 00 00 1C */ b lbl_801401E4 -lbl_801401CC: -/* 801401CC 38 00 00 02 */ li r0, 2 -/* 801401D0 98 1F 2F BF */ stb r0, 0x2fbf(r31) -/* 801401D4 48 00 00 0C */ b lbl_801401E0 -lbl_801401D8: -/* 801401D8 38 60 00 01 */ li r3, 1 -/* 801401DC 48 00 00 08 */ b lbl_801401E4 -lbl_801401E0: -/* 801401E0 38 60 00 00 */ li r3, 0 -lbl_801401E4: -/* 801401E4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801401E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801401EC 7C 08 03 A6 */ mtlr r0 -/* 801401F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801401F4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/loadShieldModelDVD__9daAlink_cFv.s b/asm/d/a/d_a_alink/loadShieldModelDVD__9daAlink_cFv.s deleted file mode 100644 index 2b6855c5816..00000000000 --- a/asm/d/a/d_a_alink/loadShieldModelDVD__9daAlink_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80140274: -/* 80140274 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80140278 7C 08 02 A6 */ mflr r0 -/* 8014027C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80140280 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80140284 7C 7F 1B 78 */ mr r31, r3 -/* 80140288 88 63 2F D1 */ lbz r3, 0x2fd1(r3) -/* 8014028C 28 03 00 00 */ cmplwi r3, 0 -/* 80140290 41 82 00 88 */ beq lbl_80140318 -/* 80140294 38 03 FF FF */ addi r0, r3, -1 -/* 80140298 98 1F 2F D1 */ stb r0, 0x2fd1(r31) -/* 8014029C 88 1F 2F D1 */ lbz r0, 0x2fd1(r31) -/* 801402A0 28 00 00 02 */ cmplwi r0, 2 -/* 801402A4 40 82 00 34 */ bne lbl_801402D8 -/* 801402A8 38 00 00 00 */ li r0, 0 -/* 801402AC 90 1F 06 78 */ stw r0, 0x678(r31) -/* 801402B0 38 7F 06 3C */ addi r3, r31, 0x63c -/* 801402B4 80 9F 06 44 */ lwz r4, 0x644(r31) -/* 801402B8 4B EE CD 51 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc -/* 801402BC 38 7F 06 3C */ addi r3, r31, 0x63c -/* 801402C0 48 12 63 65 */ bl cPhs_Reset__FP30request_of_phase_process_class -/* 801402C4 80 7F 06 48 */ lwz r3, 0x648(r31) -/* 801402C8 48 18 E3 05 */ bl freeAll__7JKRHeapFv -/* 801402CC 7F E3 FB 78 */ mr r3, r31 -/* 801402D0 4B FF FC C1 */ bl setShieldArcName__9daAlink_cFv -/* 801402D4 48 00 00 4C */ b lbl_80140320 -lbl_801402D8: -/* 801402D8 28 00 00 01 */ cmplwi r0, 1 -/* 801402DC 40 82 00 44 */ bne lbl_80140320 -/* 801402E0 38 7F 06 3C */ addi r3, r31, 0x63c -/* 801402E4 80 9F 06 44 */ lwz r4, 0x644(r31) -/* 801402E8 80 BF 06 48 */ lwz r5, 0x648(r31) -/* 801402EC 4B EE CC D5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap -/* 801402F0 2C 03 00 04 */ cmpwi r3, 4 -/* 801402F4 40 82 00 18 */ bne lbl_8014030C -/* 801402F8 38 00 00 00 */ li r0, 0 -/* 801402FC 98 1F 2F D1 */ stb r0, 0x2fd1(r31) -/* 80140300 7F E3 FB 78 */ mr r3, r31 -/* 80140304 4B FF FE F5 */ bl setShieldModel__9daAlink_cFv -/* 80140308 48 00 00 18 */ b lbl_80140320 -lbl_8014030C: -/* 8014030C 38 00 00 02 */ li r0, 2 -/* 80140310 98 1F 2F D1 */ stb r0, 0x2fd1(r31) -/* 80140314 48 00 00 0C */ b lbl_80140320 -lbl_80140318: -/* 80140318 38 60 00 01 */ li r3, 1 -/* 8014031C 48 00 00 08 */ b lbl_80140324 -lbl_80140320: -/* 80140320 38 60 00 00 */ li r3, 0 -lbl_80140324: -/* 80140324 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80140328 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014032C 7C 08 03 A6 */ mtlr r0 -/* 80140330 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140334 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/onSpinnerPathForceRemove__9daAlink_cFv.s b/asm/d/a/d_a_alink/onSpinnerPathForceRemove__9daAlink_cFv.s deleted file mode 100644 index d748bc43bbd..00000000000 --- a/asm/d/a/d_a_alink/onSpinnerPathForceRemove__9daAlink_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_8010DA44: -/* 8010DA44 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010DA48 7C 08 02 A6 */ mflr r0 -/* 8010DA4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010DA50 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010DA54 7C 7F 1B 78 */ mr r31, r3 -/* 8010DA58 81 83 06 28 */ lwz r12, 0x628(r3) -/* 8010DA5C 81 8C 01 98 */ lwz r12, 0x198(r12) -/* 8010DA60 7D 89 03 A6 */ mtctr r12 -/* 8010DA64 4E 80 04 21 */ bctrl -/* 8010DA68 28 03 00 00 */ cmplwi r3, 0 -/* 8010DA6C 41 82 00 18 */ beq lbl_8010DA84 -/* 8010DA70 80 7F 28 18 */ lwz r3, 0x2818(r31) -/* 8010DA74 28 03 00 00 */ cmplwi r3, 0 -/* 8010DA78 41 82 00 0C */ beq lbl_8010DA84 -/* 8010DA7C 38 00 00 01 */ li r0, 1 -/* 8010DA80 98 03 0A 77 */ stb r0, 0xa77(r3) -lbl_8010DA84: -/* 8010DA84 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010DA88 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010DA8C 7C 08 03 A6 */ mtlr r0 -/* 8010DA90 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010DA94 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/procSpinnerReady__9daAlink_cFv.s b/asm/d/a/d_a_alink/procSpinnerReady__9daAlink_cFv.s deleted file mode 100644 index a319f585008..00000000000 --- a/asm/d/a/d_a_alink/procSpinnerReady__9daAlink_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_8010DDCC: -/* 8010DDCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010DDD0 7C 08 02 A6 */ mflr r0 -/* 8010DDD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010DDD8 80 C3 28 18 */ lwz r6, 0x2818(r3) -/* 8010DDDC 28 06 00 00 */ cmplwi r6, 0 -/* 8010DDE0 40 82 00 10 */ bne lbl_8010DDF0 -/* 8010DDE4 38 80 00 00 */ li r4, 0 -/* 8010DDE8 4B FA C2 E9 */ bl checkNextAction__9daAlink_cFi -/* 8010DDEC 48 00 00 68 */ b lbl_8010DE54 -lbl_8010DDF0: -/* 8010DDF0 C0 06 04 D0 */ lfs f0, 0x4d0(r6) -/* 8010DDF4 D0 03 04 D0 */ stfs f0, 0x4d0(r3) -/* 8010DDF8 C0 06 04 D8 */ lfs f0, 0x4d8(r6) -/* 8010DDFC D0 03 04 D8 */ stfs f0, 0x4d8(r3) -/* 8010DE00 A8 83 30 0C */ lha r4, 0x300c(r3) -/* 8010DE04 38 04 FF FF */ addi r0, r4, -1 -/* 8010DE08 B0 03 30 0C */ sth r0, 0x300c(r3) -/* 8010DE0C 38 00 00 0F */ li r0, 0xf -/* 8010DE10 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 8010DE14 A8 A3 30 0C */ lha r5, 0x300c(r3) -/* 8010DE18 7C A0 07 35 */ extsh. r0, r5 -/* 8010DE1C 40 80 00 1C */ bge lbl_8010DE38 -/* 8010DE20 80 86 05 68 */ lwz r4, 0x568(r6) -/* 8010DE24 C0 23 04 D4 */ lfs f1, 0x4d4(r3) -/* 8010DE28 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 8010DE2C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8010DE30 4C 40 13 82 */ cror 2, 0, 2 -/* 8010DE34 41 82 00 0C */ beq lbl_8010DE40 -lbl_8010DE38: -/* 8010DE38 2C 05 FF E2 */ cmpwi r5, -30 -/* 8010DE3C 40 80 00 14 */ bge lbl_8010DE50 -lbl_8010DE40: -/* 8010DE40 80 86 05 68 */ lwz r4, 0x568(r6) -/* 8010DE44 C0 04 00 40 */ lfs f0, 0x40(r4) -/* 8010DE48 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8010DE4C 48 00 00 2D */ bl procSpinnerWaitInit__9daAlink_cFv -lbl_8010DE50: -/* 8010DE50 38 60 00 01 */ li r3, 1 -lbl_8010DE54: -/* 8010DE54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010DE58 7C 08 03 A6 */ mtlr r0 -/* 8010DE5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010DE60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/resetStatusWindow__9daAlink_cFv.s b/asm/d/a/d_a_alink/resetStatusWindow__9daAlink_cFv.s deleted file mode 100644 index 44d299cbe94..00000000000 --- a/asm/d/a/d_a_alink/resetStatusWindow__9daAlink_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_80140AC8: -/* 80140AC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80140ACC 7C 08 02 A6 */ mflr r0 -/* 80140AD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80140AD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80140AD8 7C 7F 1B 78 */ mr r31, r3 -/* 80140ADC 80 03 05 78 */ lwz r0, 0x578(r3) -/* 80140AE0 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 -/* 80140AE4 90 03 05 78 */ stw r0, 0x578(r3) -/* 80140AE8 80 03 05 74 */ lwz r0, 0x574(r3) -/* 80140AEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140AF0 41 82 00 10 */ beq lbl_80140B00 -/* 80140AF4 38 80 00 01 */ li r4, 1 -/* 80140AF8 4B FF FA 59 */ bl changeModelDataDirectWolf__9daAlink_cFi -/* 80140AFC 48 00 00 0C */ b lbl_80140B08 -lbl_80140B00: -/* 80140B00 38 80 00 01 */ li r4, 1 -/* 80140B04 4B FF F8 35 */ bl changeModelDataDirect__9daAlink_cFi -lbl_80140B08: -/* 80140B08 7F E3 FB 78 */ mr r3, r31 -/* 80140B0C 4B F6 81 D9 */ bl setMatrix__9daAlink_cFv -/* 80140B10 80 7F 06 50 */ lwz r3, 0x650(r31) -/* 80140B14 81 83 00 00 */ lwz r12, 0(r3) -/* 80140B18 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80140B1C 7D 89 03 A6 */ mtctr r12 -/* 80140B20 4E 80 04 21 */ bctrl -/* 80140B24 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80140B28 64 00 00 40 */ oris r0, r0, 0x40 -/* 80140B2C 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80140B30 7F E3 FB 78 */ mr r3, r31 -/* 80140B34 38 80 00 00 */ li r4, 0 -/* 80140B38 4B F6 3D D9 */ bl setSelectEquipItem__9daAlink_cFi -/* 80140B3C 80 1F 05 74 */ lwz r0, 0x574(r31) -/* 80140B40 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140B44 41 82 00 10 */ beq lbl_80140B54 -/* 80140B48 7F E3 FB 78 */ mr r3, r31 -/* 80140B4C 4B F6 94 01 */ bl setWolfItemMatrix__9daAlink_cFv -/* 80140B50 48 00 00 10 */ b lbl_80140B60 -lbl_80140B54: -/* 80140B54 7F E3 FB 78 */ mr r3, r31 -/* 80140B58 38 80 00 00 */ li r4, 0 -/* 80140B5C 4B F6 88 F5 */ bl setItemMatrix__9daAlink_cFi -lbl_80140B60: -/* 80140B60 80 1F 05 78 */ lwz r0, 0x578(r31) -/* 80140B64 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 -/* 80140B68 90 1F 05 78 */ stw r0, 0x578(r31) -/* 80140B6C 38 00 00 00 */ li r0, 0 -/* 80140B70 90 1F 07 BC */ stw r0, 0x7bc(r31) -/* 80140B74 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80140B78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80140B7C 7C 08 03 A6 */ mtlr r0 -/* 80140B80 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140B84 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s b/asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s deleted file mode 100644 index c4317231ce4..00000000000 --- a/asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8013FF28: -/* 8013FF28 2C 04 00 00 */ cmpwi r4, 0 -/* 8013FF2C 41 82 00 10 */ beq lbl_8013FF3C -/* 8013FF30 38 02 92 50 */ la r0, l_wArcName(r2) /* 80452C50-_SDA2_BASE_ */ -/* 8013FF34 90 03 06 34 */ stw r0, 0x634(r3) -/* 8013FF38 4E 80 00 20 */ blr -lbl_8013FF3C: -/* 8013FF3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013FF40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013FF44 88 04 00 13 */ lbz r0, 0x13(r4) -/* 8013FF48 28 00 00 2E */ cmplwi r0, 0x2e -/* 8013FF4C 40 82 00 10 */ bne lbl_8013FF5C -/* 8013FF50 38 02 92 58 */ la r0, l_bArcName(r2) /* 80452C58-_SDA2_BASE_ */ -/* 8013FF54 90 03 06 34 */ stw r0, 0x634(r3) -/* 8013FF58 4E 80 00 20 */ blr -lbl_8013FF5C: -/* 8013FF5C 28 00 00 31 */ cmplwi r0, 0x31 -/* 8013FF60 40 82 00 10 */ bne lbl_8013FF70 -/* 8013FF64 38 02 92 68 */ la r0, l_zArcName(r2) /* 80452C68-_SDA2_BASE_ */ -/* 8013FF68 90 03 06 34 */ stw r0, 0x634(r3) -/* 8013FF6C 4E 80 00 20 */ blr -lbl_8013FF70: -/* 8013FF70 28 00 00 30 */ cmplwi r0, 0x30 -/* 8013FF74 40 82 00 10 */ bne lbl_8013FF84 -/* 8013FF78 38 02 92 70 */ la r0, l_mArcName(r2) /* 80452C70-_SDA2_BASE_ */ -/* 8013FF7C 90 03 06 34 */ stw r0, 0x634(r3) -/* 8013FF80 4E 80 00 20 */ blr -lbl_8013FF84: -/* 8013FF84 38 02 92 60 */ la r0, l_kArcName(r2) /* 80452C60-_SDA2_BASE_ */ -/* 8013FF88 90 03 06 34 */ stw r0, 0x634(r3) -/* 8013FF8C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setClothesChange__9daAlink_cFi.s b/asm/d/a/d_a_alink/setClothesChange__9daAlink_cFi.s deleted file mode 100644 index ab1dca9106f..00000000000 --- a/asm/d/a/d_a_alink/setClothesChange__9daAlink_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80140038: -/* 80140038 80 03 05 74 */ lwz r0, 0x574(r3) -/* 8014003C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140040 4C 82 00 20 */ bnelr -/* 80140044 38 00 00 04 */ li r0, 4 -/* 80140048 98 03 2F BF */ stb r0, 0x2fbf(r3) -/* 8014004C 2C 04 00 00 */ cmpwi r4, 0 -/* 80140050 4D 82 00 20 */ beqlr -/* 80140054 80 03 05 78 */ lwz r0, 0x578(r3) -/* 80140058 64 00 00 20 */ oris r0, r0, 0x20 -/* 8014005C 90 03 05 78 */ stw r0, 0x578(r3) -/* 80140060 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl.s b/asm/d/a/d_a_alink/setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl.s deleted file mode 100644 index 7e2ae1f9307..00000000000 --- a/asm/d/a/d_a_alink/setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_8013FFD8: -/* 8013FFD8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013FFDC 7C 08 02 A6 */ mflr r0 -/* 8013FFE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013FFE4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013FFE8 93 C1 00 08 */ stw r30, 8(r1) -/* 8013FFEC 7C 9E 23 78 */ mr r30, r4 -/* 8013FFF0 7C BF 2B 78 */ mr r31, r5 -/* 8013FFF4 80 04 00 00 */ lwz r0, 0(r4) -/* 8013FFF8 28 00 00 00 */ cmplwi r0, 0 -/* 8013FFFC 40 82 00 24 */ bne lbl_80140020 -/* 80140000 4B EC ED 51 */ bl mDoExt_getGameHeap__Fv -/* 80140004 7C 64 1B 78 */ mr r4, r3 -/* 80140008 38 1F 00 0F */ addi r0, r31, 0xf -/* 8014000C 54 03 00 36 */ rlwinm r3, r0, 0, 0, 0x1b -/* 80140010 38 63 00 A0 */ addi r3, r3, 0xa0 -/* 80140014 38 A0 00 01 */ li r5, 1 -/* 80140018 48 18 EE 15 */ bl create__10JKRExpHeapFUlP7JKRHeapb -/* 8014001C 90 7E 00 00 */ stw r3, 0(r30) -lbl_80140020: -/* 80140020 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80140024 83 C1 00 08 */ lwz r30, 8(r1) -/* 80140028 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8014002C 7C 08 03 A6 */ mtlr r0 -/* 80140030 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140034 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setShieldArcName__9daAlink_cFv.s b/asm/d/a/d_a_alink/setShieldArcName__9daAlink_cFv.s deleted file mode 100644 index 08d70cc6891..00000000000 --- a/asm/d/a/d_a_alink/setShieldArcName__9daAlink_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_8013FF90: -/* 8013FF90 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013FF94 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013FF98 88 04 00 15 */ lbz r0, 0x15(r4) -/* 8013FF9C 28 00 00 2A */ cmplwi r0, 0x2a -/* 8013FFA0 41 82 00 0C */ beq lbl_8013FFAC -/* 8013FFA4 28 00 00 FF */ cmplwi r0, 0xff -/* 8013FFA8 40 82 00 10 */ bne lbl_8013FFB8 -lbl_8013FFAC: -/* 8013FFAC 38 02 92 80 */ la r0, l_cWShdArcName(r2) /* 80452C80-_SDA2_BASE_ */ -/* 8013FFB0 90 03 06 44 */ stw r0, 0x644(r3) -/* 8013FFB4 4E 80 00 20 */ blr -lbl_8013FFB8: -/* 8013FFB8 28 00 00 2B */ cmplwi r0, 0x2b -/* 8013FFBC 40 82 00 10 */ bne lbl_8013FFCC -/* 8013FFC0 38 02 92 88 */ la r0, l_sWShdArcName(r2) /* 80452C88-_SDA2_BASE_ */ -/* 8013FFC4 90 03 06 44 */ stw r0, 0x644(r3) -/* 8013FFC8 4E 80 00 20 */ blr -lbl_8013FFCC: -/* 8013FFCC 38 02 92 78 */ la r0, l_hyShdArcName(r2) /* 80452C78-_SDA2_BASE_ */ -/* 8013FFD0 90 03 06 44 */ stw r0, 0x644(r3) -/* 8013FFD4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setShieldChange__9daAlink_cFv.s b/asm/d/a/d_a_alink/setShieldChange__9daAlink_cFv.s deleted file mode 100644 index fd7409558c7..00000000000 --- a/asm/d/a/d_a_alink/setShieldChange__9daAlink_cFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_80140064: -/* 80140064 38 00 00 04 */ li r0, 4 -/* 80140068 98 03 2F D1 */ stb r0, 0x2fd1(r3) -/* 8014006C 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setShieldModel__9daAlink_cFv.s b/asm/d/a/d_a_alink/setShieldModel__9daAlink_cFv.s deleted file mode 100644 index b00b01223cd..00000000000 --- a/asm/d/a/d_a_alink/setShieldModel__9daAlink_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_801401F8: -/* 801401F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801401FC 7C 08 02 A6 */ mflr r0 -/* 80140200 90 01 00 14 */ stw r0, 0x14(r1) -/* 80140204 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80140208 93 C1 00 08 */ stw r30, 8(r1) -/* 8014020C 7C 7E 1B 78 */ mr r30, r3 -/* 80140210 38 7E 21 04 */ addi r3, r30, 0x2104 -/* 80140214 48 01 EF 55 */ bl setAnimeHeap__14daPy_anmHeap_cFv -/* 80140218 7C 7F 1B 78 */ mr r31, r3 -/* 8014021C 80 7E 06 44 */ lwz r3, 0x644(r30) -/* 80140220 38 80 00 03 */ li r4, 3 -/* 80140224 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80140228 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8014022C 3C A5 00 02 */ addis r5, r5, 2 -/* 80140230 38 C0 00 80 */ li r6, 0x80 -/* 80140234 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80140238 4B EF C0 B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8014023C 7C 64 1B 78 */ mr r4, r3 -/* 80140240 7F C3 F3 78 */ mr r3, r30 -/* 80140244 3C A0 00 08 */ lis r5, 8 -/* 80140248 38 C0 00 00 */ li r6, 0 -/* 8014024C 4B F6 3B 31 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl -/* 80140250 90 7E 06 78 */ stw r3, 0x678(r30) -/* 80140254 7F E3 FB 78 */ mr r3, r31 -/* 80140258 4B EC EF 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap -/* 8014025C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80140260 83 C1 00 08 */ lwz r30, 8(r1) -/* 80140264 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80140268 7C 08 03 A6 */ mtlr r0 -/* 8014026C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80140270 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSmellSave__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSmellSave__9daAlink_cFv.s deleted file mode 100644 index 5a835a39590..00000000000 --- a/asm/d/a/d_a_alink/setSmellSave__9daAlink_cFv.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_8013F90C: -/* 8013F90C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8013F910 7C 08 02 A6 */ mflr r0 -/* 8013F914 90 01 00 14 */ stw r0, 0x14(r1) -/* 8013F918 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8013F91C 7C 7F 1B 78 */ mr r31, r3 -/* 8013F920 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F924 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F928 88 03 00 16 */ lbz r0, 0x16(r3) -/* 8013F92C 28 00 00 B5 */ cmplwi r0, 0xb5 -/* 8013F930 40 82 00 10 */ bne lbl_8013F940 -/* 8013F934 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8013F938 38 80 2F 04 */ li r4, 0x2f04 -/* 8013F93C 4B EF 50 69 */ bl offEventBit__11dSv_event_cFUs -lbl_8013F940: -/* 8013F940 A8 1F 30 12 */ lha r0, 0x3012(r31) -/* 8013F944 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8013F948 48 0F 8A C9 */ bl setSmellType__12dMsgObject_cFUc -/* 8013F94C A8 1F 30 12 */ lha r0, 0x3012(r31) -/* 8013F950 2C 00 00 B5 */ cmpwi r0, 0xb5 -/* 8013F954 40 82 00 1C */ bne lbl_8013F970 -/* 8013F958 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F95C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F960 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8013F964 38 80 2F 04 */ li r4, 0x2f04 -/* 8013F968 4B EF 50 25 */ bl onEventBit__11dSv_event_cFUs -/* 8013F96C 48 00 00 88 */ b lbl_8013F9F4 -lbl_8013F970: -/* 8013F970 2C 00 00 B4 */ cmpwi r0, 0xb4 -/* 8013F974 40 82 00 20 */ bne lbl_8013F994 -/* 8013F978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F97C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F980 38 80 00 66 */ li r4, 0x66 -/* 8013F984 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8013F988 7C 05 07 74 */ extsb r5, r0 -/* 8013F98C 4B EF 58 75 */ bl onSwitch__10dSv_info_cFii -/* 8013F990 48 00 00 64 */ b lbl_8013F9F4 -lbl_8013F994: -/* 8013F994 2C 00 00 B0 */ cmpwi r0, 0xb0 -/* 8013F998 40 82 00 20 */ bne lbl_8013F9B8 -/* 8013F99C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F9A4 38 80 00 67 */ li r4, 0x67 -/* 8013F9A8 88 1F 04 BA */ lbz r0, 0x4ba(r31) -/* 8013F9AC 7C 05 07 74 */ extsb r5, r0 -/* 8013F9B0 4B EF 58 51 */ bl onSwitch__10dSv_info_cFii -/* 8013F9B4 48 00 00 40 */ b lbl_8013F9F4 -lbl_8013F9B8: -/* 8013F9B8 2C 00 00 B3 */ cmpwi r0, 0xb3 -/* 8013F9BC 40 82 00 1C */ bne lbl_8013F9D8 -/* 8013F9C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F9C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F9C8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8013F9CC 38 80 61 20 */ li r4, 0x6120 -/* 8013F9D0 4B EF 4F BD */ bl onEventBit__11dSv_event_cFUs -/* 8013F9D4 48 00 00 20 */ b lbl_8013F9F4 -lbl_8013F9D8: -/* 8013F9D8 2C 00 00 B2 */ cmpwi r0, 0xb2 -/* 8013F9DC 40 82 00 18 */ bne lbl_8013F9F4 -/* 8013F9E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8013F9E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8013F9E8 38 63 07 F0 */ addi r3, r3, 0x7f0 -/* 8013F9EC 38 80 62 10 */ li r4, 0x6210 -/* 8013F9F0 4B EF 4F 9D */ bl onEventBit__11dSv_event_cFUs -lbl_8013F9F4: -/* 8013F9F4 7F E3 FB 78 */ mr r3, r31 -/* 8013F9F8 A8 9F 30 12 */ lha r4, 0x3012(r31) -/* 8013F9FC 4B FD AC 8D */ bl setGetSubBgm__9daAlink_cFi -/* 8013FA00 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8013FA04 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8013FA08 7C 08 03 A6 */ mtlr r0 -/* 8013FA0C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8013FA10 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSpinnerStatus__9daAlink_cFUcUc.s b/asm/d/a/d_a_alink/setSpinnerStatus__9daAlink_cFUcUc.s deleted file mode 100644 index 4299b64877b..00000000000 --- a/asm/d/a/d_a_alink/setSpinnerStatus__9daAlink_cFUcUc.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_8010DE64: -/* 8010DE64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8010DE68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8010DE6C 98 83 5E 24 */ stb r4, 0x5e24(r3) -/* 8010DE70 98 A3 5E 4A */ stb r5, 0x5e4a(r3) -/* 8010DE74 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/setSpinnerSyncPos__9daAlink_cFv.s b/asm/d/a/d_a_alink/setSpinnerSyncPos__9daAlink_cFv.s deleted file mode 100644 index 6d3224c49d3..00000000000 --- a/asm/d/a/d_a_alink/setSpinnerSyncPos__9daAlink_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8010DBC8: -/* 8010DBC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8010DBCC 7C 08 02 A6 */ mflr r0 -/* 8010DBD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010DBD4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8010DBD8 93 C1 00 08 */ stw r30, 8(r1) -/* 8010DBDC 7C 7E 1B 78 */ mr r30, r3 -/* 8010DBE0 83 E3 28 18 */ lwz r31, 0x2818(r3) -/* 8010DBE4 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 8010DBE8 C0 03 00 30 */ lfs f0, 0x30(r3) -/* 8010DBEC D0 1E 04 D0 */ stfs f0, 0x4d0(r30) -/* 8010DBF0 C0 03 00 40 */ lfs f0, 0x40(r3) -/* 8010DBF4 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) -/* 8010DBF8 C0 03 00 50 */ lfs f0, 0x50(r3) -/* 8010DBFC D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8010DC00 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8010DC04 4B EF F3 09 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz -/* 8010DC08 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8010DC0C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8010DC10 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8010DC14 A8 1E 04 E6 */ lha r0, 0x4e6(r30) -/* 8010DC18 7C 04 00 50 */ subf r0, r4, r0 -/* 8010DC1C 7C 04 07 34 */ extsh r4, r0 -/* 8010DC20 4B EF E8 15 */ bl mDoMtx_YrotM__FPA4_fs -/* 8010DC24 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8010DC28 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 8010DC2C 38 9E 04 E4 */ addi r4, r30, 0x4e4 -/* 8010DC30 4B EF EF D1 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz -/* 8010DC34 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) -/* 8010DC38 D0 1E 37 A4 */ stfs f0, 0x37a4(r30) -/* 8010DC3C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) -/* 8010DC40 D0 1E 37 A8 */ stfs f0, 0x37a8(r30) -/* 8010DC44 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) -/* 8010DC48 D0 1E 37 AC */ stfs f0, 0x37ac(r30) -/* 8010DC4C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8010DC50 83 C1 00 08 */ lwz r30, 8(r1) -/* 8010DC54 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8010DC58 7C 08 03 A6 */ mtlr r0 -/* 8010DC5C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8010DC60 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/statusWindowDraw__9daAlink_cFv.s b/asm/d/a/d_a_alink/statusWindowDraw__9daAlink_cFv.s deleted file mode 100644 index eca1dc6117f..00000000000 --- a/asm/d/a/d_a_alink/statusWindowDraw__9daAlink_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_80140984: -/* 80140984 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80140988 7C 08 02 A6 */ mflr r0 -/* 8014098C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80140990 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140994 48 22 18 49 */ bl _savegpr_29 -/* 80140998 7C 7D 1B 78 */ mr r29, r3 -/* 8014099C 88 03 2F BF */ lbz r0, 0x2fbf(r3) -/* 801409A0 28 00 00 00 */ cmplwi r0, 0 -/* 801409A4 40 82 01 0C */ bne lbl_80140AB0 -/* 801409A8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801409AC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801409B0 38 80 00 0C */ li r4, 0xc -/* 801409B4 38 BD 04 D0 */ addi r5, r29, 0x4d0 -/* 801409B8 38 DD 01 0C */ addi r6, r29, 0x10c -/* 801409BC 48 06 2E 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c -/* 801409C0 7F A3 EB 78 */ mr r3, r29 -/* 801409C4 4B F8 BE 19 */ bl initTevCustomColor__9daAlink_cFv -/* 801409C8 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 801409CC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 801409D0 40 82 00 18 */ bne lbl_801409E8 -/* 801409D4 7F A3 EB 78 */ mr r3, r29 -/* 801409D8 38 82 97 E8 */ la r4, waterColor(r2) /* 804531E8-_SDA2_BASE_ */ -/* 801409DC 4B F8 B9 89 */ bl setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 -/* 801409E0 7F A3 EB 78 */ mr r3, r29 -/* 801409E4 4B F8 A5 E5 */ bl setDrawHand__9daAlink_cFv -lbl_801409E8: -/* 801409E8 7F A3 EB 78 */ mr r3, r29 -/* 801409EC 80 9D 06 50 */ lwz r4, 0x650(r29) -/* 801409F0 4B F8 B8 A9 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 801409F4 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 801409F8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 801409FC 40 82 00 5C */ bne lbl_80140A58 -/* 80140A00 7F A3 EB 78 */ mr r3, r29 -/* 80140A04 80 9D 06 5C */ lwz r4, 0x65c(r29) -/* 80140A08 4B F8 B8 91 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 80140A0C 7F A3 EB 78 */ mr r3, r29 -/* 80140A10 80 9D 06 58 */ lwz r4, 0x658(r29) -/* 80140A14 4B F8 B8 85 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 80140A18 7F A3 EB 78 */ mr r3, r29 -/* 80140A1C 80 9D 06 54 */ lwz r4, 0x654(r29) -/* 80140A20 4B F8 B8 79 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 80140A24 80 1D 05 70 */ lwz r0, 0x570(r29) -/* 80140A28 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140A2C 41 82 00 2C */ beq lbl_80140A58 -/* 80140A30 3B C0 00 00 */ li r30, 0 -/* 80140A34 3B E0 00 00 */ li r31, 0 -lbl_80140A38: -/* 80140A38 7F A3 EB 78 */ mr r3, r29 -/* 80140A3C 38 1F 07 84 */ addi r0, r31, 0x784 -/* 80140A40 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 80140A44 4B F8 B8 55 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 80140A48 3B DE 00 01 */ addi r30, r30, 1 -/* 80140A4C 2C 1E 00 02 */ cmpwi r30, 2 -/* 80140A50 3B FF 00 04 */ addi r31, r31, 4 -/* 80140A54 41 80 FF E4 */ blt lbl_80140A38 -lbl_80140A58: -/* 80140A58 7F A3 EB 78 */ mr r3, r29 -/* 80140A5C 4B F8 AA 25 */ bl checkSwordDraw__9daAlink_cFv -/* 80140A60 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80140A64 41 82 00 30 */ beq lbl_80140A94 -/* 80140A68 7F A3 EB 78 */ mr r3, r29 -/* 80140A6C 80 9D 06 B8 */ lwz r4, 0x6b8(r29) -/* 80140A70 4B F8 B8 29 */ bl basicModelDraw__9daAlink_cFP8J3DModel -/* 80140A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 80140A78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 80140A7C 88 03 00 14 */ lbz r0, 0x14(r3) -/* 80140A80 28 00 00 3F */ cmplwi r0, 0x3f -/* 80140A84 41 82 00 10 */ beq lbl_80140A94 -/* 80140A88 7F A3 EB 78 */ mr r3, r29 -/* 80140A8C 80 9D 06 BC */ lwz r4, 0x6bc(r29) -/* 80140A90 4B F8 B8 09 */ bl basicModelDraw__9daAlink_cFP8J3DModel -lbl_80140A94: -/* 80140A94 7F A3 EB 78 */ mr r3, r29 -/* 80140A98 4B F8 AA A5 */ bl checkShieldDraw__9daAlink_cFv -/* 80140A9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80140AA0 41 82 00 10 */ beq lbl_80140AB0 -/* 80140AA4 7F A3 EB 78 */ mr r3, r29 -/* 80140AA8 80 9D 06 78 */ lwz r4, 0x678(r29) -/* 80140AAC 4B F8 B7 ED */ bl basicModelDraw__9daAlink_cFP8J3DModel -lbl_80140AB0: -/* 80140AB0 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140AB4 48 22 17 75 */ bl _restgpr_29 -/* 80140AB8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80140ABC 7C 08 03 A6 */ mtlr r0 -/* 80140AC0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80140AC4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/statusWindowExecute__9daAlink_cFPC4cXyzs.s b/asm/d/a/d_a_alink/statusWindowExecute__9daAlink_cFPC4cXyzs.s deleted file mode 100644 index 819b553399d..00000000000 --- a/asm/d/a/d_a_alink/statusWindowExecute__9daAlink_cFPC4cXyzs.s +++ /dev/null @@ -1,68 +0,0 @@ -lbl_80140888: -/* 80140888 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8014088C 7C 08 02 A6 */ mflr r0 -/* 80140890 90 01 00 24 */ stw r0, 0x24(r1) -/* 80140894 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140898 48 22 19 45 */ bl _savegpr_29 -/* 8014089C 7C 7D 1B 78 */ mr r29, r3 -/* 801408A0 7C 9E 23 78 */ mr r30, r4 -/* 801408A4 7C BF 2B 78 */ mr r31, r5 -/* 801408A8 4B FF F7 C9 */ bl loadModelDVD__9daAlink_cFv -/* 801408AC 2C 03 00 00 */ cmpwi r3, 0 -/* 801408B0 41 82 00 BC */ beq lbl_8014096C -/* 801408B4 88 7D 2F D6 */ lbz r3, 0x2fd6(r29) -/* 801408B8 28 03 00 00 */ cmplwi r3, 0 -/* 801408BC 41 82 00 0C */ beq lbl_801408C8 -/* 801408C0 38 03 FF FF */ addi r0, r3, -1 -/* 801408C4 98 1D 2F D6 */ stb r0, 0x2fd6(r29) -lbl_801408C8: -/* 801408C8 7F A3 EB 78 */ mr r3, r29 -/* 801408CC 4B FF F9 A9 */ bl loadShieldModelDVD__9daAlink_cFv -/* 801408D0 7F A3 EB 78 */ mr r3, r29 -/* 801408D4 38 80 00 01 */ li r4, 1 -/* 801408D8 4B F6 40 39 */ bl setSelectEquipItem__9daAlink_cFi -/* 801408DC 88 1D 2F D6 */ lbz r0, 0x2fd6(r29) -/* 801408E0 28 00 00 1E */ cmplwi r0, 0x1e -/* 801408E4 41 80 00 0C */ blt lbl_801408F0 -/* 801408E8 38 00 00 00 */ li r0, 0 -/* 801408EC 98 1D 2F D6 */ stb r0, 0x2fd6(r29) -lbl_801408F0: -/* 801408F0 7F C3 F3 78 */ mr r3, r30 -/* 801408F4 4B EC C4 71 */ bl transS__14mDoMtx_stack_cFRC4cXyz -/* 801408F8 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 801408FC 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80140900 7F E4 FB 78 */ mr r4, r31 -/* 80140904 4B EC BB 31 */ bl mDoMtx_YrotM__FPA4_fs -/* 80140908 3C 60 80 3E */ lis r3, now__14mDoMtx_stack_c@ha /* 0x803DD470@ha */ -/* 8014090C 38 63 D4 70 */ addi r3, r3, now__14mDoMtx_stack_c@l /* 0x803DD470@l */ -/* 80140910 80 9D 06 50 */ lwz r4, 0x650(r29) -/* 80140914 38 84 00 24 */ addi r4, r4, 0x24 -/* 80140918 48 20 5B 99 */ bl PSMTXCopy -/* 8014091C 80 7D 07 BC */ lwz r3, 0x7bc(r29) -/* 80140920 4B EC CB 09 */ bl play__14mDoExt_baseAnmFv -/* 80140924 80 7D 07 BC */ lwz r3, 0x7bc(r29) -/* 80140928 80 9D 06 4C */ lwz r4, 0x64c(r29) -/* 8014092C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80140930 4B EC D0 9D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf -/* 80140934 80 7D 06 50 */ lwz r3, 0x650(r29) -/* 80140938 81 83 00 00 */ lwz r12, 0(r3) -/* 8014093C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80140940 7D 89 03 A6 */ mtctr r12 -/* 80140944 4E 80 04 21 */ bctrl -/* 80140948 80 1D 05 74 */ lwz r0, 0x574(r29) -/* 8014094C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 -/* 80140950 41 82 00 10 */ beq lbl_80140960 -/* 80140954 7F A3 EB 78 */ mr r3, r29 -/* 80140958 4B F6 95 F5 */ bl setWolfItemMatrix__9daAlink_cFv -/* 8014095C 48 00 00 10 */ b lbl_8014096C -lbl_80140960: -/* 80140960 7F A3 EB 78 */ mr r3, r29 -/* 80140964 38 80 00 01 */ li r4, 1 -/* 80140968 4B F6 8A E9 */ bl setItemMatrix__9daAlink_cFi -lbl_8014096C: -/* 8014096C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80140970 48 22 18 B9 */ bl _restgpr_29 -/* 80140974 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80140978 7C 08 03 A6 */ mtlr r0 -/* 8014097C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80140980 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s b/asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s deleted file mode 100644 index 802cae54554..00000000000 --- a/asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s +++ /dev/null @@ -1,47 +0,0 @@ -lbl_80074744: -/* 80074744 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80074748 7C 08 02 A6 */ mflr r0 -/* 8007474C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80074750 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80074754 7C 67 1B 78 */ mr r7, r3 -/* 80074758 7C 86 23 78 */ mr r6, r4 -/* 8007475C 7C BF 2B 78 */ mr r31, r5 -/* 80074760 A0 04 00 02 */ lhz r0, 2(r4) -/* 80074764 2C 00 00 00 */ cmpwi r0, 0 -/* 80074768 41 80 00 20 */ blt lbl_80074788 -/* 8007476C 2C 00 01 00 */ cmpwi r0, 0x100 -/* 80074770 40 80 00 18 */ bge lbl_80074788 -/* 80074774 1C 80 00 14 */ mulli r4, r0, 0x14 -/* 80074778 7C 67 22 14 */ add r3, r7, r4 -/* 8007477C 88 03 00 04 */ lbz r0, 4(r3) -/* 80074780 28 00 00 00 */ cmplwi r0, 0 -/* 80074784 40 82 00 0C */ bne lbl_80074790 -lbl_80074788: -/* 80074788 38 60 00 00 */ li r3, 0 -/* 8007478C 48 00 00 50 */ b lbl_800747DC -lbl_80074790: -/* 80074790 38 61 00 08 */ addi r3, r1, 8 -/* 80074794 7C 87 20 2E */ lwzx r4, r7, r4 -/* 80074798 7C C5 33 78 */ mr r5, r6 -/* 8007479C 81 84 00 04 */ lwz r12, 4(r4) -/* 800747A0 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 800747A4 7D 89 03 A6 */ mtctr r12 -/* 800747A8 4E 80 04 21 */ bctrl -/* 800747AC C0 01 00 08 */ lfs f0, 8(r1) -/* 800747B0 D0 1F 00 00 */ stfs f0, 0(r31) -/* 800747B4 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 800747B8 D0 1F 00 04 */ stfs f0, 4(r31) -/* 800747BC C0 01 00 10 */ lfs f0, 0x10(r1) -/* 800747C0 D0 1F 00 08 */ stfs f0, 8(r31) -/* 800747C4 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 800747C8 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 800747CC 3C 60 80 3A */ lis r3, __vt__8cM3dGPla@ha /* 0x803A37C0@ha */ -/* 800747D0 38 03 37 C0 */ addi r0, r3, __vt__8cM3dGPla@l /* 0x803A37C0@l */ -/* 800747D4 90 01 00 18 */ stw r0, 0x18(r1) -/* 800747D8 38 60 00 01 */ li r3, 1 -lbl_800747DC: -/* 800747DC 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 800747E0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 800747E4 7C 08 03 A6 */ mtlr r0 -/* 800747E8 38 21 00 30 */ addi r1, r1, 0x30 -/* 800747EC 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s b/asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s deleted file mode 100644 index 13f2acadac0..00000000000 --- a/asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_800744A0: -/* 800744A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800744A4 7C 08 02 A6 */ mflr r0 -/* 800744A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 800744AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800744B0 48 2E DD 2D */ bl _savegpr_29 -/* 800744B4 7C 7E 1B 78 */ mr r30, r3 -/* 800744B8 7C 9D 23 78 */ mr r29, r4 -/* 800744BC C0 02 8C B8 */ lfs f0, lit_3738(r2) -/* 800744C0 D0 04 00 34 */ stfs f0, 0x34(r4) -/* 800744C4 38 7D 00 14 */ addi r3, r29, 0x14 -/* 800744C8 48 1F 3C 59 */ bl ClearPi__13cBgS_PolyInfoFv -/* 800744CC 7F A3 EB 78 */ mr r3, r29 -/* 800744D0 48 1F 38 75 */ bl PreCheck__11cBgS_GndChkFv -/* 800744D4 7F DF F3 78 */ mr r31, r30 -/* 800744D8 3B C0 00 00 */ li r30, 0 -lbl_800744DC: -/* 800744DC 88 1F 00 04 */ lbz r0, 4(r31) -/* 800744E0 28 00 00 00 */ cmplwi r0, 0 -/* 800744E4 41 82 00 68 */ beq lbl_8007454C -/* 800744E8 80 7F 00 00 */ lwz r3, 0(r31) -/* 800744EC 81 83 00 04 */ lwz r12, 4(r3) -/* 800744F0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800744F4 7D 89 03 A6 */ mtctr r12 -/* 800744F8 4E 80 04 21 */ bctrl -/* 800744FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074500 40 82 00 4C */ bne lbl_8007454C -/* 80074504 7F A3 EB 78 */ mr r3, r29 -/* 80074508 80 9F 00 08 */ lwz r4, 8(r31) -/* 8007450C 48 1F 36 D1 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 80074510 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074514 40 82 00 38 */ bne lbl_8007454C -/* 80074518 80 7F 00 00 */ lwz r3, 0(r31) -/* 8007451C 7F A4 EB 78 */ mr r4, r29 -/* 80074520 81 83 00 04 */ lwz r12, 4(r3) -/* 80074524 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 80074528 7D 89 03 A6 */ mtctr r12 -/* 8007452C 4E 80 04 21 */ bctrl -/* 80074530 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074534 41 82 00 18 */ beq lbl_8007454C -/* 80074538 38 7D 00 14 */ addi r3, r29, 0x14 -/* 8007453C 7F C4 F3 78 */ mr r4, r30 -/* 80074540 80 BF 00 00 */ lwz r5, 0(r31) -/* 80074544 80 DF 00 08 */ lwz r6, 8(r31) -/* 80074548 48 1F 3C 25 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -lbl_8007454C: -/* 8007454C 3B DE 00 01 */ addi r30, r30, 1 -/* 80074550 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074554 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80074558 41 80 FF 84 */ blt lbl_800744DC -/* 8007455C C0 3D 00 34 */ lfs f1, 0x34(r29) -/* 80074560 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074564 48 2E DC C5 */ bl _restgpr_29 -/* 80074568 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007456C 7C 08 03 A6 */ mtlr r0 -/* 80074570 38 21 00 20 */ addi r1, r1, 0x20 -/* 80074574 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s b/asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s deleted file mode 100644 index f601482245c..00000000000 --- a/asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_800743B4: -/* 800743B4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800743B8 7C 08 02 A6 */ mflr r0 -/* 800743BC 90 01 00 24 */ stw r0, 0x24(r1) -/* 800743C0 39 61 00 20 */ addi r11, r1, 0x20 -/* 800743C4 48 2E DE 19 */ bl _savegpr_29 -/* 800743C8 7C 7E 1B 78 */ mr r30, r3 -/* 800743CC 7C 9D 23 78 */ mr r29, r4 -/* 800743D0 38 7D 00 14 */ addi r3, r29, 0x14 -/* 800743D4 48 1F 3D 4D */ bl ClearPi__13cBgS_PolyInfoFv -/* 800743D8 80 1D 00 4C */ lwz r0, 0x4c(r29) -/* 800743DC 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a -/* 800743E0 90 1D 00 4C */ stw r0, 0x4c(r29) -/* 800743E4 7F A3 EB 78 */ mr r3, r29 -/* 800743E8 48 1F 3B 59 */ bl PreCalc__11cBgS_LinChkFv -/* 800743EC 7F DF F3 78 */ mr r31, r30 -/* 800743F0 3B C0 00 00 */ li r30, 0 -lbl_800743F4: -/* 800743F4 88 1F 00 04 */ lbz r0, 4(r31) -/* 800743F8 28 00 00 00 */ cmplwi r0, 0 -/* 800743FC 41 82 00 74 */ beq lbl_80074470 -/* 80074400 80 7F 00 00 */ lwz r3, 0(r31) -/* 80074404 81 83 00 04 */ lwz r12, 4(r3) -/* 80074408 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8007440C 7D 89 03 A6 */ mtctr r12 -/* 80074410 4E 80 04 21 */ bctrl -/* 80074414 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074418 40 82 00 58 */ bne lbl_80074470 -/* 8007441C 7F A3 EB 78 */ mr r3, r29 -/* 80074420 80 9F 00 08 */ lwz r4, 8(r31) -/* 80074424 48 1F 37 B9 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 80074428 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007442C 40 82 00 44 */ bne lbl_80074470 -/* 80074430 80 7F 00 00 */ lwz r3, 0(r31) -/* 80074434 7F A4 EB 78 */ mr r4, r29 -/* 80074438 81 83 00 04 */ lwz r12, 4(r3) -/* 8007443C 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80074440 7D 89 03 A6 */ mtctr r12 -/* 80074444 4E 80 04 21 */ bctrl -/* 80074448 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007444C 41 82 00 24 */ beq lbl_80074470 -/* 80074450 38 7D 00 14 */ addi r3, r29, 0x14 -/* 80074454 7F C4 F3 78 */ mr r4, r30 -/* 80074458 80 BF 00 00 */ lwz r5, 0(r31) -/* 8007445C 80 DF 00 08 */ lwz r6, 8(r31) -/* 80074460 48 1F 3D 0D */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -/* 80074464 80 1D 00 4C */ lwz r0, 0x4c(r29) -/* 80074468 60 00 00 10 */ ori r0, r0, 0x10 -/* 8007446C 90 1D 00 4C */ stw r0, 0x4c(r29) -lbl_80074470: -/* 80074470 3B DE 00 01 */ addi r30, r30, 1 -/* 80074474 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80074478 3B FF 00 14 */ addi r31, r31, 0x14 -/* 8007447C 41 80 FF 78 */ blt lbl_800743F4 -/* 80074480 80 1D 00 4C */ lwz r0, 0x4c(r29) -/* 80074484 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f -/* 80074488 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007448C 48 2E DD 9D */ bl _restgpr_29 -/* 80074490 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80074494 7C 08 03 A6 */ mtlr r0 -/* 80074498 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007449C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Move__4dBgSFv.s b/asm/d/bg/d_bg_s/Move__4dBgSFv.s deleted file mode 100644 index 82f1738a36b..00000000000 --- a/asm/d/bg/d_bg_s/Move__4dBgSFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_800749A8: -/* 800749A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800749AC 7C 08 02 A6 */ mflr r0 -/* 800749B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800749B4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800749B8 93 C1 00 08 */ stw r30, 8(r1) -/* 800749BC 7C 7F 1B 78 */ mr r31, r3 -/* 800749C0 3B C0 00 00 */ li r30, 0 -lbl_800749C4: -/* 800749C4 88 1F 00 04 */ lbz r0, 4(r31) -/* 800749C8 28 00 00 00 */ cmplwi r0, 0 -/* 800749CC 41 82 00 14 */ beq lbl_800749E0 -/* 800749D0 80 7F 00 00 */ lwz r3, 0(r31) -/* 800749D4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 800749D8 A8 84 04 E6 */ lha r4, 0x4e6(r4) -/* 800749DC 48 00 9D 05 */ bl CalcDiffShapeAngleY__9dBgW_BaseFs -lbl_800749E0: -/* 800749E0 3B DE 00 01 */ addi r30, r30, 1 -/* 800749E4 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 800749E8 3B FF 00 14 */ addi r31, r31, 0x14 -/* 800749EC 41 80 FF D8 */ blt lbl_800749C4 -/* 800749F0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800749F4 83 C1 00 08 */ lwz r30, 8(r1) -/* 800749F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800749FC 7C 08 03 A6 */ mtlr r0 -/* 80074A00 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074A04 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s b/asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s deleted file mode 100644 index d42a811c5a0..00000000000 --- a/asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s +++ /dev/null @@ -1,76 +0,0 @@ -lbl_80074144: -/* 80074144 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80074148 7C 08 02 A6 */ mflr r0 -/* 8007414C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80074150 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074154 48 2E E0 81 */ bl _savegpr_27 -/* 80074158 7C 7B 1B 78 */ mr r27, r3 -/* 8007415C 7C 9C 23 79 */ or. r28, r4, r4 -/* 80074160 7C BD 2B 78 */ mr r29, r5 -/* 80074164 7C DE 33 78 */ mr r30, r6 -/* 80074168 40 82 00 0C */ bne lbl_80074174 -/* 8007416C 38 60 00 01 */ li r3, 1 -/* 80074170 48 00 00 C8 */ b lbl_80074238 -lbl_80074174: -/* 80074174 7F 83 E3 78 */ mr r3, r28 -/* 80074178 48 1F 40 5D */ bl ChkUsed__9cBgW_BgIdCFv -/* 8007417C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074180 41 82 00 0C */ beq lbl_8007418C -/* 80074184 38 60 00 01 */ li r3, 1 -/* 80074188 48 00 00 B0 */ b lbl_80074238 -lbl_8007418C: -/* 8007418C 7F 83 E3 78 */ mr r3, r28 -/* 80074190 81 9C 00 04 */ lwz r12, 4(r28) -/* 80074194 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80074198 7D 89 03 A6 */ mtctr r12 -/* 8007419C 4E 80 04 21 */ bctrl -/* 800741A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800741A4 41 82 00 0C */ beq lbl_800741B0 -/* 800741A8 38 60 00 01 */ li r3, 1 -/* 800741AC 48 00 00 8C */ b lbl_80074238 -lbl_800741B0: -/* 800741B0 80 8D 89 E0 */ lwz r4, l_SetCounter(r13) -/* 800741B4 7C 9F 23 78 */ mr r31, r4 -lbl_800741B8: -/* 800741B8 1C 1F 00 14 */ mulli r0, r31, 0x14 -/* 800741BC 7C 7B 02 14 */ add r3, r27, r0 -/* 800741C0 88 03 00 04 */ lbz r0, 4(r3) -/* 800741C4 28 00 00 00 */ cmplwi r0, 0 -/* 800741C8 40 82 00 4C */ bne lbl_80074214 -/* 800741CC 7F 84 E3 78 */ mr r4, r28 -/* 800741D0 7F A5 EB 78 */ mr r5, r29 -/* 800741D4 7F C6 F3 78 */ mr r6, r30 -/* 800741D8 81 83 00 10 */ lwz r12, 0x10(r3) -/* 800741DC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 800741E0 7D 89 03 A6 */ mtctr r12 -/* 800741E4 4E 80 04 21 */ bctrl -/* 800741E8 7F 83 E3 78 */ mr r3, r28 -/* 800741EC 7F E4 FB 78 */ mr r4, r31 -/* 800741F0 48 1F 3F D1 */ bl Regist__9cBgW_BgIdFi -/* 800741F4 38 1F 00 01 */ addi r0, r31, 1 -/* 800741F8 90 0D 89 E0 */ stw r0, l_SetCounter(r13) -/* 800741FC 2C 00 01 00 */ cmpwi r0, 0x100 -/* 80074200 41 80 00 0C */ blt lbl_8007420C -/* 80074204 38 00 00 00 */ li r0, 0 -/* 80074208 90 0D 89 E0 */ stw r0, l_SetCounter(r13) -lbl_8007420C: -/* 8007420C 38 60 00 00 */ li r3, 0 -/* 80074210 48 00 00 28 */ b lbl_80074238 -lbl_80074214: -/* 80074214 3B FF 00 01 */ addi r31, r31, 1 -/* 80074218 2C 1F 01 00 */ cmpwi r31, 0x100 -/* 8007421C 41 80 00 08 */ blt lbl_80074224 -/* 80074220 3B E0 00 00 */ li r31, 0 -lbl_80074224: -/* 80074224 7C 04 F8 00 */ cmpw r4, r31 -/* 80074228 40 82 FF 90 */ bne lbl_800741B8 -/* 8007422C 7F 83 E3 78 */ mr r3, r28 -/* 80074230 48 1F 3F 99 */ bl Release__9cBgW_BgIdFv -/* 80074234 38 60 00 01 */ li r3, 1 -lbl_80074238: -/* 80074238 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007423C 48 2E DF E5 */ bl _restgpr_27 -/* 80074240 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80074244 7C 08 03 A6 */ mtlr r0 -/* 80074248 38 21 00 20 */ addi r1, r1, 0x20 -/* 8007424C 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s b/asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s deleted file mode 100644 index 242cdd1c9da..00000000000 --- a/asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s +++ /dev/null @@ -1,49 +0,0 @@ -lbl_80074A08: -/* 80074A08 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80074A0C 7C 08 02 A6 */ mflr r0 -/* 80074A10 90 01 00 24 */ stw r0, 0x24(r1) -/* 80074A14 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074A18 48 2E D7 C5 */ bl _savegpr_29 -/* 80074A1C 7C 7D 1B 78 */ mr r29, r3 -/* 80074A20 7C 9E 23 79 */ or. r30, r4, r4 -/* 80074A24 7C BF 2B 78 */ mr r31, r5 -/* 80074A28 40 82 00 0C */ bne lbl_80074A34 -/* 80074A2C 38 60 00 01 */ li r3, 1 -/* 80074A30 48 00 00 6C */ b lbl_80074A9C -lbl_80074A34: -/* 80074A34 28 1F 00 00 */ cmplwi r31, 0 -/* 80074A38 41 82 00 40 */ beq lbl_80074A78 -/* 80074A3C 7F C3 F3 78 */ mr r3, r30 -/* 80074A40 81 9E 00 04 */ lwz r12, 4(r30) -/* 80074A44 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80074A48 7D 89 03 A6 */ mtctr r12 -/* 80074A4C 4E 80 04 21 */ bctrl -/* 80074A50 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074A54 41 82 00 24 */ beq lbl_80074A78 -/* 80074A58 7F C3 F3 78 */ mr r3, r30 -/* 80074A5C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80074A60 81 9E 00 04 */ lwz r12, 4(r30) -/* 80074A64 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 80074A68 7D 89 03 A6 */ mtctr r12 -/* 80074A6C 4E 80 04 21 */ bctrl -/* 80074A70 88 1F 04 E2 */ lbz r0, 0x4e2(r31) -/* 80074A74 98 1E 00 09 */ stb r0, 9(r30) -lbl_80074A78: -/* 80074A78 7F A3 EB 78 */ mr r3, r29 -/* 80074A7C 7F C4 F3 78 */ mr r4, r30 -/* 80074A80 28 1F 00 00 */ cmplwi r31, 0 -/* 80074A84 41 82 00 0C */ beq lbl_80074A90 -/* 80074A88 80 BF 00 04 */ lwz r5, 4(r31) -/* 80074A8C 48 00 00 08 */ b lbl_80074A94 -lbl_80074A90: -/* 80074A90 38 A0 FF FF */ li r5, -1 -lbl_80074A94: -/* 80074A94 7F E6 FB 78 */ mr r6, r31 -/* 80074A98 4B FF F6 AD */ bl Regist__4cBgSFP9dBgW_BaseUiPv -lbl_80074A9C: -/* 80074A9C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074AA0 48 2E D7 89 */ bl _restgpr_29 -/* 80074AA4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80074AA8 7C 08 03 A6 */ mtlr r0 -/* 80074AAC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80074AB0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s b/asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s deleted file mode 100644 index a2d76c5c605..00000000000 --- a/asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s +++ /dev/null @@ -1,42 +0,0 @@ -lbl_80074250: -/* 80074250 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80074254 7C 08 02 A6 */ mflr r0 -/* 80074258 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007425C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074260 48 2E DF 7D */ bl _savegpr_29 -/* 80074264 7C 7D 1B 78 */ mr r29, r3 -/* 80074268 7C 9E 23 79 */ or. r30, r4, r4 -/* 8007426C 40 82 00 0C */ bne lbl_80074278 -/* 80074270 38 60 00 01 */ li r3, 1 -/* 80074274 48 00 00 58 */ b lbl_800742CC -lbl_80074278: -/* 80074278 A3 FE 00 00 */ lhz r31, 0(r30) -/* 8007427C 7F C3 F3 78 */ mr r3, r30 -/* 80074280 48 1F 3F 55 */ bl ChkUsed__9cBgW_BgIdCFv -/* 80074284 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80074288 41 82 00 38 */ beq lbl_800742C0 -/* 8007428C 2C 1F 00 00 */ cmpwi r31, 0 -/* 80074290 41 80 00 30 */ blt lbl_800742C0 -/* 80074294 2C 1F 01 00 */ cmpwi r31, 0x100 -/* 80074298 40 80 00 28 */ bge lbl_800742C0 -/* 8007429C 1C 1F 00 14 */ mulli r0, r31, 0x14 -/* 800742A0 7C 7D 02 14 */ add r3, r29, r0 -/* 800742A4 88 03 00 04 */ lbz r0, 4(r3) -/* 800742A8 28 00 00 00 */ cmplwi r0, 0 -/* 800742AC 41 82 00 14 */ beq lbl_800742C0 -/* 800742B0 4B FF FE 79 */ bl Release__11cBgS_ChkElmFv -/* 800742B4 7F C3 F3 78 */ mr r3, r30 -/* 800742B8 48 1F 3F 11 */ bl Release__9cBgW_BgIdFv -/* 800742BC 48 00 00 0C */ b lbl_800742C8 -lbl_800742C0: -/* 800742C0 38 60 00 01 */ li r3, 1 -/* 800742C4 48 00 00 08 */ b lbl_800742CC -lbl_800742C8: -/* 800742C8 38 60 00 00 */ li r3, 0 -lbl_800742CC: -/* 800742CC 39 61 00 20 */ addi r11, r1, 0x20 -/* 800742D0 48 2E DF 59 */ bl _restgpr_29 -/* 800742D4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800742D8 7C 08 03 A6 */ mtlr r0 -/* 800742DC 38 21 00 20 */ addi r1, r1, 0x20 -/* 800742E0 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s b/asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s deleted file mode 100644 index f39de48ce82..00000000000 --- a/asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_8007549C: -/* 8007549C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 800754A0 7C 08 02 A6 */ mflr r0 -/* 800754A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 800754A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800754AC 48 2E CD 31 */ bl _savegpr_29 -/* 800754B0 7C 7E 1B 78 */ mr r30, r3 -/* 800754B4 7C 9D 23 78 */ mr r29, r4 -/* 800754B8 7F A3 EB 78 */ mr r3, r29 -/* 800754BC 48 00 3C 69 */ bl Init__12dBgS_RoofChkFv -/* 800754C0 7F DF F3 78 */ mr r31, r30 -/* 800754C4 3B C0 00 00 */ li r30, 0 -lbl_800754C8: -/* 800754C8 88 1F 00 04 */ lbz r0, 4(r31) -/* 800754CC 28 00 00 00 */ cmplwi r0, 0 -/* 800754D0 41 82 00 68 */ beq lbl_80075538 -/* 800754D4 80 7F 00 00 */ lwz r3, 0(r31) -/* 800754D8 81 83 00 04 */ lwz r12, 4(r3) -/* 800754DC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800754E0 7D 89 03 A6 */ mtctr r12 -/* 800754E4 4E 80 04 21 */ bctrl -/* 800754E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800754EC 40 82 00 4C */ bne lbl_80075538 -/* 800754F0 38 7D 00 10 */ addi r3, r29, 0x10 -/* 800754F4 80 9F 00 08 */ lwz r4, 8(r31) -/* 800754F8 48 1F 26 E5 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 800754FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075500 40 82 00 38 */ bne lbl_80075538 -/* 80075504 80 7F 00 00 */ lwz r3, 0(r31) -/* 80075508 7F A4 EB 78 */ mr r4, r29 -/* 8007550C 81 83 00 04 */ lwz r12, 4(r3) -/* 80075510 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 80075514 7D 89 03 A6 */ mtctr r12 -/* 80075518 4E 80 04 21 */ bctrl -/* 8007551C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075520 41 82 00 18 */ beq lbl_80075538 -/* 80075524 7F A3 EB 78 */ mr r3, r29 -/* 80075528 7F C4 F3 78 */ mr r4, r30 -/* 8007552C 80 BF 00 00 */ lwz r5, 0(r31) -/* 80075530 80 DF 00 08 */ lwz r6, 8(r31) -/* 80075534 48 1F 2C 39 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -lbl_80075538: -/* 80075538 3B DE 00 01 */ addi r30, r30, 1 -/* 8007553C 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 80075540 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80075544 41 80 FF 84 */ blt lbl_800754C8 -/* 80075548 C0 3D 00 4C */ lfs f1, 0x4c(r29) -/* 8007554C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075550 48 2E CC D9 */ bl _restgpr_29 -/* 80075554 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075558 7C 08 03 A6 */ mtlr r0 -/* 8007555C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075560 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s b/asm/d/bg/d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s deleted file mode 100644 index dbbc08544d0..00000000000 --- a/asm/d/bg/d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_80074840: -/* 80074840 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80074844 7C 08 02 A6 */ mflr r0 -/* 80074848 90 01 00 24 */ stw r0, 0x24(r1) -/* 8007484C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074850 48 2E D9 8D */ bl _savegpr_29 -/* 80074854 7C 9D 23 78 */ mr r29, r4 -/* 80074858 7C 7F 1B 78 */ mr r31, r3 -/* 8007485C 3B C0 00 00 */ li r30, 0 -lbl_80074860: -/* 80074860 88 1F 00 04 */ lbz r0, 4(r31) -/* 80074864 28 00 00 00 */ cmplwi r0, 0 -/* 80074868 41 82 00 1C */ beq lbl_80074884 -/* 8007486C 80 7F 00 00 */ lwz r3, 0(r31) -/* 80074870 7F A4 EB 78 */ mr r4, r29 -/* 80074874 81 83 00 04 */ lwz r12, 4(r3) -/* 80074878 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8007487C 7D 89 03 A6 */ mtctr r12 -/* 80074880 4E 80 04 21 */ bctrl -lbl_80074884: -/* 80074884 3B DE 00 01 */ addi r30, r30, 1 -/* 80074888 2C 1E 01 00 */ cmpwi r30, 0x100 -/* 8007488C 3B FF 00 14 */ addi r31, r31, 0x14 -/* 80074890 41 80 FF D0 */ blt lbl_80074860 -/* 80074894 39 61 00 20 */ addi r11, r1, 0x20 -/* 80074898 48 2E D9 91 */ bl _restgpr_29 -/* 8007489C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800748A0 7C 08 03 A6 */ mtlr r0 -/* 800748A4 38 21 00 20 */ addi r1, r1, 0x20 -/* 800748A8 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s b/asm/d/bg/d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s deleted file mode 100644 index 16cbb0be73f..00000000000 --- a/asm/d/bg/d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80075688: -/* 80075688 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8007568C 7C 08 02 A6 */ mflr r0 -/* 80075690 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075694 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075698 48 2E CB 3D */ bl _savegpr_27 -/* 8007569C 7C 7D 1B 78 */ mr r29, r3 -/* 800756A0 7C 9B 23 78 */ mr r27, r4 -/* 800756A4 7C BC 2B 78 */ mr r28, r5 -/* 800756A8 80 04 00 50 */ lwz r0, 0x50(r4) -/* 800756AC 28 00 00 00 */ cmplwi r0, 0 -/* 800756B0 40 82 00 0C */ bne lbl_800756BC -/* 800756B4 38 60 00 00 */ li r3, 0 -/* 800756B8 48 00 00 A4 */ b lbl_8007575C -lbl_800756BC: -/* 800756BC 3B E0 00 00 */ li r31, 0 -/* 800756C0 38 7B 00 14 */ addi r3, r27, 0x14 -/* 800756C4 48 1F 2A 5D */ bl ClearPi__13cBgS_PolyInfoFv -/* 800756C8 7F BE EB 78 */ mr r30, r29 -/* 800756CC 3B A0 00 00 */ li r29, 0 -lbl_800756D0: -/* 800756D0 88 1E 00 04 */ lbz r0, 4(r30) -/* 800756D4 28 00 00 00 */ cmplwi r0, 0 -/* 800756D8 41 82 00 70 */ beq lbl_80075748 -/* 800756DC 80 7E 00 00 */ lwz r3, 0(r30) -/* 800756E0 81 83 00 04 */ lwz r12, 4(r3) -/* 800756E4 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800756E8 7D 89 03 A6 */ mtctr r12 -/* 800756EC 4E 80 04 21 */ bctrl -/* 800756F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800756F4 40 82 00 54 */ bne lbl_80075748 -/* 800756F8 38 7B 00 24 */ addi r3, r27, 0x24 -/* 800756FC 80 9E 00 08 */ lwz r4, 8(r30) -/* 80075700 48 1F 24 DD */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 80075704 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075708 40 82 00 40 */ bne lbl_80075748 -/* 8007570C 80 7E 00 00 */ lwz r3, 0(r30) -/* 80075710 7F 64 DB 78 */ mr r4, r27 -/* 80075714 7F 85 E3 78 */ mr r5, r28 -/* 80075718 81 83 00 04 */ lwz r12, 4(r3) -/* 8007571C 81 8C 00 5C */ lwz r12, 0x5c(r12) -/* 80075720 7D 89 03 A6 */ mtctr r12 -/* 80075724 4E 80 04 21 */ bctrl -/* 80075728 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007572C 41 82 00 1C */ beq lbl_80075748 -/* 80075730 38 7B 00 14 */ addi r3, r27, 0x14 -/* 80075734 7F A4 EB 78 */ mr r4, r29 -/* 80075738 80 BE 00 00 */ lwz r5, 0(r30) -/* 8007573C 80 DE 00 08 */ lwz r6, 8(r30) -/* 80075740 48 1F 2A 2D */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -/* 80075744 3B E0 00 01 */ li r31, 1 -lbl_80075748: -/* 80075748 3B BD 00 01 */ addi r29, r29, 1 -/* 8007574C 2C 1D 01 00 */ cmpwi r29, 0x100 -/* 80075750 3B DE 00 14 */ addi r30, r30, 0x14 -/* 80075754 41 80 FF 7C */ blt lbl_800756D0 -/* 80075758 7F E3 FB 78 */ mr r3, r31 -lbl_8007575C: -/* 8007575C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075760 48 2E CA C1 */ bl _restgpr_27 -/* 80075764 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075768 7C 08 03 A6 */ mtlr r0 -/* 8007576C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075770 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s b/asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s deleted file mode 100644 index bb726dcdc38..00000000000 --- a/asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s +++ /dev/null @@ -1,77 +0,0 @@ -lbl_80075564: -/* 80075564 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075568 7C 08 02 A6 */ mflr r0 -/* 8007556C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075570 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075574 48 2E CC 61 */ bl _savegpr_27 -/* 80075578 7C 7C 1B 78 */ mr r28, r3 -/* 8007557C 7C 9B 23 78 */ mr r27, r4 -/* 80075580 3B E0 00 00 */ li r31, 0 -/* 80075584 7F 63 DB 78 */ mr r3, r27 -/* 80075588 48 00 37 85 */ bl Init__14dBgS_SplGrpChkFv -/* 8007558C 7F 9E E3 78 */ mr r30, r28 -/* 80075590 3B A0 00 00 */ li r29, 0 -lbl_80075594: -/* 80075594 88 1E 00 04 */ lbz r0, 4(r30) -/* 80075598 28 00 00 00 */ cmplwi r0, 0 -/* 8007559C 41 82 00 C0 */ beq lbl_8007565C -/* 800755A0 80 7E 00 00 */ lwz r3, 0(r30) -/* 800755A4 81 83 00 04 */ lwz r12, 4(r3) -/* 800755A8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800755AC 7D 89 03 A6 */ mtctr r12 -/* 800755B0 4E 80 04 21 */ bctrl -/* 800755B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800755B8 40 82 00 A4 */ bne lbl_8007565C -/* 800755BC 38 7B 00 10 */ addi r3, r27, 0x10 -/* 800755C0 80 9E 00 08 */ lwz r4, 8(r30) -/* 800755C4 48 1F 26 19 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 800755C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800755CC 40 82 00 90 */ bne lbl_8007565C -/* 800755D0 83 9E 00 00 */ lwz r28, 0(r30) -/* 800755D4 80 1B 00 50 */ lwz r0, 0x50(r27) -/* 800755D8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d -/* 800755DC 41 82 00 3C */ beq lbl_80075618 -/* 800755E0 7F 83 E3 78 */ mr r3, r28 -/* 800755E4 81 9C 00 04 */ lwz r12, 4(r28) -/* 800755E8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 800755EC 7D 89 03 A6 */ mtctr r12 -/* 800755F0 4E 80 04 21 */ bctrl -/* 800755F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800755F8 41 82 00 64 */ beq lbl_8007565C -/* 800755FC 7F 83 E3 78 */ mr r3, r28 -/* 80075600 81 9C 00 04 */ lwz r12, 4(r28) -/* 80075604 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80075608 7D 89 03 A6 */ mtctr r12 -/* 8007560C 4E 80 04 21 */ bctrl -/* 80075610 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075614 40 82 00 48 */ bne lbl_8007565C -lbl_80075618: -/* 80075618 7F 83 E3 78 */ mr r3, r28 -/* 8007561C 7F 64 DB 78 */ mr r4, r27 -/* 80075620 81 9C 00 04 */ lwz r12, 4(r28) -/* 80075624 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 80075628 7D 89 03 A6 */ mtctr r12 -/* 8007562C 4E 80 04 21 */ bctrl -/* 80075630 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075634 41 82 00 28 */ beq lbl_8007565C -/* 80075638 3B E0 00 01 */ li r31, 1 -/* 8007563C 7F 63 DB 78 */ mr r3, r27 -/* 80075640 7F A4 EB 78 */ mr r4, r29 -/* 80075644 80 BE 00 00 */ lwz r5, 0(r30) -/* 80075648 80 DE 00 08 */ lwz r6, 8(r30) -/* 8007564C 48 1F 2B 21 */ bl SetActorInfo__13cBgS_PolyInfoFiPvUi -/* 80075650 80 1B 00 50 */ lwz r0, 0x50(r27) -/* 80075654 60 00 00 01 */ ori r0, r0, 1 -/* 80075658 90 1B 00 50 */ stw r0, 0x50(r27) -lbl_8007565C: -/* 8007565C 3B BD 00 01 */ addi r29, r29, 1 -/* 80075660 2C 1D 01 00 */ cmpwi r29, 0x100 -/* 80075664 3B DE 00 14 */ addi r30, r30, 0x14 -/* 80075668 41 80 FF 2C */ blt lbl_80075594 -/* 8007566C 7F E3 FB 78 */ mr r3, r31 -/* 80075670 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075674 48 2E CB AD */ bl _restgpr_27 -/* 80075678 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8007567C 7C 08 03 A6 */ mtlr r0 -/* 80075680 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075684 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/WallCorrectSort__4dBgSFP9dBgS_Acch.s b/asm/d/bg/d_bg_s/WallCorrectSort__4dBgSFP9dBgS_Acch.s deleted file mode 100644 index 9ff50cb2d14..00000000000 --- a/asm/d/bg/d_bg_s/WallCorrectSort__4dBgSFP9dBgS_Acch.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_80075374: -/* 80075374 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075378 7C 08 02 A6 */ mflr r0 -/* 8007537C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075380 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075384 48 2E CE 4D */ bl _savegpr_26 -/* 80075388 7C 7A 1B 78 */ mr r26, r3 -/* 8007538C 7C 9B 23 78 */ mr r27, r4 -/* 80075390 7F 63 DB 78 */ mr r3, r27 -/* 80075394 48 00 1F 99 */ bl CalcWallRR__9dBgS_AcchFv -/* 80075398 7F 63 DB 78 */ mr r3, r27 -/* 8007539C 48 00 1F 4D */ bl CalcMovePosWork__9dBgS_AcchFv -/* 800753A0 3B E0 00 00 */ li r31, 0 -lbl_800753A4: -/* 800753A4 7F 5E D3 78 */ mr r30, r26 -/* 800753A8 3B A0 00 00 */ li r29, 0 -lbl_800753AC: -/* 800753AC 88 1E 00 04 */ lbz r0, 4(r30) -/* 800753B0 28 00 00 00 */ cmplwi r0, 0 -/* 800753B4 41 82 00 B4 */ beq lbl_80075468 -/* 800753B8 80 7E 00 00 */ lwz r3, 0(r30) -/* 800753BC 81 83 00 04 */ lwz r12, 4(r3) -/* 800753C0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 800753C4 7D 89 03 A6 */ mtctr r12 -/* 800753C8 4E 80 04 21 */ bctrl -/* 800753CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800753D0 40 82 00 98 */ bne lbl_80075468 -/* 800753D4 83 9E 00 00 */ lwz r28, 0(r30) -/* 800753D8 88 1C 00 08 */ lbz r0, 8(r28) -/* 800753DC 7C 00 F8 00 */ cmpw r0, r31 -/* 800753E0 40 82 00 88 */ bne lbl_80075468 -/* 800753E4 7F 63 DB 78 */ mr r3, r27 -/* 800753E8 80 9E 00 08 */ lwz r4, 8(r30) -/* 800753EC 48 1F 27 F1 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 800753F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800753F4 40 82 00 74 */ bne lbl_80075468 -/* 800753F8 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 800753FC 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 80075400 41 82 00 3C */ beq lbl_8007543C -/* 80075404 7F 83 E3 78 */ mr r3, r28 -/* 80075408 81 9C 00 04 */ lwz r12, 4(r28) -/* 8007540C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80075410 7D 89 03 A6 */ mtctr r12 -/* 80075414 4E 80 04 21 */ bctrl -/* 80075418 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8007541C 41 82 00 4C */ beq lbl_80075468 -/* 80075420 7F 83 E3 78 */ mr r3, r28 -/* 80075424 81 9C 00 04 */ lwz r12, 4(r28) -/* 80075428 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8007542C 7D 89 03 A6 */ mtctr r12 -/* 80075430 4E 80 04 21 */ bctrl -/* 80075434 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075438 40 82 00 30 */ bne lbl_80075468 -lbl_8007543C: -/* 8007543C 7F 63 DB 78 */ mr r3, r27 -/* 80075440 7F A4 EB 78 */ mr r4, r29 -/* 80075444 80 BE 00 00 */ lwz r5, 0(r30) -/* 80075448 80 DE 00 08 */ lwz r6, 8(r30) -/* 8007544C 48 00 1E 2D */ bl SetNowActorInfo__9dBgS_AcchFiPvUi -/* 80075450 7F 83 E3 78 */ mr r3, r28 -/* 80075454 7F 64 DB 78 */ mr r4, r27 -/* 80075458 81 9C 00 04 */ lwz r12, 4(r28) -/* 8007545C 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 80075460 7D 89 03 A6 */ mtctr r12 -/* 80075464 4E 80 04 21 */ bctrl -lbl_80075468: -/* 80075468 3B BD 00 01 */ addi r29, r29, 1 -/* 8007546C 2C 1D 01 00 */ cmpwi r29, 0x100 -/* 80075470 3B DE 00 14 */ addi r30, r30, 0x14 -/* 80075474 41 80 FF 38 */ blt lbl_800753AC -/* 80075478 3B FF 00 01 */ addi r31, r31, 1 -/* 8007547C 2C 1F 00 03 */ cmpwi r31, 3 -/* 80075480 41 80 FF 24 */ blt lbl_800753A4 -/* 80075484 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075488 48 2E CD 95 */ bl _restgpr_26 -/* 8007548C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075490 7C 08 03 A6 */ mtlr r0 -/* 80075494 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075498 4E 80 00 20 */ blr diff --git a/asm/d/bg/d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s b/asm/d/bg/d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s deleted file mode 100644 index 7c7e79e70ca..00000000000 --- a/asm/d/bg/d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s +++ /dev/null @@ -1,79 +0,0 @@ -lbl_8007524C: -/* 8007524C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80075250 7C 08 02 A6 */ mflr r0 -/* 80075254 90 01 00 24 */ stw r0, 0x24(r1) -/* 80075258 39 61 00 20 */ addi r11, r1, 0x20 -/* 8007525C 48 2E CF 75 */ bl _savegpr_26 -/* 80075260 7C 7A 1B 78 */ mr r26, r3 -/* 80075264 7C 9B 23 78 */ mr r27, r4 -/* 80075268 7F 63 DB 78 */ mr r3, r27 -/* 8007526C 48 00 20 C1 */ bl CalcWallRR__9dBgS_AcchFv -/* 80075270 7F 63 DB 78 */ mr r3, r27 -/* 80075274 48 00 20 75 */ bl CalcMovePosWork__9dBgS_AcchFv -/* 80075278 3B E0 00 00 */ li r31, 0 -lbl_8007527C: -/* 8007527C 7F 5E D3 78 */ mr r30, r26 -/* 80075280 3B A0 00 00 */ li r29, 0 -lbl_80075284: -/* 80075284 88 1E 00 04 */ lbz r0, 4(r30) -/* 80075288 28 00 00 00 */ cmplwi r0, 0 -/* 8007528C 41 82 00 B4 */ beq lbl_80075340 -/* 80075290 80 7E 00 00 */ lwz r3, 0(r30) -/* 80075294 81 83 00 04 */ lwz r12, 4(r3) -/* 80075298 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8007529C 7D 89 03 A6 */ mtctr r12 -/* 800752A0 4E 80 04 21 */ bctrl -/* 800752A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800752A8 40 82 00 98 */ bne lbl_80075340 -/* 800752AC 83 9E 00 00 */ lwz r28, 0(r30) -/* 800752B0 88 1C 00 08 */ lbz r0, 8(r28) -/* 800752B4 7C 00 F8 00 */ cmpw r0, r31 -/* 800752B8 40 82 00 88 */ bne lbl_80075340 -/* 800752BC 7F 63 DB 78 */ mr r3, r27 -/* 800752C0 80 9E 00 08 */ lwz r4, 8(r30) -/* 800752C4 48 1F 29 19 */ bl ChkSameActorPid__8cBgS_ChkCFUi -/* 800752C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800752CC 40 82 00 74 */ bne lbl_80075340 -/* 800752D0 80 1B 00 2C */ lwz r0, 0x2c(r27) -/* 800752D4 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb -/* 800752D8 41 82 00 3C */ beq lbl_80075314 -/* 800752DC 7F 83 E3 78 */ mr r3, r28 -/* 800752E0 81 9C 00 04 */ lwz r12, 4(r28) -/* 800752E4 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 800752E8 7D 89 03 A6 */ mtctr r12 -/* 800752EC 4E 80 04 21 */ bctrl -/* 800752F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 800752F4 41 82 00 4C */ beq lbl_80075340 -/* 800752F8 7F 83 E3 78 */ mr r3, r28 -/* 800752FC 81 9C 00 04 */ lwz r12, 4(r28) -/* 80075300 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80075304 7D 89 03 A6 */ mtctr r12 -/* 80075308 4E 80 04 21 */ bctrl -/* 8007530C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80075310 40 82 00 30 */ bne lbl_80075340 -lbl_80075314: -/* 80075314 7F 63 DB 78 */ mr r3, r27 -/* 80075318 7F A4 EB 78 */ mr r4, r29 -/* 8007531C 80 BE 00 00 */ lwz r5, 0(r30) -/* 80075320 80 DE 00 08 */ lwz r6, 8(r30) -/* 80075324 48 00 1F 55 */ bl SetNowActorInfo__9dBgS_AcchFiPvUi -/* 80075328 7F 83 E3 78 */ mr r3, r28 -/* 8007532C 7F 64 DB 78 */ mr r4, r27 -/* 80075330 81 9C 00 04 */ lwz r12, 4(r28) -/* 80075334 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 80075338 7D 89 03 A6 */ mtctr r12 -/* 8007533C 4E 80 04 21 */ bctrl -lbl_80075340: -/* 80075340 3B BD 00 01 */ addi r29, r29, 1 -/* 80075344 2C 1D 01 00 */ cmpwi r29, 0x100 -/* 80075348 3B DE 00 14 */ addi r30, r30, 0x14 -/* 8007534C 41 80 FF 38 */ blt lbl_80075284 -/* 80075350 3B FF 00 01 */ addi r31, r31, 1 -/* 80075354 2C 1F 00 03 */ cmpwi r31, 3 -/* 80075358 41 80 FF 24 */ blt lbl_8007527C -/* 8007535C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80075360 48 2E CE BD */ bl _restgpr_26 -/* 80075364 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80075368 7C 08 03 A6 */ mtlr r0 -/* 8007536C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80075370 4E 80 00 20 */ blr diff --git a/asm/d/d_attention/__sinit_d_attention_cpp.s b/asm/d/d_attention/__sinit_d_attention_cpp.s deleted file mode 100644 index 8b21f6a961d..00000000000 --- a/asm/d/d_attention/__sinit_d_attention_cpp.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_8007400C: -/* 8007400C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80074010 7C 08 02 A6 */ mflr r0 -/* 80074014 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074018 3C 60 80 42 */ lis r3, g_AttDwHIO@ha /* 0x80424B0C@ha */ -/* 8007401C 38 63 4B 0C */ addi r3, r3, g_AttDwHIO@l /* 0x80424B0C@l */ -/* 80074020 4B FF C1 39 */ bl __ct__15dAttDrawParam_cFv -/* 80074024 3C 80 80 07 */ lis r4, __dt__15dAttDrawParam_cFv@ha /* 0x80073FC4@ha */ -/* 80074028 38 84 3F C4 */ addi r4, r4, __dt__15dAttDrawParam_cFv@l /* 0x80073FC4@l */ -/* 8007402C 3C A0 80 42 */ lis r5, lit_4093@ha /* 0x80424B00@ha */ -/* 80074030 38 A5 4B 00 */ addi r5, r5, lit_4093@l /* 0x80424B00@l */ -/* 80074034 48 2E DB F1 */ bl __register_global_object -/* 80074038 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8007403C 7C 08 03 A6 */ mtlr r0 -/* 80074040 38 21 00 10 */ addi r1, r1, 0x10 -/* 80074044 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject.s b/asm/d/d_demo/JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject.s deleted file mode 100644 index b8954fe3011..00000000000 --- a/asm/d/d_demo/JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject.s +++ /dev/null @@ -1,96 +0,0 @@ -lbl_80039528: -/* 80039528 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003952C 7C 08 02 A6 */ mflr r0 -/* 80039530 90 01 00 24 */ stw r0, 0x24(r1) -/* 80039534 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039538 48 32 8C 9D */ bl _savegpr_27 -/* 8003953C 7C 7B 1B 78 */ mr r27, r3 -/* 80039540 7C 9C 23 78 */ mr r28, r4 -/* 80039544 7C BD 2B 78 */ mr r29, r5 -/* 80039548 7C DE 33 78 */ mr r30, r6 -/* 8003954C 80 63 00 04 */ lwz r3, 4(r3) -/* 80039550 28 03 00 00 */ cmplwi r3, 0 -/* 80039554 40 82 00 0C */ bne lbl_80039560 -/* 80039558 38 60 00 01 */ li r3, 1 -/* 8003955C 48 00 01 04 */ b lbl_80039660 -lbl_80039560: -/* 80039560 2C 1E 00 02 */ cmpwi r30, 2 -/* 80039564 41 82 00 0C */ beq lbl_80039570 -/* 80039568 2C 1E 00 00 */ cmpwi r30, 0 -/* 8003956C 40 82 00 9C */ bne lbl_80039608 -lbl_80039570: -/* 80039570 7F A3 EB 78 */ mr r3, r29 -/* 80039574 38 80 00 00 */ li r4, 0 -/* 80039578 38 A0 00 00 */ li r5, 0 -/* 8003957C 4B FE 41 1D */ bl fopAcM_searchFromName__FPCcUlUl -/* 80039580 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80039584 40 82 00 70 */ bne lbl_800395F4 -/* 80039588 2C 1E 00 02 */ cmpwi r30, 2 -/* 8003958C 40 82 00 60 */ bne lbl_800395EC -/* 80039590 7F A3 EB 78 */ mr r3, r29 -/* 80039594 3C 80 80 38 */ lis r4, d_d_demo__stringBase0@ha /* 0x803797F8@ha */ -/* 80039598 38 84 97 F8 */ addi r4, r4, d_d_demo__stringBase0@l /* 0x803797F8@l */ -/* 8003959C 38 84 00 02 */ addi r4, r4, 2 -/* 800395A0 38 A0 00 05 */ li r5, 5 -/* 800395A4 48 32 F3 B1 */ bl strncmp -/* 800395A8 2C 03 00 00 */ cmpwi r3, 0 -/* 800395AC 40 82 00 40 */ bne lbl_800395EC -/* 800395B0 7F A3 EB 78 */ mr r3, r29 -/* 800395B4 38 80 00 00 */ li r4, 0 -/* 800395B8 38 A0 00 00 */ li r5, 0 -/* 800395BC 38 C0 FF FF */ li r6, -1 -/* 800395C0 38 E0 00 00 */ li r7, 0 -/* 800395C4 39 00 00 00 */ li r8, 0 -/* 800395C8 39 20 00 00 */ li r9, 0 -/* 800395CC 39 40 00 00 */ li r10, 0 -/* 800395D0 4B FE 08 9D */ bl fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv -/* 800395D4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 800395D8 40 82 00 0C */ bne lbl_800395E4 -/* 800395DC 38 60 00 01 */ li r3, 1 -/* 800395E0 48 00 00 80 */ b lbl_80039660 -lbl_800395E4: -/* 800395E4 4B FE 02 E1 */ bl fopAcM_setStageLayer__FPv -/* 800395E8 48 00 00 0C */ b lbl_800395F4 -lbl_800395EC: -/* 800395EC 38 60 00 01 */ li r3, 1 -/* 800395F0 48 00 00 70 */ b lbl_80039660 -lbl_800395F4: -/* 800395F4 80 7B 00 04 */ lwz r3, 4(r27) -/* 800395F8 7F E4 FB 78 */ mr r4, r31 -/* 800395FC 4B FF F9 C5 */ bl appendActor__14dDemo_object_cFP10fopAc_ac_c -/* 80039600 90 7C 00 00 */ stw r3, 0(r28) -/* 80039604 48 00 00 50 */ b lbl_80039654 -lbl_80039608: -/* 80039608 2C 1E 00 03 */ cmpwi r30, 3 -/* 8003960C 40 82 00 10 */ bne lbl_8003961C -/* 80039610 4B FF FA 9D */ bl createCamera__14dDemo_object_cFv -/* 80039614 90 7C 00 00 */ stw r3, 0(r28) -/* 80039618 48 00 00 3C */ b lbl_80039654 -lbl_8003961C: -/* 8003961C 2C 1E 00 04 */ cmpwi r30, 4 -/* 80039620 40 82 00 10 */ bne lbl_80039630 -/* 80039624 4B FF FB 19 */ bl createAmbient__14dDemo_object_cFv -/* 80039628 90 7C 00 00 */ stw r3, 0(r28) -/* 8003962C 48 00 00 28 */ b lbl_80039654 -lbl_80039630: -/* 80039630 2C 1E 00 05 */ cmpwi r30, 5 -/* 80039634 40 82 00 10 */ bne lbl_80039644 -/* 80039638 4B FF FB 81 */ bl appendLight__14dDemo_object_cFv -/* 8003963C 90 7C 00 00 */ stw r3, 0(r28) -/* 80039640 48 00 00 14 */ b lbl_80039654 -lbl_80039644: -/* 80039644 2C 1E 00 06 */ cmpwi r30, 6 -/* 80039648 40 82 00 0C */ bne lbl_80039654 -/* 8003964C 4B FF FC 0D */ bl createFog__14dDemo_object_cFv -/* 80039650 90 7C 00 00 */ stw r3, 0(r28) -lbl_80039654: -/* 80039654 80 1C 00 00 */ lwz r0, 0(r28) -/* 80039658 7C 00 00 34 */ cntlzw r0, r0 -/* 8003965C 54 03 D9 7E */ srwi r3, r0, 5 -lbl_80039660: -/* 80039660 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039664 48 32 8B BD */ bl _restgpr_27 -/* 80039668 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003966C 7C 08 03 A6 */ mtlr r0 -/* 80039670 38 21 00 20 */ addi r1, r1, 0x20 -/* 80039674 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/__ct__14dDemo_object_cFv.s b/asm/d/d_demo/__ct__14dDemo_object_cFv.s deleted file mode 100644 index d4a3c2b4b09..00000000000 --- a/asm/d/d_demo/__ct__14dDemo_object_cFv.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_80038F54: -/* 80038F54 38 00 00 00 */ li r0, 0 -/* 80038F58 98 03 00 00 */ stb r0, 0(r3) -/* 80038F5C 98 03 00 01 */ stb r0, 1(r3) -/* 80038F60 90 03 00 84 */ stw r0, 0x84(r3) -/* 80038F64 90 03 00 88 */ stw r0, 0x88(r3) -/* 80038F68 90 03 00 AC */ stw r0, 0xac(r3) -/* 80038F6C 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/__dt__14dDemo_object_cFv.s b/asm/d/d_demo/__dt__14dDemo_object_cFv.s deleted file mode 100644 index 862b71e9c7f..00000000000 --- a/asm/d/d_demo/__dt__14dDemo_object_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80038F70: -/* 80038F70 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80038F74 7C 08 02 A6 */ mflr r0 -/* 80038F78 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038F7C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80038F80 93 C1 00 08 */ stw r30, 8(r1) -/* 80038F84 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80038F88 7C 9F 23 78 */ mr r31, r4 -/* 80038F8C 41 82 00 18 */ beq lbl_80038FA4 -/* 80038F90 48 00 03 45 */ bl remove__14dDemo_object_cFv -/* 80038F94 7F E0 07 35 */ extsh. r0, r31 -/* 80038F98 40 81 00 0C */ ble lbl_80038FA4 -/* 80038F9C 7F C3 F3 78 */ mr r3, r30 -/* 80038FA0 48 29 5D 9D */ bl __dl__FPv -lbl_80038FA4: -/* 80038FA4 7F C3 F3 78 */ mr r3, r30 -/* 80038FA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80038FAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 80038FB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80038FB4 7C 08 03 A6 */ mtlr r0 -/* 80038FB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80038FBC 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/appendActor__14dDemo_object_cFP10fopAc_ac_c.s b/asm/d/d_demo/appendActor__14dDemo_object_cFP10fopAc_ac_c.s deleted file mode 100644 index 8771face818..00000000000 --- a/asm/d/d_demo/appendActor__14dDemo_object_cFP10fopAc_ac_c.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_80038FC0: -/* 80038FC0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80038FC4 7C 08 02 A6 */ mflr r0 -/* 80038FC8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80038FCC 39 61 00 20 */ addi r11, r1, 0x20 -/* 80038FD0 48 32 92 0D */ bl _savegpr_29 -/* 80038FD4 7C 7D 1B 78 */ mr r29, r3 -/* 80038FD8 7C 9E 23 78 */ mr r30, r4 -/* 80038FDC 80 6D 88 A0 */ lwz r3, m_object__7dDemo_c(r13) -/* 80038FE0 88 84 04 98 */ lbz r4, 0x498(r4) -/* 80038FE4 48 00 00 A5 */ bl getActor__14dDemo_object_cFUc -/* 80038FE8 28 03 00 00 */ cmplwi r3, 0 -/* 80038FEC 41 82 00 08 */ beq lbl_80038FF4 -/* 80038FF0 48 00 00 80 */ b lbl_80039070 -lbl_80038FF4: -/* 80038FF4 88 1D 00 00 */ lbz r0, 0(r29) -/* 80038FF8 28 00 00 20 */ cmplwi r0, 0x20 -/* 80038FFC 41 80 00 0C */ blt lbl_80039008 -/* 80039000 38 60 00 00 */ li r3, 0 -/* 80039004 48 00 00 6C */ b lbl_80039070 -lbl_80039008: -/* 80039008 38 60 00 6C */ li r3, 0x6c -/* 8003900C 48 29 5C 41 */ bl __nw__FUl -/* 80039010 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80039014 41 82 00 0C */ beq lbl_80039020 -/* 80039018 4B FF F0 09 */ bl __ct__13dDemo_actor_cFv -/* 8003901C 7C 7F 1B 78 */ mr r31, r3 -lbl_80039020: -/* 80039020 28 1F 00 00 */ cmplwi r31, 0 -/* 80039024 40 82 00 0C */ bne lbl_80039030 -/* 80039028 38 60 00 00 */ li r3, 0 -/* 8003902C 48 00 00 44 */ b lbl_80039070 -lbl_80039030: -/* 80039030 88 7D 00 00 */ lbz r3, 0(r29) -/* 80039034 38 03 00 01 */ addi r0, r3, 1 -/* 80039038 98 1D 00 00 */ stb r0, 0(r29) -/* 8003903C 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d -/* 80039040 7C 7D 02 14 */ add r3, r29, r0 -/* 80039044 93 E3 00 04 */ stw r31, 4(r3) -/* 80039048 7F E3 FB 78 */ mr r3, r31 -/* 8003904C 7F C4 F3 78 */ mr r4, r30 -/* 80039050 4B FF F1 0D */ bl setActor__13dDemo_actor_cFP10fopAc_ac_c -/* 80039054 88 1D 00 00 */ lbz r0, 0(r29) -/* 80039058 98 1E 04 98 */ stb r0, 0x498(r30) -/* 8003905C 80 1E 05 24 */ lwz r0, 0x524(r30) -/* 80039060 28 00 00 00 */ cmplwi r0, 0 -/* 80039064 41 82 00 08 */ beq lbl_8003906C -/* 80039068 90 1F 00 48 */ stw r0, 0x48(r31) -lbl_8003906C: -/* 8003906C 7F E3 FB 78 */ mr r3, r31 -lbl_80039070: -/* 80039070 39 61 00 20 */ addi r11, r1, 0x20 -/* 80039074 48 32 91 B5 */ bl _restgpr_29 -/* 80039078 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003907C 7C 08 03 A6 */ mtlr r0 -/* 80039080 38 21 00 20 */ addi r1, r1, 0x20 -/* 80039084 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/appendLight__14dDemo_object_cFv.s b/asm/d/d_demo/appendLight__14dDemo_object_cFv.s deleted file mode 100644 index 8cf41d1acdd..00000000000 --- a/asm/d/d_demo/appendLight__14dDemo_object_cFv.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_800391B8: -/* 800391B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800391BC 7C 08 02 A6 */ mflr r0 -/* 800391C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800391C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800391C8 7C 7F 1B 78 */ mr r31, r3 -/* 800391CC 88 03 00 01 */ lbz r0, 1(r3) -/* 800391D0 28 00 00 08 */ cmplwi r0, 8 -/* 800391D4 41 80 00 0C */ blt lbl_800391E0 -/* 800391D8 38 60 00 00 */ li r3, 0 -/* 800391DC 48 00 00 68 */ b lbl_80039244 -lbl_800391E0: -/* 800391E0 38 60 00 3C */ li r3, 0x3c -/* 800391E4 48 29 5A 69 */ bl __nw__FUl -/* 800391E8 28 03 00 00 */ cmplwi r3, 0 -/* 800391EC 41 82 00 30 */ beq lbl_8003921C -/* 800391F0 3C 80 80 3C */ lis r4, __vt__Q26JStage7TObject@ha /* 0x803C47E8@ha */ -/* 800391F4 38 04 47 E8 */ addi r0, r4, __vt__Q26JStage7TObject@l /* 0x803C47E8@l */ -/* 800391F8 90 03 00 00 */ stw r0, 0(r3) -/* 800391FC 3C 80 80 3C */ lis r4, __vt__Q26JStage6TLight@ha /* 0x803C4778@ha */ -/* 80039200 38 04 47 78 */ addi r0, r4, __vt__Q26JStage6TLight@l /* 0x803C4778@l */ -/* 80039204 90 03 00 00 */ stw r0, 0(r3) -/* 80039208 3C 80 80 3A */ lis r4, __vt__13dDemo_light_c@ha /* 0x803A79F0@ha */ -/* 8003920C 38 04 79 F0 */ addi r0, r4, __vt__13dDemo_light_c@l /* 0x803A79F0@l */ -/* 80039210 90 03 00 00 */ stw r0, 0(r3) -/* 80039214 38 00 00 00 */ li r0, 0 -/* 80039218 98 03 00 04 */ stb r0, 4(r3) -lbl_8003921C: -/* 8003921C 28 03 00 00 */ cmplwi r3, 0 -/* 80039220 40 82 00 0C */ bne lbl_8003922C -/* 80039224 38 60 00 00 */ li r3, 0 -/* 80039228 48 00 00 1C */ b lbl_80039244 -lbl_8003922C: -/* 8003922C 88 9F 00 01 */ lbz r4, 1(r31) -/* 80039230 38 04 00 01 */ addi r0, r4, 1 -/* 80039234 98 1F 00 01 */ stb r0, 1(r31) -/* 80039238 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 8003923C 7C 9F 02 14 */ add r4, r31, r0 -/* 80039240 90 64 00 8C */ stw r3, 0x8c(r4) -lbl_80039244: -/* 80039244 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80039248 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003924C 7C 08 03 A6 */ mtlr r0 -/* 80039250 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039254 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/branchFile__FPCc.s b/asm/d/d_demo/branchFile__FPCc.s deleted file mode 100644 index 528977e2378..00000000000 --- a/asm/d/d_demo/branchFile__FPCc.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_800387A8: -/* 800387A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800387AC 7C 08 02 A6 */ mflr r0 -/* 800387B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800387B4 7C 64 1B 78 */ mr r4, r3 -/* 800387B8 3C 60 80 40 */ lis r3, mDemoArcName__20dStage_roomControl_c@ha /* 0x80406194@ha */ -/* 800387BC 38 63 61 94 */ addi r3, r3, mDemoArcName__20dStage_roomControl_c@l /* 0x80406194@l */ -/* 800387C0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 800387C4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 800387C8 3C A5 00 02 */ addis r5, r5, 2 -/* 800387CC 38 C0 00 80 */ li r6, 0x80 -/* 800387D0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800387D4 48 00 3B A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci -/* 800387D8 90 6D 88 C4 */ stw r3, m_branchData__7dDemo_c(r13) -/* 800387DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800387E0 7C 08 03 A6 */ mtlr r0 -/* 800387E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800387E8 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/branch__7dDemo_cFv.s b/asm/d/d_demo/branch__7dDemo_cFv.s deleted file mode 100644 index 76911b2e5af..00000000000 --- a/asm/d/d_demo/branch__7dDemo_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80039D4C: -/* 80039D4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80039D50 7C 08 02 A6 */ mflr r0 -/* 80039D54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80039D58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80039D5C 83 ED 88 84 */ lwz r31, m_control__7dDemo_c(r13) -/* 80039D60 7F E3 FB 78 */ mr r3, r31 -/* 80039D64 48 24 F5 9D */ bl destroyObject_all__Q37JStudio3stb8TControlFv -/* 80039D68 38 7F 00 60 */ addi r3, r31, 0x60 -/* 80039D6C 48 24 AA 65 */ bl destroyObject_all__Q37JStudio3fvb8TControlFv -/* 80039D70 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80039D74 48 24 73 B9 */ bl destroyObject_all__Q37JStudio3ctb8TControlFv -/* 80039D78 80 6D 88 C4 */ lwz r3, m_branchData__7dDemo_c(r13) -/* 80039D7C 38 00 00 00 */ li r0, 0 -/* 80039D80 90 0D 88 C4 */ stw r0, m_branchData__7dDemo_c(r13) -/* 80039D84 80 8D 88 AC */ lwz r4, m_translation__7dDemo_c(r13) -/* 80039D88 C0 2D 88 B0 */ lfs f1, m_rotationY__7dDemo_c(r13) -/* 80039D8C 4B FF FD E1 */ bl start__7dDemo_cFPCUcP4cXyzf -/* 80039D90 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80039D94 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80039D98 7C 08 03 A6 */ mtlr r0 -/* 80039D9C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039DA0 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/createAmbient__14dDemo_object_cFv.s b/asm/d/d_demo/createAmbient__14dDemo_object_cFv.s deleted file mode 100644 index 20e8b180006..00000000000 --- a/asm/d/d_demo/createAmbient__14dDemo_object_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_8003913C: -/* 8003913C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80039140 7C 08 02 A6 */ mflr r0 -/* 80039144 90 01 00 14 */ stw r0, 0x14(r1) -/* 80039148 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003914C 7C 7F 1B 78 */ mr r31, r3 -/* 80039150 80 63 00 88 */ lwz r3, 0x88(r3) -/* 80039154 28 03 00 00 */ cmplwi r3, 0 -/* 80039158 41 82 00 08 */ beq lbl_80039160 -/* 8003915C 48 00 00 48 */ b lbl_800391A4 -lbl_80039160: -/* 80039160 38 60 00 0C */ li r3, 0xc -/* 80039164 48 29 5A E9 */ bl __nw__FUl -/* 80039168 28 03 00 00 */ cmplwi r3, 0 -/* 8003916C 41 82 00 30 */ beq lbl_8003919C -/* 80039170 3C 80 80 3C */ lis r4, __vt__Q26JStage7TObject@ha /* 0x803C47E8@ha */ -/* 80039174 38 04 47 E8 */ addi r0, r4, __vt__Q26JStage7TObject@l /* 0x803C47E8@l */ -/* 80039178 90 03 00 00 */ stw r0, 0(r3) -/* 8003917C 3C 80 80 3C */ lis r4, __vt__Q26JStage13TAmbientLight@ha /* 0x803C4638@ha */ -/* 80039180 38 04 46 38 */ addi r0, r4, __vt__Q26JStage13TAmbientLight@l /* 0x803C4638@l */ -/* 80039184 90 03 00 00 */ stw r0, 0(r3) -/* 80039188 3C 80 80 3A */ lis r4, __vt__15dDemo_ambient_c@ha /* 0x803A7A5C@ha */ -/* 8003918C 38 04 7A 5C */ addi r0, r4, __vt__15dDemo_ambient_c@l /* 0x803A7A5C@l */ -/* 80039190 90 03 00 00 */ stw r0, 0(r3) -/* 80039194 38 00 00 00 */ li r0, 0 -/* 80039198 98 03 00 04 */ stb r0, 4(r3) -lbl_8003919C: -/* 8003919C 90 7F 00 88 */ stw r3, 0x88(r31) -/* 800391A0 80 7F 00 88 */ lwz r3, 0x88(r31) -lbl_800391A4: -/* 800391A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800391A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800391AC 7C 08 03 A6 */ mtlr r0 -/* 800391B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 800391B4 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/createCamera__14dDemo_object_cFv.s b/asm/d/d_demo/createCamera__14dDemo_object_cFv.s deleted file mode 100644 index eb593cd67c3..00000000000 --- a/asm/d/d_demo/createCamera__14dDemo_object_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_800390AC: -/* 800390AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800390B0 7C 08 02 A6 */ mflr r0 -/* 800390B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800390B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800390BC 7C 7F 1B 78 */ mr r31, r3 -/* 800390C0 80 63 00 84 */ lwz r3, 0x84(r3) -/* 800390C4 28 03 00 00 */ cmplwi r3, 0 -/* 800390C8 41 82 00 08 */ beq lbl_800390D0 -/* 800390CC 48 00 00 48 */ b lbl_80039114 -lbl_800390D0: -/* 800390D0 38 60 00 40 */ li r3, 0x40 -/* 800390D4 48 29 5B 79 */ bl __nw__FUl -/* 800390D8 28 03 00 00 */ cmplwi r3, 0 -/* 800390DC 41 82 00 30 */ beq lbl_8003910C -/* 800390E0 3C 80 80 3C */ lis r4, __vt__Q26JStage7TObject@ha /* 0x803C47E8@ha */ -/* 800390E4 38 04 47 E8 */ addi r0, r4, __vt__Q26JStage7TObject@l /* 0x803C47E8@l */ -/* 800390E8 90 03 00 00 */ stw r0, 0(r3) -/* 800390EC 3C 80 80 3C */ lis r4, __vt__Q26JStage7TCamera@ha /* 0x803C4680@ha */ -/* 800390F0 38 04 46 80 */ addi r0, r4, __vt__Q26JStage7TCamera@l /* 0x803C4680@l */ -/* 800390F4 90 03 00 00 */ stw r0, 0(r3) -/* 800390F8 3C 80 80 3A */ lis r4, __vt__14dDemo_camera_c@ha /* 0x803A7AA0@ha */ -/* 800390FC 38 04 7A A0 */ addi r0, r4, __vt__14dDemo_camera_c@l /* 0x803A7AA0@l */ -/* 80039100 90 03 00 00 */ stw r0, 0(r3) -/* 80039104 38 00 00 00 */ li r0, 0 -/* 80039108 98 03 00 04 */ stb r0, 4(r3) -lbl_8003910C: -/* 8003910C 90 7F 00 84 */ stw r3, 0x84(r31) -/* 80039110 80 7F 00 84 */ lwz r3, 0x84(r31) -lbl_80039114: -/* 80039114 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80039118 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003911C 7C 08 03 A6 */ mtlr r0 -/* 80039120 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039124 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/createFog__14dDemo_object_cFv.s b/asm/d/d_demo/createFog__14dDemo_object_cFv.s deleted file mode 100644 index c4b6d7ce4d5..00000000000 --- a/asm/d/d_demo/createFog__14dDemo_object_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_80039258: -/* 80039258 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003925C 7C 08 02 A6 */ mflr r0 -/* 80039260 90 01 00 14 */ stw r0, 0x14(r1) -/* 80039264 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80039268 7C 7F 1B 78 */ mr r31, r3 -/* 8003926C 80 63 00 AC */ lwz r3, 0xac(r3) -/* 80039270 28 03 00 00 */ cmplwi r3, 0 -/* 80039274 41 82 00 08 */ beq lbl_8003927C -/* 80039278 48 00 00 48 */ b lbl_800392C0 -lbl_8003927C: -/* 8003927C 38 60 00 14 */ li r3, 0x14 -/* 80039280 48 29 59 CD */ bl __nw__FUl -/* 80039284 28 03 00 00 */ cmplwi r3, 0 -/* 80039288 41 82 00 30 */ beq lbl_800392B8 -/* 8003928C 3C 80 80 3C */ lis r4, __vt__Q26JStage7TObject@ha /* 0x803C47E8@ha */ -/* 80039290 38 04 47 E8 */ addi r0, r4, __vt__Q26JStage7TObject@l /* 0x803C47E8@l */ -/* 80039294 90 03 00 00 */ stw r0, 0(r3) -/* 80039298 3C 80 80 3C */ lis r4, __vt__Q26JStage4TFog@ha /* 0x803C4718@ha */ -/* 8003929C 38 04 47 18 */ addi r0, r4, __vt__Q26JStage4TFog@l /* 0x803C4718@l */ -/* 800392A0 90 03 00 00 */ stw r0, 0(r3) -/* 800392A4 3C 80 80 3A */ lis r4, __vt__11dDemo_fog_c@ha /* 0x803A7994@ha */ -/* 800392A8 38 04 79 94 */ addi r0, r4, __vt__11dDemo_fog_c@l /* 0x803A7994@l */ -/* 800392AC 90 03 00 00 */ stw r0, 0(r3) -/* 800392B0 38 00 00 00 */ li r0, 0 -/* 800392B4 98 03 00 04 */ stb r0, 4(r3) -lbl_800392B8: -/* 800392B8 90 7F 00 AC */ stw r3, 0xac(r31) -/* 800392BC 80 7F 00 AC */ lwz r3, 0xac(r31) -lbl_800392C0: -/* 800392C0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800392C4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800392C8 7C 08 03 A6 */ mtlr r0 -/* 800392CC 38 21 00 10 */ addi r1, r1, 0x10 -/* 800392D0 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/end__7dDemo_cFv.s b/asm/d/d_demo/end__7dDemo_cFv.s deleted file mode 100644 index 2fbe6c409f9..00000000000 --- a/asm/d/d_demo/end__7dDemo_cFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80039CF8: -/* 80039CF8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80039CFC 7C 08 02 A6 */ mflr r0 -/* 80039D00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80039D04 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80039D08 83 ED 88 84 */ lwz r31, m_control__7dDemo_c(r13) -/* 80039D0C 7F E3 FB 78 */ mr r3, r31 -/* 80039D10 48 24 F5 F1 */ bl destroyObject_all__Q37JStudio3stb8TControlFv -/* 80039D14 38 7F 00 60 */ addi r3, r31, 0x60 -/* 80039D18 48 24 AA B9 */ bl destroyObject_all__Q37JStudio3fvb8TControlFv -/* 80039D1C 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80039D20 48 24 74 0D */ bl destroyObject_all__Q37JStudio3ctb8TControlFv -/* 80039D24 80 6D 88 A0 */ lwz r3, m_object__7dDemo_c(r13) -/* 80039D28 4B FF F5 AD */ bl remove__14dDemo_object_cFv -/* 80039D2C 38 00 00 00 */ li r0, 0 -/* 80039D30 90 0D 88 A4 */ stw r0, m_data__7dDemo_c(r13) -/* 80039D34 90 0D 88 B8 */ stw r0, m_mode__7dDemo_c(r13) -/* 80039D38 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80039D3C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80039D40 7C 08 03 A6 */ mtlr r0 -/* 80039D44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039D48 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/getActiveCamera__14dDemo_object_cFv.s b/asm/d/d_demo/getActiveCamera__14dDemo_object_cFv.s deleted file mode 100644 index f5d529fdbae..00000000000 --- a/asm/d/d_demo/getActiveCamera__14dDemo_object_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_80039128: -/* 80039128 80 63 00 84 */ lwz r3, 0x84(r3) -/* 8003912C 28 03 00 00 */ cmplwi r3, 0 -/* 80039130 4C 82 00 20 */ bnelr -/* 80039134 38 60 00 00 */ li r3, 0 -/* 80039138 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/getActor__14dDemo_object_cFUc.s b/asm/d/d_demo/getActor__14dDemo_object_cFUc.s deleted file mode 100644 index 01285f95662..00000000000 --- a/asm/d/d_demo/getActor__14dDemo_object_cFUc.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_80039088: -/* 80039088 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 8003908C 41 82 00 0C */ beq lbl_80039098 -/* 80039090 28 00 00 20 */ cmplwi r0, 0x20 -/* 80039094 40 81 00 0C */ ble lbl_800390A0 -lbl_80039098: -/* 80039098 38 60 00 00 */ li r3, 0 -/* 8003909C 4E 80 00 20 */ blr -lbl_800390A0: -/* 800390A0 54 80 15 BA */ rlwinm r0, r4, 2, 0x16, 0x1d -/* 800390A4 7C 63 00 2E */ lwzx r3, r3, r0 -/* 800390A8 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/remove__14dDemo_object_cFv.s b/asm/d/d_demo/remove__14dDemo_object_cFv.s deleted file mode 100644 index e8c089ca565..00000000000 --- a/asm/d/d_demo/remove__14dDemo_object_cFv.s +++ /dev/null @@ -1,87 +0,0 @@ -lbl_800392D4: -/* 800392D4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800392D8 7C 08 02 A6 */ mflr r0 -/* 800392DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800392E0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 800392E4 7C 7F 1B 78 */ mr r31, r3 -/* 800392E8 48 00 00 38 */ b lbl_80039320 -lbl_800392EC: -/* 800392EC 88 7F 00 00 */ lbz r3, 0(r31) -/* 800392F0 38 03 FF FF */ addi r0, r3, -1 -/* 800392F4 98 1F 00 00 */ stb r0, 0(r31) -/* 800392F8 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d -/* 800392FC 38 03 00 04 */ addi r0, r3, 4 -/* 80039300 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80039304 28 03 00 00 */ cmplwi r3, 0 -/* 80039308 41 82 00 18 */ beq lbl_80039320 -/* 8003930C 38 80 00 01 */ li r4, 1 -/* 80039310 81 83 00 00 */ lwz r12, 0(r3) -/* 80039314 81 8C 00 08 */ lwz r12, 8(r12) -/* 80039318 7D 89 03 A6 */ mtctr r12 -/* 8003931C 4E 80 04 21 */ bctrl -lbl_80039320: -/* 80039320 88 1F 00 00 */ lbz r0, 0(r31) -/* 80039324 28 00 00 00 */ cmplwi r0, 0 -/* 80039328 40 82 FF C4 */ bne lbl_800392EC -/* 8003932C 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 80039330 28 03 00 00 */ cmplwi r3, 0 -/* 80039334 41 82 00 24 */ beq lbl_80039358 -/* 80039338 41 82 00 18 */ beq lbl_80039350 -/* 8003933C 38 80 00 01 */ li r4, 1 -/* 80039340 81 83 00 00 */ lwz r12, 0(r3) -/* 80039344 81 8C 00 08 */ lwz r12, 8(r12) -/* 80039348 7D 89 03 A6 */ mtctr r12 -/* 8003934C 4E 80 04 21 */ bctrl -lbl_80039350: -/* 80039350 38 00 00 00 */ li r0, 0 -/* 80039354 90 1F 00 84 */ stw r0, 0x84(r31) -lbl_80039358: -/* 80039358 80 7F 00 88 */ lwz r3, 0x88(r31) -/* 8003935C 28 03 00 00 */ cmplwi r3, 0 -/* 80039360 41 82 00 5C */ beq lbl_800393BC -/* 80039364 41 82 00 18 */ beq lbl_8003937C -/* 80039368 38 80 00 01 */ li r4, 1 -/* 8003936C 81 83 00 00 */ lwz r12, 0(r3) -/* 80039370 81 8C 00 08 */ lwz r12, 8(r12) -/* 80039374 7D 89 03 A6 */ mtctr r12 -/* 80039378 4E 80 04 21 */ bctrl -lbl_8003937C: -/* 8003937C 38 00 00 00 */ li r0, 0 -/* 80039380 90 1F 00 88 */ stw r0, 0x88(r31) -/* 80039384 48 00 00 38 */ b lbl_800393BC -lbl_80039388: -/* 80039388 88 7F 00 01 */ lbz r3, 1(r31) -/* 8003938C 38 03 FF FF */ addi r0, r3, -1 -/* 80039390 98 1F 00 01 */ stb r0, 1(r31) -/* 80039394 54 03 15 BA */ rlwinm r3, r0, 2, 0x16, 0x1d -/* 80039398 38 03 00 8C */ addi r0, r3, 0x8c -/* 8003939C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 800393A0 28 03 00 00 */ cmplwi r3, 0 -/* 800393A4 41 82 00 18 */ beq lbl_800393BC -/* 800393A8 38 80 00 01 */ li r4, 1 -/* 800393AC 81 83 00 00 */ lwz r12, 0(r3) -/* 800393B0 81 8C 00 08 */ lwz r12, 8(r12) -/* 800393B4 7D 89 03 A6 */ mtctr r12 -/* 800393B8 4E 80 04 21 */ bctrl -lbl_800393BC: -/* 800393BC 88 1F 00 01 */ lbz r0, 1(r31) -/* 800393C0 28 00 00 00 */ cmplwi r0, 0 -/* 800393C4 40 82 FF C4 */ bne lbl_80039388 -/* 800393C8 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 800393CC 28 03 00 00 */ cmplwi r3, 0 -/* 800393D0 41 82 00 24 */ beq lbl_800393F4 -/* 800393D4 41 82 00 18 */ beq lbl_800393EC -/* 800393D8 38 80 00 01 */ li r4, 1 -/* 800393DC 81 83 00 00 */ lwz r12, 0(r3) -/* 800393E0 81 8C 00 08 */ lwz r12, 8(r12) -/* 800393E4 7D 89 03 A6 */ mtctr r12 -/* 800393E8 4E 80 04 21 */ bctrl -lbl_800393EC: -/* 800393EC 38 00 00 00 */ li r0, 0 -/* 800393F0 90 1F 00 AC */ stw r0, 0xac(r31) -lbl_800393F4: -/* 800393F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 800393F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800393FC 7C 08 03 A6 */ mtlr r0 -/* 80039400 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039404 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/reset__7dDemo_cFv.s b/asm/d/d_demo/reset__7dDemo_cFv.s deleted file mode 100644 index 57388adc0cf..00000000000 --- a/asm/d/d_demo/reset__7dDemo_cFv.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80039F04: -/* 80039F04 38 00 00 00 */ li r0, 0 -/* 80039F08 90 0D 88 A8 */ stw r0, m_frame__7dDemo_c(r13) -/* 80039F0C 90 0D 88 B4 */ stw r0, m_frameNoMsg__7dDemo_c(r13) -/* 80039F10 90 0D 88 BC */ stw r0, m_status__7dDemo_c(r13) -/* 80039F14 90 0D 88 C4 */ stw r0, m_branchData__7dDemo_c(r13) -/* 80039F18 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/setBranchId__7dDemo_cFUss.s b/asm/d/d_demo/setBranchId__7dDemo_cFUss.s deleted file mode 100644 index 3751c408155..00000000000 --- a/asm/d/d_demo/setBranchId__7dDemo_cFUss.s +++ /dev/null @@ -1,7 +0,0 @@ -lbl_80039EEC: -/* 80039EEC 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80039EF0 A0 0D 88 C0 */ lhz r0, m_branchType__7dDemo_c(r13) -/* 80039EF4 7C 03 00 40 */ cmplw r3, r0 -/* 80039EF8 4C 82 00 20 */ bnelr -/* 80039EFC B0 8D 80 A0 */ sth r4, m_branchId__7dDemo_c(r13) -/* 80039F00 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/setBranchType__7dDemo_cFUs.s b/asm/d/d_demo/setBranchType__7dDemo_cFUs.s deleted file mode 100644 index 59c723409a7..00000000000 --- a/asm/d/d_demo/setBranchType__7dDemo_cFUs.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_80039EDC: -/* 80039EDC B0 6D 88 C0 */ sth r3, m_branchType__7dDemo_c(r13) -/* 80039EE0 38 00 FF FF */ li r0, -1 -/* 80039EE4 B0 0D 80 A0 */ sth r0, m_branchId__7dDemo_c(r13) -/* 80039EE8 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s b/asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s deleted file mode 100644 index 6e912788340..00000000000 --- a/asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s +++ /dev/null @@ -1,105 +0,0 @@ -lbl_80039B6C: -/* 80039B6C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80039B70 7C 08 02 A6 */ mflr r0 -/* 80039B74 90 01 00 44 */ stw r0, 0x44(r1) -/* 80039B78 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80039B7C F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80039B80 39 61 00 30 */ addi r11, r1, 0x30 -/* 80039B84 48 32 86 59 */ bl _savegpr_29 -/* 80039B88 7C 7F 1B 78 */ mr r31, r3 -/* 80039B8C 7C 9D 23 78 */ mr r29, r4 -/* 80039B90 FF E0 08 90 */ fmr f31, f1 -/* 80039B94 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039B98 48 24 F8 6D */ bl reset__Q37JStudio3stb8TControlFv -/* 80039B9C 38 61 00 0C */ addi r3, r1, 0xc -/* 80039BA0 80 8D 88 84 */ lwz r4, m_control__7dDemo_c(r13) -/* 80039BA4 48 24 BA C9 */ bl __ct__Q27JStudio6TParseFPQ27JStudio8TControl -/* 80039BA8 93 E1 00 08 */ stw r31, 8(r1) -/* 80039BAC 38 61 00 0C */ addi r3, r1, 0xc -/* 80039BB0 38 81 00 08 */ addi r4, r1, 8 -/* 80039BB4 38 A0 00 00 */ li r5, 0 -/* 80039BB8 48 2A 2D 59 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl -/* 80039BBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80039BC0 40 82 00 2C */ bne lbl_80039BEC -/* 80039BC4 3C 60 80 38 */ lis r3, d_d_demo__stringBase0@ha /* 0x803797F8@ha */ -/* 80039BC8 38 63 97 F8 */ addi r3, r3, d_d_demo__stringBase0@l /* 0x803797F8@l */ -/* 80039BCC 38 63 00 08 */ addi r3, r3, 8 -/* 80039BD0 4C C6 31 82 */ crclr 6 -/* 80039BD4 4B FC D0 39 */ bl OSReport_Error -/* 80039BD8 38 61 00 0C */ addi r3, r1, 0xc -/* 80039BDC 38 80 FF FF */ li r4, -1 -/* 80039BE0 48 24 BA C9 */ bl __dt__Q27JStudio6TParseFv -/* 80039BE4 38 60 00 00 */ li r3, 0 -/* 80039BE8 48 00 00 F0 */ b lbl_80039CD8 -lbl_80039BEC: -/* 80039BEC 80 0D 88 A4 */ lwz r0, m_data__7dDemo_c(r13) -/* 80039BF0 28 00 00 00 */ cmplwi r0, 0 -/* 80039BF4 40 82 00 10 */ bne lbl_80039C04 -/* 80039BF8 38 00 00 00 */ li r0, 0 -/* 80039BFC 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039C00 90 03 00 40 */ stw r0, 0x40(r3) -lbl_80039C04: -/* 80039C04 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039C08 38 80 00 00 */ li r4, 0 -/* 80039C0C 48 24 F8 A9 */ bl forward__Q37JStudio3stb8TControlFUl -/* 80039C10 93 AD 88 AC */ stw r29, m_translation__7dDemo_c(r13) -/* 80039C14 28 1D 00 00 */ cmplwi r29, 0 -/* 80039C18 41 82 00 98 */ beq lbl_80039CB0 -/* 80039C1C 88 0D 88 D0 */ lbz r0, data_80450E50(r13) -/* 80039C20 7C 00 07 75 */ extsb. r0, r0 -/* 80039C24 40 82 00 28 */ bne lbl_80039C4C -/* 80039C28 3C 60 80 42 */ lis r3, l_translation@ha /* 0x80424668@ha */ -/* 80039C2C 38 63 46 68 */ addi r3, r3, l_translation@l /* 0x80424668@l */ -/* 80039C30 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha /* 0x80009184@ha */ -/* 80039C34 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 0x80009184@l */ -/* 80039C38 3C A0 80 42 */ lis r5, lit_5233@ha /* 0x8042465C@ha */ -/* 80039C3C 38 A5 46 5C */ addi r5, r5, lit_5233@l /* 0x8042465C@l */ -/* 80039C40 48 32 7F E5 */ bl __register_global_object -/* 80039C44 38 00 00 01 */ li r0, 1 -/* 80039C48 98 0D 88 D0 */ stb r0, data_80450E50(r13) -lbl_80039C4C: -/* 80039C4C 80 8D 88 AC */ lwz r4, m_translation__7dDemo_c(r13) -/* 80039C50 C0 04 00 00 */ lfs f0, 0(r4) -/* 80039C54 3C 60 80 42 */ lis r3, l_translation@ha /* 0x80424668@ha */ -/* 80039C58 D4 03 46 68 */ stfsu f0, l_translation@l(r3) /* 0x80424668@l */ -/* 80039C5C C0 04 00 04 */ lfs f0, 4(r4) -/* 80039C60 D0 03 00 04 */ stfs f0, 4(r3) -/* 80039C64 C0 04 00 08 */ lfs f0, 8(r4) -/* 80039C68 D0 03 00 08 */ stfs f0, 8(r3) -/* 80039C6C 90 6D 88 AC */ stw r3, m_translation__7dDemo_c(r13) -/* 80039C70 D3 ED 88 B0 */ stfs f31, m_rotationY__7dDemo_c(r13) -/* 80039C74 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039C78 38 00 00 01 */ li r0, 1 -/* 80039C7C 98 03 00 88 */ stb r0, 0x88(r3) -/* 80039C80 98 03 00 89 */ stb r0, 0x89(r3) -/* 80039C84 C3 ED 88 B0 */ lfs f31, m_rotationY__7dDemo_c(r13) -/* 80039C88 83 CD 88 AC */ lwz r30, m_translation__7dDemo_c(r13) -/* 80039C8C 83 AD 88 84 */ lwz r29, m_control__7dDemo_c(r13) -/* 80039C90 7F A3 EB 78 */ mr r3, r29 -/* 80039C94 7F C4 F3 78 */ mr r4, r30 -/* 80039C98 FC 20 F8 90 */ fmr f1, f31 -/* 80039C9C 48 24 B5 B5 */ bl transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf -/* 80039CA0 7F A3 EB 78 */ mr r3, r29 -/* 80039CA4 7F C4 F3 78 */ mr r4, r30 -/* 80039CA8 FC 20 F8 90 */ fmr f1, f31 -/* 80039CAC 48 24 B6 25 */ bl transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf -lbl_80039CB0: -/* 80039CB0 38 00 00 01 */ li r0, 1 -/* 80039CB4 90 0D 88 B8 */ stw r0, m_mode__7dDemo_c(r13) -/* 80039CB8 48 00 02 4D */ bl reset__7dDemo_cFv -/* 80039CBC 38 00 00 00 */ li r0, 0 -/* 80039CC0 90 0D 88 A4 */ stw r0, m_data__7dDemo_c(r13) -/* 80039CC4 93 ED 88 C4 */ stw r31, m_branchData__7dDemo_c(r13) -/* 80039CC8 38 61 00 0C */ addi r3, r1, 0xc -/* 80039CCC 38 80 FF FF */ li r4, -1 -/* 80039CD0 48 24 B9 D9 */ bl __dt__Q27JStudio6TParseFv -/* 80039CD4 38 60 00 01 */ li r3, 1 -lbl_80039CD8: -/* 80039CD8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 80039CDC CB E1 00 30 */ lfd f31, 0x30(r1) -/* 80039CE0 39 61 00 30 */ addi r11, r1, 0x30 -/* 80039CE4 48 32 85 45 */ bl _restgpr_29 -/* 80039CE8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80039CEC 7C 08 03 A6 */ mtlr r0 -/* 80039CF0 38 21 00 40 */ addi r1, r1, 0x40 -/* 80039CF4 4E 80 00 20 */ blr diff --git a/asm/d/d_demo/update__7dDemo_cFv.s b/asm/d/d_demo/update__7dDemo_cFv.s deleted file mode 100644 index c6089c91bba..00000000000 --- a/asm/d/d_demo/update__7dDemo_cFv.s +++ /dev/null @@ -1,89 +0,0 @@ -lbl_80039DA4: -/* 80039DA4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80039DA8 7C 08 02 A6 */ mflr r0 -/* 80039DAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80039DB0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80039DB4 80 0D 88 A4 */ lwz r0, m_data__7dDemo_c(r13) -/* 80039DB8 28 00 00 00 */ cmplwi r0, 0 -/* 80039DBC 40 82 00 2C */ bne lbl_80039DE8 -/* 80039DC0 80 0D 88 C4 */ lwz r0, m_branchData__7dDemo_c(r13) -/* 80039DC4 28 00 00 00 */ cmplwi r0, 0 -/* 80039DC8 40 82 00 0C */ bne lbl_80039DD4 -/* 80039DCC 38 60 00 00 */ li r3, 0 -/* 80039DD0 48 00 00 F8 */ b lbl_80039EC8 -lbl_80039DD4: -/* 80039DD4 90 0D 88 A4 */ stw r0, m_data__7dDemo_c(r13) -/* 80039DD8 38 00 00 00 */ li r0, 0 -/* 80039DDC 90 0D 88 C4 */ stw r0, m_branchData__7dDemo_c(r13) -/* 80039DE0 38 60 00 01 */ li r3, 1 -/* 80039DE4 48 00 00 E4 */ b lbl_80039EC8 -lbl_80039DE8: -/* 80039DE8 80 0D 88 BC */ lwz r0, m_status__7dDemo_c(r13) -/* 80039DEC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80039DF0 41 82 00 1C */ beq lbl_80039E0C -/* 80039DF4 4B FF 7C DD */ bl daMP_c_THPPlayerPlay__6daMP_cFv -/* 80039DF8 80 0D 88 BC */ lwz r0, m_status__7dDemo_c(r13) -/* 80039DFC 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80039E00 41 82 00 0C */ beq lbl_80039E0C -/* 80039E04 38 60 00 01 */ li r3, 1 -/* 80039E08 48 00 00 C0 */ b lbl_80039EC8 -lbl_80039E0C: -/* 80039E0C 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039E10 38 80 00 01 */ li r4, 1 -/* 80039E14 48 24 F6 A1 */ bl forward__Q37JStudio3stb8TControlFUl -/* 80039E18 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80039E1C 41 82 00 30 */ beq lbl_80039E4C -/* 80039E20 80 6D 88 A8 */ lwz r3, m_frame__7dDemo_c(r13) -/* 80039E24 38 03 00 01 */ addi r0, r3, 1 -/* 80039E28 90 0D 88 A8 */ stw r0, m_frame__7dDemo_c(r13) -/* 80039E2C 80 6D 88 84 */ lwz r3, m_control__7dDemo_c(r13) -/* 80039E30 80 03 00 54 */ lwz r0, 0x54(r3) -/* 80039E34 2C 00 00 00 */ cmpwi r0, 0 -/* 80039E38 41 81 00 1C */ bgt lbl_80039E54 -/* 80039E3C 80 6D 88 B4 */ lwz r3, m_frameNoMsg__7dDemo_c(r13) -/* 80039E40 38 03 00 01 */ addi r0, r3, 1 -/* 80039E44 90 0D 88 B4 */ stw r0, m_frameNoMsg__7dDemo_c(r13) -/* 80039E48 48 00 00 0C */ b lbl_80039E54 -lbl_80039E4C: -/* 80039E4C 38 00 00 02 */ li r0, 2 -/* 80039E50 90 0D 88 B8 */ stw r0, m_mode__7dDemo_c(r13) -lbl_80039E54: -/* 80039E54 80 0D 88 C4 */ lwz r0, m_branchData__7dDemo_c(r13) -/* 80039E58 28 00 00 00 */ cmplwi r0, 0 -/* 80039E5C 41 82 00 08 */ beq lbl_80039E64 -/* 80039E60 4B FF FE ED */ bl branch__7dDemo_cFv -lbl_80039E64: -/* 80039E64 4B FF 5E A5 */ bl dComIfGs_staffroll_next_go_check__Fv -/* 80039E68 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 80039E6C 41 82 00 58 */ beq lbl_80039EC4 -/* 80039E70 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 80039E74 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80039E78 4B FF 5E 91 */ bl dComIfGs_staffroll_next_go_check__Fv -/* 80039E7C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80039E80 28 00 00 0A */ cmplwi r0, 0xa -/* 80039E84 40 81 00 18 */ ble lbl_80039E9C -/* 80039E88 38 00 00 00 */ li r0, 0 -/* 80039E8C 98 1F 13 0C */ stb r0, 0x130c(r31) -/* 80039E90 38 00 00 02 */ li r0, 2 -/* 80039E94 90 0D 88 B8 */ stw r0, m_mode__7dDemo_c(r13) -/* 80039E98 48 00 00 2C */ b lbl_80039EC4 -lbl_80039E9C: -/* 80039E9C 4B FF 5E 6D */ bl dComIfGs_staffroll_next_go_check__Fv -/* 80039EA0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80039EA4 28 00 00 01 */ cmplwi r0, 1 -/* 80039EA8 40 82 00 10 */ bne lbl_80039EB8 -/* 80039EAC C0 22 83 E8 */ lfs f1, lit_5322(r2) -/* 80039EB0 38 6D 80 84 */ la r3, g_blackColor(r13) /* 80450604-_SDA_BASE_ */ -/* 80039EB4 4B FC E1 25 */ bl fadeOut__13mDoGph_gInf_cFfR8_GXColor -lbl_80039EB8: -/* 80039EB8 88 7F 13 0C */ lbz r3, 0x130c(r31) -/* 80039EBC 38 03 00 01 */ addi r0, r3, 1 -/* 80039EC0 98 1F 13 0C */ stb r0, 0x130c(r31) -lbl_80039EC4: -/* 80039EC4 38 60 00 01 */ li r3, 1 -lbl_80039EC8: -/* 80039EC8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80039ECC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80039ED0 7C 08 03 A6 */ mtlr r0 -/* 80039ED4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80039ED8 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s b/asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s deleted file mode 100644 index c704808192f..00000000000 --- a/asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80052B00: -/* 80052B00 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80052B04 3C 80 80 3A */ lis r4, __vt__12dDlst_base_c@ha /* 0x803A6F88@ha */ -/* 80052B08 38 04 6F 88 */ addi r0, r4, __vt__12dDlst_base_c@l /* 0x803A6F88@l */ -/* 80052B0C 90 03 00 00 */ stw r0, 0(r3) -/* 80052B10 3C 80 80 3B */ lis r4, __vt__12dDlst_2DT2_c@ha /* 0x803A8E5C@ha */ -/* 80052B14 38 04 8E 5C */ addi r0, r4, __vt__12dDlst_2DT2_c@l /* 0x803A8E5C@l */ -/* 80052B18 90 03 00 00 */ stw r0, 0(r3) -/* 80052B1C 80 02 D1 68 */ lwz r0, lit_4275(r2) -/* 80052B20 90 01 00 08 */ stw r0, 8(r1) -/* 80052B24 88 01 00 08 */ lbz r0, 8(r1) -/* 80052B28 98 03 00 40 */ stb r0, 0x40(r3) -/* 80052B2C 88 01 00 09 */ lbz r0, 9(r1) -/* 80052B30 98 03 00 41 */ stb r0, 0x41(r3) -/* 80052B34 88 01 00 0A */ lbz r0, 0xa(r1) -/* 80052B38 98 03 00 42 */ stb r0, 0x42(r3) -/* 80052B3C 88 01 00 0B */ lbz r0, 0xb(r1) -/* 80052B40 98 03 00 43 */ stb r0, 0x43(r3) -/* 80052B44 38 21 00 10 */ addi r1, r1, 0x10 -/* 80052B48 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/__sinit_d_drawlist_cpp.s b/asm/d/d_drawlist/__sinit_d_drawlist_cpp.s deleted file mode 100644 index b6061ff2833..00000000000 --- a/asm/d/d_drawlist/__sinit_d_drawlist_cpp.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_800569B4: -/* 800569B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 800569B8 7C 08 02 A6 */ mflr r0 -/* 800569BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 800569C0 3C 60 80 42 */ lis r3, mWipeDlst__12dDlst_list_c@ha /* 0x804248F0@ha */ -/* 800569C4 38 63 48 F0 */ addi r3, r3, mWipeDlst__12dDlst_list_c@l /* 0x804248F0@l */ -/* 800569C8 4B FF C1 39 */ bl __ct__12dDlst_2DT2_cFv -/* 800569CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 800569D0 7C 08 03 A6 */ mtlr r0 -/* 800569D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 800569D8 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/calcWipe__12dDlst_list_cFv.s b/asm/d/d_drawlist/calcWipe__12dDlst_list_cFv.s index ea705f89d0f..66c8783fc05 100644 --- a/asm/d/d_drawlist/calcWipe__12dDlst_list_cFv.s +++ b/asm/d/d_drawlist/calcWipe__12dDlst_list_cFv.s @@ -2,7 +2,7 @@ lbl_80056900: /* 80056900 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056904 7C 08 02 A6 */ mflr r0 /* 80056908 90 01 00 14 */ stw r0, 0x14(r1) -/* 8005690C 88 0D 89 50 */ lbz r0, data_80450ED0(r13) +/* 8005690C 88 0D 89 50 */ lbz r0, mWipe__12dDlst_list_c(r13) /* 80056910 28 00 00 00 */ cmplwi r0, 0 /* 80056914 41 82 00 7C */ beq lbl_80056990 /* 80056918 C0 2D 89 54 */ lfs f1, mWipeRate__12dDlst_list_c(r13) @@ -20,7 +20,7 @@ lbl_8005693C: /* 80056944 40 81 00 10 */ ble lbl_80056954 /* 80056948 D0 0D 89 54 */ stfs f0, mWipeRate__12dDlst_list_c(r13) /* 8005694C 38 00 00 00 */ li r0, 0 -/* 80056950 98 0D 89 50 */ stb r0, data_80450ED0(r13) +/* 80056950 98 0D 89 50 */ stb r0, mWipe__12dDlst_list_c(r13) lbl_80056954: /* 80056954 C0 22 86 48 */ lfs f1, lit_4806(r2) /* 80056958 C0 0D 89 54 */ lfs f0, mWipeRate__12dDlst_list_c(r13) diff --git a/asm/d/d_drawlist/newData__13dDlst_peekZ_cFssPUl.s b/asm/d/d_drawlist/newData__13dDlst_peekZ_cFssPUl.s deleted file mode 100644 index 0d21ab3880e..00000000000 --- a/asm/d/d_drawlist/newData__13dDlst_peekZ_cFssPUl.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80056018: -/* 80056018 88 E3 00 00 */ lbz r7, 0(r3) -/* 8005601C 28 07 00 40 */ cmplwi r7, 0x40 -/* 80056020 40 80 00 2C */ bge lbl_8005604C -/* 80056024 7C 80 07 35 */ extsh. r0, r4 -/* 80056028 41 80 00 24 */ blt lbl_8005604C -/* 8005602C 7C 80 07 34 */ extsh r0, r4 -/* 80056030 2C 00 02 5F */ cmpwi r0, 0x25f -/* 80056034 41 81 00 18 */ bgt lbl_8005604C -/* 80056038 7C A0 07 35 */ extsh. r0, r5 -/* 8005603C 41 80 00 10 */ blt lbl_8005604C -/* 80056040 7C A0 07 34 */ extsh r0, r5 -/* 80056044 2C 00 01 BF */ cmpwi r0, 0x1bf -/* 80056048 40 81 00 0C */ ble lbl_80056054 -lbl_8005604C: -/* 8005604C 38 60 00 00 */ li r3, 0 -/* 80056050 4E 80 00 20 */ blr -lbl_80056054: -/* 80056054 54 E7 1D 78 */ rlwinm r7, r7, 3, 0x15, 0x1c -/* 80056058 38 E7 00 04 */ addi r7, r7, 4 -/* 8005605C 7C E3 3A 14 */ add r7, r3, r7 -/* 80056060 B0 87 00 00 */ sth r4, 0(r7) -/* 80056064 B0 A7 00 02 */ sth r5, 2(r7) -/* 80056068 90 C7 00 04 */ stw r6, 4(r7) -/* 8005606C 88 83 00 00 */ lbz r4, 0(r3) -/* 80056070 38 04 00 01 */ addi r0, r4, 1 -/* 80056074 98 03 00 00 */ stb r0, 0(r3) -/* 80056078 38 60 00 01 */ li r3, 1 -/* 8005607C 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/peekData__13dDlst_peekZ_cFv.s b/asm/d/d_drawlist/peekData__13dDlst_peekZ_cFv.s deleted file mode 100644 index 1a7fcaab262..00000000000 --- a/asm/d/d_drawlist/peekData__13dDlst_peekZ_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80056080: -/* 80056080 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80056084 7C 08 02 A6 */ mflr r0 -/* 80056088 90 01 00 24 */ stw r0, 0x24(r1) -/* 8005608C 39 61 00 20 */ addi r11, r1, 0x20 -/* 80056090 48 30 C1 4D */ bl _savegpr_29 -/* 80056094 7C 7D 1B 78 */ mr r29, r3 -/* 80056098 3B FD 00 04 */ addi r31, r29, 4 -/* 8005609C 3B C0 00 00 */ li r30, 0 -/* 800560A0 48 00 00 24 */ b lbl_800560C4 -lbl_800560A4: -/* 800560A4 A8 1F 00 00 */ lha r0, 0(r31) -/* 800560A8 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 800560AC A8 1F 00 02 */ lha r0, 2(r31) -/* 800560B0 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 800560B4 80 BF 00 04 */ lwz r5, 4(r31) -/* 800560B8 48 30 64 05 */ bl GXPeekZ -/* 800560BC 3B FF 00 08 */ addi r31, r31, 8 -/* 800560C0 3B DE 00 01 */ addi r30, r30, 1 -lbl_800560C4: -/* 800560C4 88 1D 00 00 */ lbz r0, 0(r29) -/* 800560C8 7C 1E 00 00 */ cmpw r30, r0 -/* 800560CC 41 80 FF D8 */ blt lbl_800560A4 -/* 800560D0 38 00 00 00 */ li r0, 0 -/* 800560D4 98 1D 00 00 */ stb r0, 0(r29) -/* 800560D8 39 61 00 20 */ addi r11, r1, 0x20 -/* 800560DC 48 30 C1 4D */ bl _restgpr_29 -/* 800560E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 800560E4 7C 08 03 A6 */ mtlr r0 -/* 800560E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 800560EC 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c.s b/asm/d/d_drawlist/set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c.s deleted file mode 100644 index 11219a2c63e..00000000000 --- a/asm/d/d_drawlist/set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_80056794: -/* 80056794 80 64 00 00 */ lwz r3, 0(r4) -/* 80056798 80 05 00 00 */ lwz r0, 0(r5) -/* 8005679C 7C 03 00 40 */ cmplw r3, r0 -/* 800567A0 41 80 00 0C */ blt lbl_800567AC -/* 800567A4 38 60 00 00 */ li r3, 0 -/* 800567A8 4E 80 00 20 */ blr -lbl_800567AC: -/* 800567AC 90 C3 00 00 */ stw r6, 0(r3) -/* 800567B0 80 64 00 00 */ lwz r3, 0(r4) -/* 800567B4 38 03 00 04 */ addi r0, r3, 4 -/* 800567B8 90 04 00 00 */ stw r0, 0(r4) -/* 800567BC 38 60 00 01 */ li r3, 1 -/* 800567C0 4E 80 00 20 */ blr diff --git a/asm/d/d_drawlist/wipeIn__12dDlst_list_cFfR8_GXColor.s b/asm/d/d_drawlist/wipeIn__12dDlst_list_cFfR8_GXColor.s index f8952bc5d58..203277a373a 100644 --- a/asm/d/d_drawlist/wipeIn__12dDlst_list_cFfR8_GXColor.s +++ b/asm/d/d_drawlist/wipeIn__12dDlst_list_cFfR8_GXColor.s @@ -3,7 +3,7 @@ lbl_8005681C: /* 80056820 7C 08 02 A6 */ mflr r0 /* 80056824 90 01 00 14 */ stw r0, 0x14(r1) /* 80056828 38 00 00 01 */ li r0, 1 -/* 8005682C 98 0D 89 50 */ stb r0, data_80450ED0(r13) +/* 8005682C 98 0D 89 50 */ stb r0, mWipe__12dDlst_list_c(r13) /* 80056830 D0 2D 89 58 */ stfs f1, mWipeSpeed__12dDlst_list_c(r13) /* 80056834 88 03 00 00 */ lbz r0, 0(r3) /* 80056838 98 0D 80 DC */ stb r0, mWipeColor__12dDlst_list_c(r13) diff --git a/asm/d/d_kantera_icon_meter/setPos__15dKantera_icon_cFff.s b/asm/d/d_kantera_icon_meter/setPos__15dKantera_icon_cFff.s deleted file mode 100644 index 197ae85eb40..00000000000 --- a/asm/d/d_kantera_icon_meter/setPos__15dKantera_icon_cFff.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_801AEBA0: -/* 801AEBA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AEBA4 7C 08 02 A6 */ mflr r0 -/* 801AEBA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AEBAC 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801AEBB0 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801AEBB4 C0 04 06 10 */ lfs f0, 0x610(r4) -/* 801AEBB8 EC 42 00 2A */ fadds f2, f2, f0 -/* 801AEBBC 80 63 00 08 */ lwz r3, 8(r3) -/* 801AEBC0 80 63 00 04 */ lwz r3, 4(r3) -/* 801AEBC4 C0 04 06 0C */ lfs f0, 0x60c(r4) -/* 801AEBC8 EC 01 00 2A */ fadds f0, f1, f0 -/* 801AEBCC D0 03 00 D4 */ stfs f0, 0xd4(r3) -/* 801AEBD0 D0 43 00 D8 */ stfs f2, 0xd8(r3) -/* 801AEBD4 81 83 00 00 */ lwz r12, 0(r3) -/* 801AEBD8 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801AEBDC 7D 89 03 A6 */ mtctr r12 -/* 801AEBE0 4E 80 04 21 */ bctrl -/* 801AEBE4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AEBE8 7C 08 03 A6 */ mtlr r0 -/* 801AEBEC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AEBF0 4E 80 00 20 */ blr diff --git a/asm/d/d_kantera_icon_meter/setScale__15dKantera_icon_cFff.s b/asm/d/d_kantera_icon_meter/setScale__15dKantera_icon_cFff.s deleted file mode 100644 index 5e798102970..00000000000 --- a/asm/d/d_kantera_icon_meter/setScale__15dKantera_icon_cFff.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801AEBF4: -/* 801AEBF4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AEBF8 7C 08 02 A6 */ mflr r0 -/* 801AEBFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AEC00 3C 80 80 43 */ lis r4, g_drawHIO@ha /* 0x8042EBC8@ha */ -/* 801AEC04 38 84 EB C8 */ addi r4, r4, g_drawHIO@l /* 0x8042EBC8@l */ -/* 801AEC08 C0 04 06 14 */ lfs f0, 0x614(r4) -/* 801AEC0C EC 42 00 32 */ fmuls f2, f2, f0 -/* 801AEC10 80 63 00 08 */ lwz r3, 8(r3) -/* 801AEC14 80 63 00 04 */ lwz r3, 4(r3) -/* 801AEC18 EC 01 00 32 */ fmuls f0, f1, f0 -/* 801AEC1C D0 03 00 CC */ stfs f0, 0xcc(r3) -/* 801AEC20 D0 43 00 D0 */ stfs f2, 0xd0(r3) -/* 801AEC24 81 83 00 00 */ lwz r12, 0(r3) -/* 801AEC28 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 801AEC2C 7D 89 03 A6 */ mtctr r12 -/* 801AEC30 4E 80 04 21 */ bctrl -/* 801AEC34 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AEC38 7C 08 03 A6 */ mtlr r0 -/* 801AEC3C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AEC40 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/create__Q28dMpath_n18dTexObjAggregate_cFv.s b/asm/d/map/d_map_path/create__Q28dMpath_n18dTexObjAggregate_cFv.s deleted file mode 100644 index bc252a814ff..00000000000 --- a/asm/d/map/d_map_path/create__Q28dMpath_n18dTexObjAggregate_cFv.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_8003C85C: -/* 8003C85C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003C860 7C 08 02 A6 */ mflr r0 -/* 8003C864 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003C868 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C86C 48 32 59 65 */ bl _savegpr_26 -/* 8003C870 7C 7A 1B 78 */ mr r26, r3 -/* 8003C874 3B 60 00 00 */ li r27, 0 -/* 8003C878 3B E0 00 00 */ li r31, 0 -/* 8003C87C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003C880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003C884 3F 83 00 02 */ addis r28, r3, 2 -/* 8003C888 3C 60 80 38 */ lis r3, d_map_d_map_path__stringBase0@ha /* 0x80379C4C@ha */ -/* 8003C88C 3B A3 9C 4C */ addi r29, r3, d_map_d_map_path__stringBase0@l /* 0x80379C4C@l */ -/* 8003C890 3C 60 80 38 */ lis r3, data@ha /* 0x80379C30@ha */ -/* 8003C894 3B C3 9C 30 */ addi r30, r3, data@l /* 0x80379C30@l */ -/* 8003C898 3B 9C C2 F8 */ addi r28, r28, -15624 -lbl_8003C89C: -/* 8003C89C 38 60 00 20 */ li r3, 0x20 -/* 8003C8A0 48 29 23 AD */ bl __nw__FUl -/* 8003C8A4 7C 7A F9 2E */ stwx r3, r26, r31 -/* 8003C8A8 7F A3 EB 78 */ mr r3, r29 -/* 8003C8AC 7C 9E F8 2E */ lwzx r4, r30, r31 -/* 8003C8B0 7F 85 E3 78 */ mr r5, r28 -/* 8003C8B4 38 C0 00 80 */ li r6, 0x80 -/* 8003C8B8 4B FF FA 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci -/* 8003C8BC 7C 9A F8 2E */ lwzx r4, r26, r31 -/* 8003C8C0 38 A0 00 00 */ li r5, 0 -/* 8003C8C4 38 C0 00 00 */ li r6, 0 -/* 8003C8C8 4B FD 88 75 */ bl mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj -/* 8003C8CC 3B 7B 00 01 */ addi r27, r27, 1 -/* 8003C8D0 2C 1B 00 07 */ cmpwi r27, 7 -/* 8003C8D4 3B FF 00 04 */ addi r31, r31, 4 -/* 8003C8D8 41 80 FF C4 */ blt lbl_8003C89C -/* 8003C8DC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C8E0 48 32 59 3D */ bl _restgpr_26 -/* 8003C8E4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003C8E8 7C 08 03 A6 */ mtlr r0 -/* 8003C8EC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C8F0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/drawPath__11dDrawPath_cFv.s b/asm/d/map/d_map_path/drawPath__11dDrawPath_cFv.s deleted file mode 100644 index 0414aa64a39..00000000000 --- a/asm/d/map/d_map_path/drawPath__11dDrawPath_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8003CCC4: -/* 8003CCC4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003CCC8 7C 08 02 A6 */ mflr r0 -/* 8003CCCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003CCD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003CCD4 7C 7F 1B 78 */ mr r31, r3 -/* 8003CCD8 81 83 00 00 */ lwz r12, 0(r3) -/* 8003CCDC 81 8C 00 28 */ lwz r12, 0x28(r12) -/* 8003CCE0 7D 89 03 A6 */ mtctr r12 -/* 8003CCE4 4E 80 04 21 */ bctrl -/* 8003CCE8 7C 64 1B 78 */ mr r4, r3 -/* 8003CCEC 48 00 00 30 */ b lbl_8003CD1C -lbl_8003CCF0: -/* 8003CCF0 7F E3 FB 78 */ mr r3, r31 -/* 8003CCF4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CCF8 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 8003CCFC 7D 89 03 A6 */ mtctr r12 -/* 8003CD00 4E 80 04 21 */ bctrl -/* 8003CD04 7F E3 FB 78 */ mr r3, r31 -/* 8003CD08 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CD0C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 8003CD10 7D 89 03 A6 */ mtctr r12 -/* 8003CD14 4E 80 04 21 */ bctrl -/* 8003CD18 7C 64 1B 78 */ mr r4, r3 -lbl_8003CD1C: -/* 8003CD1C 28 04 00 00 */ cmplwi r4, 0 -/* 8003CD20 40 82 FF D0 */ bne lbl_8003CCF0 -/* 8003CD24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003CD28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003CD2C 7C 08 03 A6 */ mtlr r0 -/* 8003CD30 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003CD34 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/getDecoLineColor__18dRenderingFDAmap_cFii.s b/asm/d/map/d_map_path/getDecoLineColor__18dRenderingFDAmap_cFii.s deleted file mode 100644 index 4c97e5ab299..00000000000 --- a/asm/d/map/d_map_path/getDecoLineColor__18dRenderingFDAmap_cFii.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003D68C: -/* 8003D68C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003D690 7C 08 02 A6 */ mflr r0 -/* 8003D694 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003D698 81 83 00 00 */ lwz r12, 0(r3) -/* 8003D69C 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8003D6A0 7D 89 03 A6 */ mtctr r12 -/* 8003D6A4 4E 80 04 21 */ bctrl -/* 8003D6A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003D6AC 7C 08 03 A6 */ mtlr r0 -/* 8003D6B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003D6B4 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/getDecorationLineWidth__18dRenderingFDAmap_cFi.s b/asm/d/map/d_map_path/getDecorationLineWidth__18dRenderingFDAmap_cFi.s deleted file mode 100644 index 5bb0fe03826..00000000000 --- a/asm/d/map/d_map_path/getDecorationLineWidth__18dRenderingFDAmap_cFi.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_8003D6B8: -/* 8003D6B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003D6BC 7C 08 02 A6 */ mflr r0 -/* 8003D6C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003D6C4 81 83 00 00 */ lwz r12, 0(r3) -/* 8003D6C8 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8003D6CC 7D 89 03 A6 */ mtctr r12 -/* 8003D6D0 4E 80 04 21 */ bctrl -/* 8003D6D4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003D6D8 7C 08 03 A6 */ mtlr r0 -/* 8003D6DC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003D6E0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s b/asm/d/map/d_map_path/makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s deleted file mode 100644 index f432b77e9dd..00000000000 --- a/asm/d/map/d_map_path/makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8003CD38: -/* 8003CD38 38 00 00 09 */ li r0, 9 -/* 8003CD3C 98 04 00 00 */ stb r0, 0(r4) -/* 8003CD40 38 00 00 02 */ li r0, 2 -/* 8003CD44 98 04 00 01 */ stb r0, 1(r4) -/* 8003CD48 B0 A4 00 02 */ sth r5, 2(r4) -/* 8003CD4C B0 C4 00 04 */ sth r6, 4(r4) -/* 8003CD50 38 A0 00 00 */ li r5, 0 -/* 8003CD54 98 A4 00 06 */ stb r5, 6(r4) -/* 8003CD58 98 A4 00 07 */ stb r5, 7(r4) -/* 8003CD5C 38 60 00 01 */ li r3, 1 -/* 8003CD60 98 64 00 08 */ stb r3, 8(r4) -/* 8003CD64 98 04 00 09 */ stb r0, 9(r4) -/* 8003CD68 55 20 14 3A */ rlwinm r0, r9, 2, 0x10, 0x1d -/* 8003CD6C B0 04 00 0A */ sth r0, 0xa(r4) -/* 8003CD70 7C 04 40 50 */ subf r0, r4, r8 -/* 8003CD74 90 04 00 0C */ stw r0, 0xc(r4) -/* 8003CD78 98 A4 00 10 */ stb r5, 0x10(r4) -/* 8003CD7C 98 A4 00 11 */ stb r5, 0x11(r4) -/* 8003CD80 98 A4 00 12 */ stb r5, 0x12(r4) -/* 8003CD84 98 A4 00 13 */ stb r5, 0x13(r4) -/* 8003CD88 98 64 00 14 */ stb r3, 0x14(r4) -/* 8003CD8C 98 64 00 15 */ stb r3, 0x15(r4) -/* 8003CD90 98 A4 00 16 */ stb r5, 0x16(r4) -/* 8003CD94 98 A4 00 17 */ stb r5, 0x17(r4) -/* 8003CD98 98 64 00 18 */ stb r3, 0x18(r4) -/* 8003CD9C B0 A4 00 1A */ sth r5, 0x1a(r4) -/* 8003CDA0 7C 04 38 50 */ subf r0, r4, r7 -/* 8003CDA4 90 04 00 1C */ stw r0, 0x1c(r4) -/* 8003CDA8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/postRenderingMap__18dRenderingFDAmap_cFv.s b/asm/d/map/d_map_path/postRenderingMap__18dRenderingFDAmap_cFv.s deleted file mode 100644 index eddccfb0afe..00000000000 --- a/asm/d/map/d_map_path/postRenderingMap__18dRenderingFDAmap_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_8003D320: -/* 8003D320 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003D324 7C 08 02 A6 */ mflr r0 -/* 8003D328 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003D32C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003D330 7C 7F 1B 78 */ mr r31, r3 -/* 8003D334 38 60 00 00 */ li r3, 0 -/* 8003D338 38 80 00 00 */ li r4, 0 -/* 8003D33C 38 A0 00 00 */ li r5, 0 -/* 8003D340 38 C0 00 00 */ li r6, 0 -/* 8003D344 48 31 FD A5 */ bl GXSetCopyFilter -/* 8003D348 38 60 00 00 */ li r3, 0 -/* 8003D34C 38 80 00 00 */ li r4, 0 -/* 8003D350 A0 BF 00 1C */ lhz r5, 0x1c(r31) -/* 8003D354 A0 DF 00 1E */ lhz r6, 0x1e(r31) -/* 8003D358 48 31 F7 29 */ bl GXSetTexCopySrc -/* 8003D35C A0 7F 00 1C */ lhz r3, 0x1c(r31) -/* 8003D360 A0 9F 00 1E */ lhz r4, 0x1e(r31) -/* 8003D364 38 A0 00 28 */ li r5, 0x28 -/* 8003D368 38 C0 00 00 */ li r6, 0 -/* 8003D36C 48 31 F7 C5 */ bl GXSetTexCopyDst -/* 8003D370 80 7F 00 04 */ lwz r3, 4(r31) -/* 8003D374 38 80 00 01 */ li r4, 1 -/* 8003D378 48 32 00 F5 */ bl GXCopyTex -/* 8003D37C 48 31 EF F9 */ bl GXPixModeSync -/* 8003D380 38 60 00 00 */ li r3, 0 -/* 8003D384 48 32 32 4D */ bl GXSetClipMode -/* 8003D388 38 60 00 01 */ li r3, 1 -/* 8003D38C 48 32 2A 4D */ bl GXSetDither -/* 8003D390 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8003D394 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8003D398 80 63 5F 50 */ lwz r3, 0x5f50(r3) -/* 8003D39C 81 83 00 00 */ lwz r12, 0(r3) -/* 8003D3A0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8003D3A4 7D 89 03 A6 */ mtctr r12 -/* 8003D3A8 4E 80 04 21 */ bctrl -/* 8003D3AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003D3B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003D3B4 7C 08 03 A6 */ mtlr r0 -/* 8003D3B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003D3BC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/remove__Q28dMpath_n18dTexObjAggregate_cFv.s b/asm/d/map/d_map_path/remove__Q28dMpath_n18dTexObjAggregate_cFv.s deleted file mode 100644 index 385d3d34f75..00000000000 --- a/asm/d/map/d_map_path/remove__Q28dMpath_n18dTexObjAggregate_cFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_8003C8F4: -/* 8003C8F4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003C8F8 7C 08 02 A6 */ mflr r0 -/* 8003C8FC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003C900 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C904 48 32 58 D5 */ bl _savegpr_28 -/* 8003C908 7C 7C 1B 78 */ mr r28, r3 -/* 8003C90C 3B A0 00 00 */ li r29, 0 -/* 8003C910 3B E0 00 00 */ li r31, 0 -/* 8003C914 7F FE FB 78 */ mr r30, r31 -lbl_8003C918: -/* 8003C918 7C 7C F8 2E */ lwzx r3, r28, r31 -/* 8003C91C 48 29 24 21 */ bl __dl__FPv -/* 8003C920 7F DC F9 2E */ stwx r30, r28, r31 -/* 8003C924 3B BD 00 01 */ addi r29, r29, 1 -/* 8003C928 2C 1D 00 07 */ cmpwi r29, 7 -/* 8003C92C 3B FF 00 04 */ addi r31, r31, 4 -/* 8003C930 41 80 FF E8 */ blt lbl_8003C918 -/* 8003C934 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003C938 48 32 58 ED */ bl _restgpr_28 -/* 8003C93C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003C940 7C 08 03 A6 */ mtlr r0 -/* 8003C944 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003C948 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/renderingMap__15dRenderingMap_cFv.s b/asm/d/map/d_map_path/renderingMap__15dRenderingMap_cFv.s deleted file mode 100644 index f2967bf9f15..00000000000 --- a/asm/d/map/d_map_path/renderingMap__15dRenderingMap_cFv.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_8003CDAC: -/* 8003CDAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003CDB0 7C 08 02 A6 */ mflr r0 -/* 8003CDB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003CDB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8003CDBC 7C 7F 1B 78 */ mr r31, r3 -/* 8003CDC0 81 83 00 00 */ lwz r12, 0(r3) -/* 8003CDC4 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 8003CDC8 7D 89 03 A6 */ mtctr r12 -/* 8003CDCC 4E 80 04 21 */ bctrl -/* 8003CDD0 7F E3 FB 78 */ mr r3, r31 -/* 8003CDD4 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CDD8 81 8C 00 50 */ lwz r12, 0x50(r12) -/* 8003CDDC 7D 89 03 A6 */ mtctr r12 -/* 8003CDE0 4E 80 04 21 */ bctrl -/* 8003CDE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003CDE8 41 82 00 68 */ beq lbl_8003CE50 -/* 8003CDEC 7F E3 FB 78 */ mr r3, r31 -/* 8003CDF0 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CDF4 81 8C 00 48 */ lwz r12, 0x48(r12) -/* 8003CDF8 7D 89 03 A6 */ mtctr r12 -/* 8003CDFC 4E 80 04 21 */ bctrl -/* 8003CE00 7F E3 FB 78 */ mr r3, r31 -/* 8003CE04 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CE08 81 8C 00 40 */ lwz r12, 0x40(r12) -/* 8003CE0C 7D 89 03 A6 */ mtctr r12 -/* 8003CE10 4E 80 04 21 */ bctrl -/* 8003CE14 7F E3 FB 78 */ mr r3, r31 -/* 8003CE18 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CE1C 81 8C 00 30 */ lwz r12, 0x30(r12) -/* 8003CE20 7D 89 03 A6 */ mtctr r12 -/* 8003CE24 4E 80 04 21 */ bctrl -/* 8003CE28 7F E3 FB 78 */ mr r3, r31 -/* 8003CE2C 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CE30 81 8C 00 44 */ lwz r12, 0x44(r12) -/* 8003CE34 7D 89 03 A6 */ mtctr r12 -/* 8003CE38 4E 80 04 21 */ bctrl -/* 8003CE3C 7F E3 FB 78 */ mr r3, r31 -/* 8003CE40 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CE44 81 8C 00 4C */ lwz r12, 0x4c(r12) -/* 8003CE48 7D 89 03 A6 */ mtctr r12 -/* 8003CE4C 4E 80 04 21 */ bctrl -lbl_8003CE50: -/* 8003CE50 7F E3 FB 78 */ mr r3, r31 -/* 8003CE54 81 9F 00 00 */ lwz r12, 0(r31) -/* 8003CE58 81 8C 00 58 */ lwz r12, 0x58(r12) -/* 8003CE5C 7D 89 03 A6 */ mtctr r12 -/* 8003CE60 4E 80 04 21 */ bctrl -/* 8003CE64 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8003CE68 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003CE6C 7C 08 03 A6 */ mtlr r0 -/* 8003CE70 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003CE74 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class.s b/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class.s deleted file mode 100644 index 164d92421c4..00000000000 --- a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_8003C94C: -/* 8003C94C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003C950 7C 08 02 A6 */ mflr r0 -/* 8003C954 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003C958 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8003C95C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8003C960 7C 7E 1B 78 */ mr r30, r3 -/* 8003C964 7C 9F 23 78 */ mr r31, r4 -/* 8003C968 88 84 00 00 */ lbz r4, 0(r4) -/* 8003C96C 81 83 00 00 */ lwz r12, 0(r3) -/* 8003C970 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8003C974 7D 89 03 A6 */ mtctr r12 -/* 8003C978 4E 80 04 21 */ bctrl -/* 8003C97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003C980 41 82 00 A8 */ beq lbl_8003CA28 -/* 8003C984 7F C3 F3 78 */ mr r3, r30 -/* 8003C988 88 9F 00 01 */ lbz r4, 1(r31) -/* 8003C98C 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003C990 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 8003C994 7D 89 03 A6 */ mtctr r12 -/* 8003C998 4E 80 04 21 */ bctrl -/* 8003C99C 2C 03 00 00 */ cmpwi r3, 0 -/* 8003C9A0 40 81 00 88 */ ble lbl_8003CA28 -/* 8003C9A4 88 1F 00 02 */ lbz r0, 2(r31) -/* 8003C9A8 28 00 00 02 */ cmplwi r0, 2 -/* 8003C9AC 41 80 00 7C */ blt lbl_8003CA28 -/* 8003C9B0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8003C9B4 38 80 00 00 */ li r4, 0 -/* 8003C9B8 48 31 FF 05 */ bl GXSetLineWidth -/* 8003C9BC 7F C3 F3 78 */ mr r3, r30 -/* 8003C9C0 88 1F 00 00 */ lbz r0, 0(r31) -/* 8003C9C4 54 04 06 BE */ clrlwi r4, r0, 0x1a -/* 8003C9C8 88 BF 00 01 */ lbz r5, 1(r31) -/* 8003C9CC 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003C9D0 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 8003C9D4 7D 89 03 A6 */ mtctr r12 -/* 8003C9D8 4E 80 04 21 */ bctrl -/* 8003C9DC 80 03 00 00 */ lwz r0, 0(r3) -/* 8003C9E0 90 01 00 08 */ stw r0, 8(r1) -/* 8003C9E4 38 60 00 01 */ li r3, 1 -/* 8003C9E8 38 81 00 08 */ addi r4, r1, 8 -/* 8003C9EC 48 32 29 91 */ bl GXSetTevColor -/* 8003C9F0 38 60 00 B0 */ li r3, 0xb0 -/* 8003C9F4 38 80 00 00 */ li r4, 0 -/* 8003C9F8 88 BF 00 02 */ lbz r5, 2(r31) -/* 8003C9FC 48 31 FD 69 */ bl GXBegin -/* 8003CA00 80 9F 00 04 */ lwz r4, 4(r31) -/* 8003CA04 3C 60 CC 01 */ lis r3, 0xcc01 -/* 8003CA08 88 1F 00 02 */ lbz r0, 2(r31) -/* 8003CA0C 7C 09 03 A6 */ mtctr r0 -/* 8003CA10 2C 00 00 00 */ cmpwi r0, 0 -/* 8003CA14 40 81 00 14 */ ble lbl_8003CA28 -lbl_8003CA18: -/* 8003CA18 A0 04 00 00 */ lhz r0, 0(r4) -/* 8003CA1C B0 03 80 00 */ sth r0, -0x8000(r3) -/* 8003CA20 38 84 00 02 */ addi r4, r4, 2 -/* 8003CA24 42 00 FF F4 */ bdnz lbl_8003CA18 -lbl_8003CA28: -/* 8003CA28 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8003CA2C 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8003CA30 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003CA34 7C 08 03 A6 */ mtlr r0 -/* 8003CA38 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CA3C 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class.s b/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class.s deleted file mode 100644 index 0485f0ff5fe..00000000000 --- a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8003CA40: -/* 8003CA40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003CA44 7C 08 02 A6 */ mflr r0 -/* 8003CA48 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003CA4C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8003CA50 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8003CA54 7C 7E 1B 78 */ mr r30, r3 -/* 8003CA58 7C 9F 23 78 */ mr r31, r4 -/* 8003CA5C 88 84 00 00 */ lbz r4, 0(r4) -/* 8003CA60 81 83 00 00 */ lwz r12, 0(r3) -/* 8003CA64 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 8003CA68 7D 89 03 A6 */ mtctr r12 -/* 8003CA6C 4E 80 04 21 */ bctrl -/* 8003CA70 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003CA74 41 82 00 74 */ beq lbl_8003CAE8 -/* 8003CA78 7F C3 F3 78 */ mr r3, r30 -/* 8003CA7C 88 1F 00 00 */ lbz r0, 0(r31) -/* 8003CA80 54 04 06 BE */ clrlwi r4, r0, 0x1a -/* 8003CA84 81 9E 00 00 */ lwz r12, 0(r30) -/* 8003CA88 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 8003CA8C 7D 89 03 A6 */ mtctr r12 -/* 8003CA90 4E 80 04 21 */ bctrl -/* 8003CA94 80 03 00 00 */ lwz r0, 0(r3) -/* 8003CA98 90 01 00 08 */ stw r0, 8(r1) -/* 8003CA9C 38 60 00 01 */ li r3, 1 -/* 8003CAA0 38 81 00 08 */ addi r4, r1, 8 -/* 8003CAA4 48 32 28 D9 */ bl GXSetTevColor -/* 8003CAA8 88 BF 00 01 */ lbz r5, 1(r31) -/* 8003CAAC 28 05 00 03 */ cmplwi r5, 3 -/* 8003CAB0 41 80 00 38 */ blt lbl_8003CAE8 -/* 8003CAB4 38 60 00 98 */ li r3, 0x98 -/* 8003CAB8 38 80 00 00 */ li r4, 0 -/* 8003CABC 48 31 FC A9 */ bl GXBegin -/* 8003CAC0 80 9F 00 04 */ lwz r4, 4(r31) -/* 8003CAC4 3C 60 CC 01 */ lis r3, 0xcc01 -/* 8003CAC8 88 1F 00 01 */ lbz r0, 1(r31) -/* 8003CACC 7C 09 03 A6 */ mtctr r0 -/* 8003CAD0 2C 00 00 00 */ cmpwi r0, 0 -/* 8003CAD4 40 81 00 14 */ ble lbl_8003CAE8 -lbl_8003CAD8: -/* 8003CAD8 A0 04 00 00 */ lhz r0, 0(r4) -/* 8003CADC B0 03 80 00 */ sth r0, -0x8000(r3) -/* 8003CAE0 38 84 00 02 */ addi r4, r4, 2 -/* 8003CAE4 42 00 FF F4 */ bdnz lbl_8003CAD8 -lbl_8003CAE8: -/* 8003CAE8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8003CAEC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8003CAF0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003CAF4 7C 08 03 A6 */ mtlr r0 -/* 8003CAF8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CAFC 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class.s b/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class.s deleted file mode 100644 index d8ea454612e..00000000000 --- a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class.s +++ /dev/null @@ -1,45 +0,0 @@ -lbl_8003CC24: -/* 8003CC24 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003CC28 7C 08 02 A6 */ mflr r0 -/* 8003CC2C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003CC30 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CC34 48 32 55 A5 */ bl _savegpr_28 -/* 8003CC38 7C 7C 1B 78 */ mr r28, r3 -/* 8003CC3C 7C 9D 23 79 */ or. r29, r4, r4 -/* 8003CC40 41 82 00 6C */ beq lbl_8003CCAC -/* 8003CC44 38 60 00 09 */ li r3, 9 -/* 8003CC48 80 9D 00 08 */ lwz r4, 8(r29) -/* 8003CC4C 38 A0 00 08 */ li r5, 8 -/* 8003CC50 48 31 EE D9 */ bl GXSetArray -/* 8003CC54 83 FD 00 04 */ lwz r31, 4(r29) -/* 8003CC58 28 1F 00 00 */ cmplwi r31, 0 -/* 8003CC5C 41 82 00 50 */ beq lbl_8003CCAC -/* 8003CC60 3B C0 00 00 */ li r30, 0 -/* 8003CC64 48 00 00 3C */ b lbl_8003CCA0 -lbl_8003CC68: -/* 8003CC68 7F 83 E3 78 */ mr r3, r28 -/* 8003CC6C 88 9F 00 00 */ lbz r4, 0(r31) -/* 8003CC70 7C 84 07 74 */ extsb r4, r4 -/* 8003CC74 81 9C 00 00 */ lwz r12, 0(r28) -/* 8003CC78 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 8003CC7C 7D 89 03 A6 */ mtctr r12 -/* 8003CC80 4E 80 04 21 */ bctrl -/* 8003CC84 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003CC88 41 82 00 10 */ beq lbl_8003CC98 -/* 8003CC8C 7F 83 E3 78 */ mr r3, r28 -/* 8003CC90 7F E4 FB 78 */ mr r4, r31 -/* 8003CC94 4B FF FF 29 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class -lbl_8003CC98: -/* 8003CC98 3B FF 00 08 */ addi r31, r31, 8 -/* 8003CC9C 3B DE 00 01 */ addi r30, r30, 1 -lbl_8003CCA0: -/* 8003CCA0 88 1D 00 00 */ lbz r0, 0(r29) -/* 8003CCA4 7C 1E 00 00 */ cmpw r30, r0 -/* 8003CCA8 41 80 FF C0 */ blt lbl_8003CC68 -lbl_8003CCAC: -/* 8003CCAC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CCB0 48 32 55 75 */ bl _restgpr_28 -/* 8003CCB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003CCB8 7C 08 03 A6 */ mtlr r0 -/* 8003CCBC 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CCC0 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class.s b/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class.s deleted file mode 100644 index 77603cc4169..00000000000 --- a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_8003CBBC: -/* 8003CBBC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003CBC0 7C 08 02 A6 */ mflr r0 -/* 8003CBC4 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003CBC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CBCC 48 32 56 0D */ bl _savegpr_28 -/* 8003CBD0 7C 7C 1B 78 */ mr r28, r3 -/* 8003CBD4 80 04 00 04 */ lwz r0, 4(r4) -/* 8003CBD8 28 00 00 00 */ cmplwi r0, 0 -/* 8003CBDC 41 82 00 30 */ beq lbl_8003CC0C -/* 8003CBE0 7C 1E 03 78 */ mr r30, r0 -/* 8003CBE4 3B A0 00 00 */ li r29, 0 -/* 8003CBE8 8B E4 00 01 */ lbz r31, 1(r4) -/* 8003CBEC 48 00 00 18 */ b lbl_8003CC04 -lbl_8003CBF0: -/* 8003CBF0 7F 83 E3 78 */ mr r3, r28 -/* 8003CBF4 7F C4 F3 78 */ mr r4, r30 -/* 8003CBF8 4B FF FF 09 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class -/* 8003CBFC 3B DE 00 14 */ addi r30, r30, 0x14 -/* 8003CC00 3B BD 00 01 */ addi r29, r29, 1 -lbl_8003CC04: -/* 8003CC04 7C 1D F8 00 */ cmpw r29, r31 -/* 8003CC08 41 80 FF E8 */ blt lbl_8003CBF0 -lbl_8003CC0C: -/* 8003CC0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CC10 48 32 56 15 */ bl _restgpr_28 -/* 8003CC14 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003CC18 7C 08 03 A6 */ mtlr r0 -/* 8003CC1C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CC20 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class.s b/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class.s deleted file mode 100644 index 170ba00b3ec..00000000000 --- a/asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class.s +++ /dev/null @@ -1,53 +0,0 @@ -lbl_8003CB00: -/* 8003CB00 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8003CB04 7C 08 02 A6 */ mflr r0 -/* 8003CB08 90 01 00 24 */ stw r0, 0x24(r1) -/* 8003CB0C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CB10 48 32 56 C5 */ bl _savegpr_27 -/* 8003CB14 7C 7B 1B 78 */ mr r27, r3 -/* 8003CB18 7C 9C 23 78 */ mr r28, r4 -/* 8003CB1C 81 83 00 00 */ lwz r12, 0(r3) -/* 8003CB20 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 8003CB24 7D 89 03 A6 */ mtctr r12 -/* 8003CB28 4E 80 04 21 */ bctrl -/* 8003CB2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8003CB30 41 82 00 74 */ beq lbl_8003CBA4 -/* 8003CB34 83 DC 00 10 */ lwz r30, 0x10(r28) -/* 8003CB38 3B A0 00 00 */ li r29, 0 -/* 8003CB3C 8B FC 00 04 */ lbz r31, 4(r28) -/* 8003CB40 48 00 00 24 */ b lbl_8003CB64 -lbl_8003CB44: -/* 8003CB44 7F 63 DB 78 */ mr r3, r27 -/* 8003CB48 7F C4 F3 78 */ mr r4, r30 -/* 8003CB4C 81 9B 00 00 */ lwz r12, 0(r27) -/* 8003CB50 81 8C 00 38 */ lwz r12, 0x38(r12) -/* 8003CB54 7D 89 03 A6 */ mtctr r12 -/* 8003CB58 4E 80 04 21 */ bctrl -/* 8003CB5C 3B DE 00 08 */ addi r30, r30, 8 -/* 8003CB60 3B BD 00 01 */ addi r29, r29, 1 -lbl_8003CB64: -/* 8003CB64 7C 1D F8 00 */ cmpw r29, r31 -/* 8003CB68 41 80 FF DC */ blt lbl_8003CB44 -/* 8003CB6C 83 BC 00 08 */ lwz r29, 8(r28) -/* 8003CB70 3B C0 00 00 */ li r30, 0 -/* 8003CB74 8B FC 00 02 */ lbz r31, 2(r28) -/* 8003CB78 48 00 00 24 */ b lbl_8003CB9C -lbl_8003CB7C: -/* 8003CB7C 7F 63 DB 78 */ mr r3, r27 -/* 8003CB80 7F A4 EB 78 */ mr r4, r29 -/* 8003CB84 81 9B 00 00 */ lwz r12, 0(r27) -/* 8003CB88 81 8C 00 34 */ lwz r12, 0x34(r12) -/* 8003CB8C 7D 89 03 A6 */ mtctr r12 -/* 8003CB90 4E 80 04 21 */ bctrl -/* 8003CB94 3B BD 00 08 */ addi r29, r29, 8 -/* 8003CB98 3B DE 00 01 */ addi r30, r30, 1 -lbl_8003CB9C: -/* 8003CB9C 7C 1E F8 00 */ cmpw r30, r31 -/* 8003CBA0 41 80 FF DC */ blt lbl_8003CB7C -lbl_8003CBA4: -/* 8003CBA4 39 61 00 20 */ addi r11, r1, 0x20 -/* 8003CBA8 48 32 56 79 */ bl _restgpr_27 -/* 8003CBAC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8003CBB0 7C 08 03 A6 */ mtlr r0 -/* 8003CBB4 38 21 00 20 */ addi r1, r1, 0x20 -/* 8003CBB8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv.s b/asm/d/map/d_map_path/setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv.s deleted file mode 100644 index 0e937f36433..00000000000 --- a/asm/d/map/d_map_path/setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv.s +++ /dev/null @@ -1,92 +0,0 @@ -lbl_8003CF40: -/* 8003CF40 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003CF44 7C 08 02 A6 */ mflr r0 -/* 8003CF48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003CF4C 38 60 00 02 */ li r3, 2 -/* 8003CF50 48 32 29 41 */ bl GXSetNumTevStages -/* 8003CF54 38 60 00 01 */ li r3, 1 -/* 8003CF58 48 32 0B D9 */ bl GXSetNumChans -/* 8003CF5C 38 60 00 01 */ li r3, 1 -/* 8003CF60 48 31 EE 9D */ bl GXSetNumTexGens -/* 8003CF64 38 60 00 00 */ li r3, 0 -/* 8003CF68 38 80 00 01 */ li r4, 1 -/* 8003CF6C 38 A0 00 04 */ li r5, 4 -/* 8003CF70 38 C0 00 3C */ li r6, 0x3c -/* 8003CF74 38 E0 00 00 */ li r7, 0 -/* 8003CF78 39 00 00 7D */ li r8, 0x7d -/* 8003CF7C 48 31 EC 01 */ bl GXSetTexCoordGen2 -/* 8003CF80 38 60 00 00 */ li r3, 0 -/* 8003CF84 38 80 00 00 */ li r4, 0 -/* 8003CF88 38 A0 00 00 */ li r5, 0 -/* 8003CF8C 38 C0 00 04 */ li r6, 4 -/* 8003CF90 48 32 27 65 */ bl GXSetTevOrder -/* 8003CF94 38 60 00 01 */ li r3, 1 -/* 8003CF98 38 80 00 00 */ li r4, 0 -/* 8003CF9C 38 A0 00 00 */ li r5, 0 -/* 8003CFA0 38 C0 00 04 */ li r6, 4 -/* 8003CFA4 48 32 27 51 */ bl GXSetTevOrder -/* 8003CFA8 38 60 00 00 */ li r3, 0 -/* 8003CFAC 38 80 00 0F */ li r4, 0xf -/* 8003CFB0 38 A0 00 0E */ li r5, 0xe -/* 8003CFB4 38 C0 00 08 */ li r6, 8 -/* 8003CFB8 38 E0 00 04 */ li r7, 4 -/* 8003CFBC 48 32 22 69 */ bl GXSetTevColorIn -/* 8003CFC0 38 60 00 00 */ li r3, 0 -/* 8003CFC4 38 80 00 00 */ li r4, 0 -/* 8003CFC8 38 A0 00 00 */ li r5, 0 -/* 8003CFCC 38 C0 00 00 */ li r6, 0 -/* 8003CFD0 38 E0 00 01 */ li r7, 1 -/* 8003CFD4 39 00 00 00 */ li r8, 0 -/* 8003CFD8 48 32 22 D5 */ bl GXSetTevColorOp -/* 8003CFDC 38 60 00 01 */ li r3, 1 -/* 8003CFE0 38 80 00 00 */ li r4, 0 -/* 8003CFE4 38 A0 00 06 */ li r5, 6 -/* 8003CFE8 38 C0 00 00 */ li r6, 0 -/* 8003CFEC 38 E0 00 0F */ li r7, 0xf -/* 8003CFF0 48 32 22 35 */ bl GXSetTevColorIn -/* 8003CFF4 38 60 00 01 */ li r3, 1 -/* 8003CFF8 38 80 00 08 */ li r4, 8 -/* 8003CFFC 38 A0 00 00 */ li r5, 0 -/* 8003D000 38 C0 00 00 */ li r6, 0 -/* 8003D004 38 E0 00 01 */ li r7, 1 -/* 8003D008 39 00 00 00 */ li r8, 0 -/* 8003D00C 48 32 22 A1 */ bl GXSetTevColorOp -/* 8003D010 38 60 00 00 */ li r3, 0 -/* 8003D014 38 80 00 07 */ li r4, 7 -/* 8003D018 38 A0 00 07 */ li r5, 7 -/* 8003D01C 38 C0 00 07 */ li r6, 7 -/* 8003D020 38 E0 00 07 */ li r7, 7 -/* 8003D024 48 32 22 45 */ bl GXSetTevAlphaIn -/* 8003D028 38 60 00 00 */ li r3, 0 -/* 8003D02C 38 80 00 00 */ li r4, 0 -/* 8003D030 38 A0 00 00 */ li r5, 0 -/* 8003D034 38 C0 00 00 */ li r6, 0 -/* 8003D038 38 E0 00 01 */ li r7, 1 -/* 8003D03C 39 00 00 00 */ li r8, 0 -/* 8003D040 48 32 22 D5 */ bl GXSetTevAlphaOp -/* 8003D044 38 60 00 01 */ li r3, 1 -/* 8003D048 38 80 00 07 */ li r4, 7 -/* 8003D04C 38 A0 00 07 */ li r5, 7 -/* 8003D050 38 C0 00 07 */ li r6, 7 -/* 8003D054 38 E0 00 04 */ li r7, 4 -/* 8003D058 48 32 22 11 */ bl GXSetTevAlphaIn -/* 8003D05C 38 60 00 01 */ li r3, 1 -/* 8003D060 38 80 00 00 */ li r4, 0 -/* 8003D064 38 A0 00 00 */ li r5, 0 -/* 8003D068 38 C0 00 00 */ li r6, 0 -/* 8003D06C 38 E0 00 01 */ li r7, 1 -/* 8003D070 39 00 00 00 */ li r8, 0 -/* 8003D074 48 32 22 A1 */ bl GXSetTevAlphaOp -/* 8003D078 38 60 00 04 */ li r3, 4 -/* 8003D07C 38 80 00 00 */ li r4, 0 -/* 8003D080 38 A0 00 00 */ li r5, 0 -/* 8003D084 38 C0 00 07 */ li r6, 7 -/* 8003D088 38 E0 00 00 */ li r7, 0 -/* 8003D08C 48 32 25 99 */ bl GXSetAlphaCompare -/* 8003D090 38 60 00 00 */ li r3, 0 -/* 8003D094 38 80 00 06 */ li r4, 6 -/* 8003D098 48 32 24 0D */ bl GXSetTevKColorSel -/* 8003D09C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003D0A0 7C 08 03 A6 */ mtlr r0 -/* 8003D0A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003D0A8 4E 80 00 20 */ blr diff --git a/asm/d/map/d_map_path/setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv.s b/asm/d/map/d_map_path/setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv.s deleted file mode 100644 index a163f4cad07..00000000000 --- a/asm/d/map/d_map_path/setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_8003CE78: -/* 8003CE78 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8003CE7C 7C 08 02 A6 */ mflr r0 -/* 8003CE80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003CE84 38 60 00 01 */ li r3, 1 -/* 8003CE88 48 32 2A 09 */ bl GXSetNumTevStages -/* 8003CE8C 38 60 00 01 */ li r3, 1 -/* 8003CE90 48 32 0C A1 */ bl GXSetNumChans -/* 8003CE94 38 60 00 00 */ li r3, 0 -/* 8003CE98 48 31 EF 65 */ bl GXSetNumTexGens -/* 8003CE9C 38 60 00 00 */ li r3, 0 -/* 8003CEA0 38 80 00 FF */ li r4, 0xff -/* 8003CEA4 38 A0 00 FF */ li r5, 0xff -/* 8003CEA8 38 C0 00 04 */ li r6, 4 -/* 8003CEAC 48 32 28 49 */ bl GXSetTevOrder -/* 8003CEB0 38 60 00 00 */ li r3, 0 -/* 8003CEB4 38 80 00 0F */ li r4, 0xf -/* 8003CEB8 38 A0 00 0F */ li r5, 0xf -/* 8003CEBC 38 C0 00 0F */ li r6, 0xf -/* 8003CEC0 38 E0 00 02 */ li r7, 2 -/* 8003CEC4 48 32 23 61 */ bl GXSetTevColorIn -/* 8003CEC8 38 60 00 00 */ li r3, 0 -/* 8003CECC 38 80 00 00 */ li r4, 0 -/* 8003CED0 38 A0 00 00 */ li r5, 0 -/* 8003CED4 38 C0 00 00 */ li r6, 0 -/* 8003CED8 38 E0 00 01 */ li r7, 1 -/* 8003CEDC 39 00 00 00 */ li r8, 0 -/* 8003CEE0 48 32 23 CD */ bl GXSetTevColorOp -/* 8003CEE4 38 60 00 00 */ li r3, 0 -/* 8003CEE8 38 80 00 07 */ li r4, 7 -/* 8003CEEC 38 A0 00 07 */ li r5, 7 -/* 8003CEF0 38 C0 00 07 */ li r6, 7 -/* 8003CEF4 38 E0 00 07 */ li r7, 7 -/* 8003CEF8 48 32 23 71 */ bl GXSetTevAlphaIn -/* 8003CEFC 38 60 00 00 */ li r3, 0 -/* 8003CF00 38 80 00 00 */ li r4, 0 -/* 8003CF04 38 A0 00 00 */ li r5, 0 -/* 8003CF08 38 C0 00 00 */ li r6, 0 -/* 8003CF0C 38 E0 00 01 */ li r7, 1 -/* 8003CF10 39 00 00 00 */ li r8, 0 -/* 8003CF14 48 32 24 01 */ bl GXSetTevAlphaOp -/* 8003CF18 38 60 00 07 */ li r3, 7 -/* 8003CF1C 38 80 00 00 */ li r4, 0 -/* 8003CF20 38 A0 00 01 */ li r5, 1 -/* 8003CF24 38 C0 00 07 */ li r6, 7 -/* 8003CF28 38 E0 00 00 */ li r7, 0 -/* 8003CF2C 48 32 26 F9 */ bl GXSetAlphaCompare -/* 8003CF30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8003CF34 7C 08 03 A6 */ mtlr r0 -/* 8003CF38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8003CF3C 4E 80 00 20 */ blr diff --git a/asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s b/asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s deleted file mode 100644 index c5c30d258ac..00000000000 --- a/asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8035FEF0: -/* 8035FEF0 7C 08 02 A6 */ mflr r0 -/* 8035FEF4 90 01 00 04 */ stw r0, 4(r1) -/* 8035FEF8 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8035FEFC 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8035FF00 3B E4 00 00 */ addi r31, r4, 0 -/* 8035FF04 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8035FF08 3B C3 00 00 */ addi r30, r3, 0 -/* 8035FF0C 80 A2 CB 80 */ lwz r5, __GXData(r2) -/* 8035FF10 80 05 05 AC */ lwz r0, 0x5ac(r5) -/* 8035FF14 28 00 00 00 */ cmplwi r0, 0 -/* 8035FF18 41 82 00 08 */ beq lbl_8035FF20 -/* 8035FF1C 4B FF C7 C9 */ bl __GXSetDirtyState -lbl_8035FF20: -/* 8035FF20 80 62 CB 80 */ lwz r3, __GXData(r2) -/* 8035FF24 80 03 00 00 */ lwz r0, 0(r3) -/* 8035FF28 28 00 00 00 */ cmplwi r0, 0 -/* 8035FF2C 40 82 00 08 */ bne lbl_8035FF34 -/* 8035FF30 4B FF C9 05 */ bl __GXSendFlushPrim -lbl_8035FF34: -/* 8035FF34 38 00 00 40 */ li r0, 0x40 -/* 8035FF38 3C 60 CC 01 */ lis r3, 0xCC01 /* 0xCC008000@ha */ -/* 8035FF3C 98 03 80 00 */ stb r0, 0x8000(r3) /* 0xCC008000@l */ -/* 8035FF40 93 C3 80 00 */ stw r30, -0x8000(r3) -/* 8035FF44 93 E3 80 00 */ stw r31, -0x8000(r3) -/* 8035FF48 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8035FF4C 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8035FF50 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8035FF54 38 21 00 18 */ addi r1, r1, 0x18 -/* 8035FF58 7C 08 03 A6 */ mtlr r0 -/* 8035FF5C 4E 80 00 20 */ blr diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h index 398623d9c83..cb4501ce587 100644 --- a/include/JSystem/J2DGraph/J2DAnmLoader.h +++ b/include/JSystem/J2DGraph/J2DAnmLoader.h @@ -14,7 +14,8 @@ public: virtual void* load(void const*) = 0; virtual void setResource(J2DAnmBase*, void const*) = 0; /* 8030A410 */ virtual ~J2DAnmLoader() {} - void* _4; + + void* mpResource; }; struct J3DAnmTransformKeyData { diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h index f2e20854d8e..d9ed9f94b83 100644 --- a/include/JSystem/J2DGraph/J2DMatBlock.h +++ b/include/JSystem/J2DGraph/J2DMatBlock.h @@ -18,31 +18,31 @@ public: /* 802F2A40 */ virtual void initialize(); /* 802EB1D0 */ virtual void setGX(); /* 802F2A44 */ virtual void loadTexture(_GXTexMapID, u32); - virtual void getType() = 0; + virtual u32 getType() = 0; virtual s32 getMaxStage() = 0; /* 802EB1DC */ virtual void setTexNo(u32, u16); /* 802EA170 */ virtual u32 getTexNo(u32) const; /* 802F2A48 */ virtual void setFontNo(u16); /* 802EA164 */ virtual u32 getFontNo() const; /* 802F2A4C */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802EA144 */ virtual bool getTevOrder(u32); + /* 802EA144 */ virtual J2DTevOrder* getTevOrder(u32); /* 802EB1D8 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802EA13C */ virtual bool getTevColor(u32); + /* 802EA13C */ virtual J2DGXColorS10* getTevColor(u32); /* 802EB1D4 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802EA15C */ virtual bool getTevKColor(u32); + /* 802EA15C */ virtual JUtility::TColor* getTevKColor(u32); /* 802F2A50 */ virtual void setTevKColorSel(u32, u8); - /* 802EA154 */ virtual bool getTevKColorSel(u32); + /* 802EA154 */ virtual u8 getTevKColorSel(u32); /* 802F2A54 */ virtual void setTevKAlphaSel(u32, u8); - /* 802EA14C */ virtual bool getTevKAlphaSel(u32); + /* 802EA14C */ virtual u8 getTevKAlphaSel(u32); /* 802F2A58 */ virtual void setTevStageNum(u8); - /* 802EA17C */ virtual bool getTevStageNum() const; + /* 802EA17C */ virtual u8 getTevStageNum() const; /* 802F2A5C */ virtual void setTevStage(u32, J2DTevStage); - /* 802EA134 */ virtual bool getTevStage(u32); + /* 802EA134 */ virtual J2DTevStage* getTevStage(u32); /* 802F2A60 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F2A64 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802EA12C */ virtual bool getTevSwapModeTable(u32); + /* 802EA12C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F2A68 */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802EA184 */ virtual bool getIndTevStage(u32); + /* 802EA184 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F2A7C */ virtual bool insertTexture(u32, ResTIMG const*); /* 802F2A74 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802F2A6C */ virtual bool insertTexture(u32, JUTTexture*); @@ -53,13 +53,13 @@ public: /* 802F2A9C */ virtual bool setFont(JUTFont*); /* 802F2AAC */ virtual bool setPalette(u32, ResTLUT const*); /* 802F2AB4 */ virtual bool prepareTexture(u8); - /* 802EB87C */ virtual bool getTexture(u32); - /* 802EB884 */ virtual bool getPalette(u32); - /* 802F2ABC */ virtual bool getFont(); + /* 802EB87C */ virtual JUTTexture* getTexture(u32); + /* 802EB884 */ virtual JUTPalette* getPalette(u32); + /* 802F2ABC */ virtual JUTFont* getFont(); /* 802F2AC4 */ virtual void shiftDeleteFlag(u8, bool); /* 802F2AC8 */ virtual void setUndeleteFlag(u8); /* 802F2ACC */ virtual void setFontUndeleteFlag(); - /* 802EB184 */ virtual ~J2DTevBlock(); + /* 802EB184 */ virtual ~J2DTevBlock() {} }; class J2DTevBlock1 : public J2DTevBlock { @@ -69,31 +69,31 @@ public: /* 802EBA50 */ virtual void initialize(); /* 802EC328 */ virtual void setGX(); /* 802EC570 */ virtual void loadTexture(_GXTexMapID, u32); - /* 802F27A0 */ virtual void getType(); + /* 802F27A0 */ virtual u32 getType(); /* 802F27AC */ virtual s32 getMaxStage(); /* 802F27B4 */ virtual void setTexNo(u32, u16); /* 802F27C4 */ virtual u32 getTexNo(u32) const; /* 802F27D4 */ virtual void setFontNo(u16); /* 802F27DC */ virtual u32 getFontNo() const; /* 802F27E4 */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2808 */ virtual bool getTevOrder(u32); + /* 802F2808 */ virtual J2DTevOrder* getTevOrder(u32); /* 802F281C */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2848 */ virtual bool getTevColor(u32); + /* 802F2848 */ virtual J2DGXColorS10* getTevColor(u32); /* 802F285C */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F2888 */ virtual bool getTevKColor(u32); + /* 802F2888 */ virtual JUtility::TColor* getTevKColor(u32); /* 802F289C */ virtual void setTevKColorSel(u32, u8); - /* 802F28A8 */ virtual bool getTevKColorSel(u32); + /* 802F28A8 */ virtual u8 getTevKColorSel(u32); /* 802F28B4 */ virtual void setTevKAlphaSel(u32, u8); - /* 802F28C0 */ virtual bool getTevKAlphaSel(u32); + /* 802F28C0 */ virtual u8 getTevKAlphaSel(u32); /* 802F28CC */ virtual void setTevStageNum(u8); - /* 802F28D0 */ virtual bool getTevStageNum() const; + /* 802F28D0 */ virtual u8 getTevStageNum() const; /* 802F28D8 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2914 */ virtual bool getTevStage(u32); + /* 802F2914 */ virtual J2DTevStage* getTevStage(u32); /* 802F2928 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F2960 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F2970 */ virtual bool getTevSwapModeTable(u32); + /* 802F2970 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F2980 */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F2994 */ virtual bool getIndTevStage(u32); + /* 802F2994 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F29A8 */ virtual bool insertTexture(u32, ResTIMG const*); /* 802EBCC0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802EBDE4 */ virtual bool insertTexture(u32, JUTTexture*); @@ -104,9 +104,9 @@ public: /* 802EC1D8 */ virtual bool setFont(JUTFont*); /* 802EC258 */ virtual bool setPalette(u32, ResTLUT const*); /* 802EBC0C */ virtual bool prepareTexture(u8); - /* 802F29D8 */ virtual bool getTexture(u32); - /* 802F29F8 */ virtual bool getPalette(u32); - /* 802F2A18 */ virtual bool getFont(); + /* 802F29D8 */ virtual JUTTexture* getTexture(u32); + /* 802F29F8 */ virtual JUTPalette* getPalette(u32); + /* 802F2A18 */ virtual JUTFont* getFont(); /* 802EC318 */ virtual void shiftDeleteFlag(u8, bool); /* 802F2A20 */ virtual void setUndeleteFlag(u8); /* 802F2A30 */ virtual void setFontUndeleteFlag(); @@ -136,31 +136,31 @@ public: /* 802EC7A0 */ virtual void initialize(); /* 802ED584 */ virtual void setGX(); /* 802ED874 */ virtual void loadTexture(_GXTexMapID, u32); - /* 802F24FC */ virtual void getType(); + /* 802F24FC */ virtual u32 getType(); /* 802F2508 */ virtual s32 getMaxStage(); /* 802F2510 */ virtual void setTexNo(u32, u16); /* 802F2520 */ virtual u32 getTexNo(u32) const; /* 802F2530 */ virtual void setFontNo(u16); /* 802F2538 */ virtual u32 getFontNo() const; /* 802F2540 */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2564 */ virtual bool getTevOrder(u32); + /* 802F2564 */ virtual J2DTevOrder* getTevOrder(u32); /* 802F2578 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F25A4 */ virtual bool getTevColor(u32); + /* 802F25A4 */ virtual J2DGXColorS10* getTevColor(u32); /* 802F25B8 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F25E4 */ virtual bool getTevKColor(u32); + /* 802F25E4 */ virtual JUtility::TColor* getTevKColor(u32); /* 802F25F8 */ virtual void setTevKColorSel(u32, u8); - /* 802F2604 */ virtual bool getTevKColorSel(u32); + /* 802F2604 */ virtual u8 getTevKColorSel(u32); /* 802F2610 */ virtual void setTevKAlphaSel(u32, u8); - /* 802F261C */ virtual bool getTevKAlphaSel(u32); + /* 802F261C */ virtual u8 getTevKAlphaSel(u32); /* 802F2628 */ virtual void setTevStageNum(u8); - /* 802F2630 */ virtual bool getTevStageNum() const; + /* 802F2630 */ virtual u8 getTevStageNum() const; /* 802F2638 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2674 */ virtual bool getTevStage(u32); + /* 802F2674 */ virtual J2DTevStage* getTevStage(u32); /* 802F2688 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F26C0 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F26D0 */ virtual bool getTevSwapModeTable(u32); + /* 802F26D0 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F26E0 */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F26F4 */ virtual bool getIndTevStage(u32); + /* 802F26F4 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F2708 */ virtual bool insertTexture(u32, ResTIMG const*); /* 802ECAE8 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802ECDE8 */ virtual bool insertTexture(u32, JUTTexture*); @@ -171,9 +171,9 @@ public: /* 802ED3A4 */ virtual bool setFont(JUTFont*); /* 802ED424 */ virtual bool setPalette(u32, ResTLUT const*); /* 802ECA18 */ virtual bool prepareTexture(u8); - /* 802F2738 */ virtual bool getTexture(u32); - /* 802F2758 */ virtual bool getPalette(u32); - /* 802F2778 */ virtual bool getFont(); + /* 802F2738 */ virtual JUTTexture* getTexture(u32); + /* 802F2758 */ virtual JUTPalette* getPalette(u32); + /* 802F2778 */ virtual JUTFont* getFont(); /* 802ED4FC */ virtual void shiftDeleteFlag(u8, bool); /* 802F2780 */ virtual void setUndeleteFlag(u8); /* 802F2790 */ virtual void setFontUndeleteFlag(); @@ -186,6 +186,7 @@ private: /* 0x012 */ J2DGXColorS10 mTevColor[4]; /* 0x032 */ u8 mTevStageNum; /* 0x033 */ J2DTevStage mTevStage[2]; + /* 0x043 */ u8 field_0x43; /* 0x044 */ JUtility::TColor mTevKColor[4]; /* 0x054 */ u8 mTevKColorSel[2]; /* 0x056 */ u8 mTevKAlphaSel[2]; @@ -204,31 +205,31 @@ public: /* 802EDAC4 */ virtual void initialize(); /* 802EEA2C */ virtual void setGX(); /* 802EED1C */ virtual void loadTexture(_GXTexMapID, u32); - /* 802F2258 */ virtual void getType(); + /* 802F2258 */ virtual u32 getType(); /* 802F2264 */ virtual s32 getMaxStage(); /* 802F226C */ virtual void setTexNo(u32, u16); /* 802F227C */ virtual u32 getTexNo(u32) const; /* 802F228C */ virtual void setFontNo(u16); /* 802F2294 */ virtual u32 getFontNo() const; /* 802F229C */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F22C0 */ virtual bool getTevOrder(u32); + /* 802F22C0 */ virtual J2DTevOrder* getTevOrder(u32); /* 802F22D4 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2300 */ virtual bool getTevColor(u32); + /* 802F2300 */ virtual J2DGXColorS10* getTevColor(u32); /* 802F2314 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F2340 */ virtual bool getTevKColor(u32); + /* 802F2340 */ virtual JUtility::TColor* getTevKColor(u32); /* 802F2354 */ virtual void setTevKColorSel(u32, u8); - /* 802F2360 */ virtual bool getTevKColorSel(u32); + /* 802F2360 */ virtual u8 getTevKColorSel(u32); /* 802F236C */ virtual void setTevKAlphaSel(u32, u8); - /* 802F2378 */ virtual bool getTevKAlphaSel(u32); + /* 802F2378 */ virtual u8 getTevKAlphaSel(u32); /* 802F2384 */ virtual void setTevStageNum(u8); - /* 802F238C */ virtual bool getTevStageNum() const; + /* 802F238C */ virtual u8 getTevStageNum() const; /* 802F2394 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F23D0 */ virtual bool getTevStage(u32); + /* 802F23D0 */ virtual J2DTevStage* getTevStage(u32); /* 802F23E4 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F241C */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F242C */ virtual bool getTevSwapModeTable(u32); + /* 802F242C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F243C */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F2450 */ virtual bool getIndTevStage(u32); + /* 802F2450 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F2464 */ virtual bool insertTexture(u32, ResTIMG const*); /* 802EDE04 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802EE1D4 */ virtual bool insertTexture(u32, JUTTexture*); @@ -239,9 +240,9 @@ public: /* 802EE84C */ virtual bool setFont(JUTFont*); /* 802EE8CC */ virtual bool setPalette(u32, ResTLUT const*); /* 802EDD34 */ virtual bool prepareTexture(u8); - /* 802F2494 */ virtual bool getTexture(u32); - /* 802F24B4 */ virtual bool getPalette(u32); - /* 802F24D4 */ virtual bool getFont(); + /* 802F2494 */ virtual JUTTexture* getTexture(u32); + /* 802F24B4 */ virtual JUTPalette* getPalette(u32); + /* 802F24D4 */ virtual JUTFont* getFont(); /* 802EE9A4 */ virtual void shiftDeleteFlag(u8, bool); /* 802F24DC */ virtual void setUndeleteFlag(u8); /* 802F24EC */ virtual void setFontUndeleteFlag(); @@ -254,6 +255,7 @@ private: /* 0x01E */ J2DGXColorS10 mTevColor[4]; /* 0x03E */ u8 mTevStageNum; /* 0x03F */ J2DTevStage mTevStage[4]; + /* 0x05F */ u8 field_0x5f; /* 0x060 */ JUtility::TColor mTevKColor[4]; /* 0x070 */ u8 mTevKColorSel[4]; /* 0x074 */ u8 mTevKAlphaSel[4]; @@ -272,31 +274,31 @@ public: /* 802EEF6C */ virtual void initialize(); /* 802EFEAC */ virtual void setGX(); /* 802F019C */ virtual void loadTexture(_GXTexMapID, u32); - /* 802F1FB8 */ virtual void getType(); + /* 802F1FB8 */ virtual u32 getType(); /* 802F1FC4 */ virtual s32 getMaxStage(); /* 802F1FCC */ virtual void setTexNo(u32, u16); /* 802F1FDC */ virtual u32 getTexNo(u32) const; /* 802F1FEC */ virtual void setFontNo(u16); /* 802F1FF4 */ virtual u32 getFontNo() const; /* 802F1FFC */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F2020 */ virtual bool getTevOrder(u32); + /* 802F2020 */ virtual J2DTevOrder* getTevOrder(u32); /* 802F2034 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F2060 */ virtual bool getTevColor(u32); + /* 802F2060 */ virtual J2DGXColorS10* getTevColor(u32); /* 802F2074 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F20A0 */ virtual bool getTevKColor(u32); + /* 802F20A0 */ virtual JUtility::TColor* getTevKColor(u32); /* 802F20B4 */ virtual void setTevKColorSel(u32, u8); - /* 802F20C0 */ virtual bool getTevKColorSel(u32); + /* 802F20C0 */ virtual u8 getTevKColorSel(u32); /* 802F20CC */ virtual void setTevKAlphaSel(u32, u8); - /* 802F20D8 */ virtual bool getTevKAlphaSel(u32); + /* 802F20D8 */ virtual u8 getTevKAlphaSel(u32); /* 802F20E4 */ virtual void setTevStageNum(u8); - /* 802F20EC */ virtual bool getTevStageNum() const; + /* 802F20EC */ virtual u8 getTevStageNum() const; /* 802F20F4 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F2130 */ virtual bool getTevStage(u32); + /* 802F2130 */ virtual J2DTevStage* getTevStage(u32); /* 802F2144 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F217C */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F218C */ virtual bool getTevSwapModeTable(u32); + /* 802F218C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F219C */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F21B0 */ virtual bool getIndTevStage(u32); + /* 802F21B0 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F21C4 */ virtual bool insertTexture(u32, ResTIMG const*); /* 802EF2B0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802EF67C */ virtual bool insertTexture(u32, JUTTexture*); @@ -307,9 +309,9 @@ public: /* 802EFCEC */ virtual bool setFont(JUTFont*); /* 802EFD68 */ virtual bool setPalette(u32, ResTLUT const*); /* 802EF1E0 */ virtual bool prepareTexture(u8); - /* 802F21F4 */ virtual bool getTexture(u32); - /* 802F2214 */ virtual bool getPalette(u32); - /* 802F2234 */ virtual bool getFont(); + /* 802F21F4 */ virtual JUTTexture* getTexture(u32); + /* 802F2214 */ virtual JUTPalette* getPalette(u32); + /* 802F2234 */ virtual JUTFont* getFont(); /* 802EFE40 */ virtual void shiftDeleteFlag(u8, bool); /* 802F223C */ virtual void setUndeleteFlag(u8); /* 802F224C */ virtual void setFontUndeleteFlag(); @@ -322,6 +324,7 @@ private: /* 0x036 */ J2DGXColorS10 mTevColor[4]; /* 0x056 */ u8 mTevStageNum; /* 0x057 */ J2DTevStage mTevStage[8]; + /* 0x097 */ u8 field_0x97; /* 0x098 */ JUtility::TColor mTevKColor[4]; /* 0x0A8 */ u8 mTevKColorSel[8]; /* 0x0B0 */ u8 mTevKAlphaSel[8]; @@ -341,31 +344,31 @@ public: /* 802F03EC */ virtual void initialize(); /* 802F132C */ virtual void setGX(); /* 802F161C */ virtual void loadTexture(_GXTexMapID, u32); - /* 802F1D18 */ virtual void getType(); + /* 802F1D18 */ virtual u32 getType(); /* 802F1D24 */ virtual s32 getMaxStage(); /* 802F1D2C */ virtual void setTexNo(u32, u16); /* 802F1D3C */ virtual u32 getTexNo(u32) const; /* 802F1D4C */ virtual void setFontNo(u16); /* 802F1D54 */ virtual u32 getFontNo() const; /* 802F1D5C */ virtual void setTevOrder(u32, J2DTevOrder); - /* 802F1D80 */ virtual bool getTevOrder(u32); + /* 802F1D80 */ virtual J2DTevOrder* getTevOrder(u32); /* 802F1D94 */ virtual void setTevColor(u32, J2DGXColorS10); - /* 802F1DC0 */ virtual bool getTevColor(u32); + /* 802F1DC0 */ virtual J2DGXColorS10* getTevColor(u32); /* 802F1DD4 */ virtual void setTevKColor(u32, JUtility::TColor); - /* 802F1E00 */ virtual bool getTevKColor(u32); + /* 802F1E00 */ virtual JUtility::TColor* getTevKColor(u32); /* 802F1E14 */ virtual void setTevKColorSel(u32, u8); - /* 802F1E20 */ virtual bool getTevKColorSel(u32); + /* 802F1E20 */ virtual u8 getTevKColorSel(u32); /* 802F1E2C */ virtual void setTevKAlphaSel(u32, u8); - /* 802F1E38 */ virtual bool getTevKAlphaSel(u32); + /* 802F1E38 */ virtual u8 getTevKAlphaSel(u32); /* 802F1E44 */ virtual void setTevStageNum(u8); - /* 802F1E4C */ virtual bool getTevStageNum() const; + /* 802F1E4C */ virtual u8 getTevStageNum() const; /* 802F1E54 */ virtual void setTevStage(u32, J2DTevStage); - /* 802F1E90 */ virtual bool getTevStage(u32); + /* 802F1E90 */ virtual J2DTevStage* getTevStage(u32); /* 802F1EA4 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo); /* 802F1EDC */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable); - /* 802F1EEC */ virtual bool getTevSwapModeTable(u32); + /* 802F1EEC */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32); /* 802F1EFC */ virtual void setIndTevStage(u32, J2DIndTevStage); - /* 802F1F10 */ virtual bool getIndTevStage(u32); + /* 802F1F10 */ virtual J2DIndTevStage* getIndTevStage(u32); /* 802F1F24 */ virtual bool insertTexture(u32, ResTIMG const*); /* 802F0730 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*); /* 802F0AFC */ virtual bool insertTexture(u32, JUTTexture*); @@ -376,9 +379,9 @@ public: /* 802F116C */ virtual bool setFont(JUTFont*); /* 802F11E8 */ virtual bool setPalette(u32, ResTLUT const*); /* 802F0660 */ virtual bool prepareTexture(u8); - /* 802F1F54 */ virtual bool getTexture(u32); - /* 802F1F74 */ virtual bool getPalette(u32); - /* 802F1F94 */ virtual bool getFont(); + /* 802F1F54 */ virtual JUTTexture* getTexture(u32); + /* 802F1F74 */ virtual JUTPalette* getPalette(u32); + /* 802F1F94 */ virtual JUTFont* getFont(); /* 802F12C0 */ virtual void shiftDeleteFlag(u8, bool); /* 802F1F9C */ virtual void setUndeleteFlag(u8); /* 802F1FAC */ virtual void setFontUndeleteFlag(); @@ -391,6 +394,7 @@ public: /* 0x056 */ J2DGXColorS10 mTevColor[4]; /* 0x076 */ u8 mTevStageNum; /* 0x077 */ J2DTevStage mTevStage[16]; + /* 0x0F7 */ u8 field_0xf7; /* 0x0F8 */ JUtility::TColor mTevKColor[4]; /* 0x108 */ u8 mTevKColorSel[16]; /* 0x118 */ u8 mTevKAlphaSel[16]; @@ -456,16 +460,16 @@ class J2DIndBlock { public: /* 802EB24C */ virtual void initialize(); /* 802EB1CC */ virtual void setGX(); - virtual void getType() = 0; + virtual u32 getType() = 0; /* 802EB250 */ virtual void setIndTexStageNum(u8); - /* 802EA1A4 */ virtual bool getIndTexStageNum() const; + /* 802EA1A4 */ virtual u8 getIndTexStageNum() const; /* 802EB254 */ virtual void setIndTexOrder(u32, J2DIndTexOrder); - /* 802EA19C */ virtual bool getIndTexOrder(u32); + /* 802EA19C */ virtual J2DIndTexOrder* getIndTexOrder(u32); /* 802EB258 */ virtual void setIndTexMtx(u32, J2DIndTexMtx); - /* 802EA194 */ virtual bool getIndTexMtx(u32); + /* 802EA194 */ virtual J2DIndTexMtx* getIndTexMtx(u32); /* 802EB25C */ virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale); - /* 802EA18C */ virtual bool getIndTexCoordScale(u32); - /* 802EB13C */ virtual ~J2DIndBlock(); + /* 802EA18C */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32); + /* 802EB13C */ virtual ~J2DIndBlock() {} }; class J2DIndBlockFull : public J2DIndBlock { @@ -474,15 +478,15 @@ public: /* 802F1664 */ virtual void initialize(); /* 802F1730 */ virtual void setGX(); - /* 802F1B94 */ virtual void getType(); + /* 802F1B94 */ virtual u32 getType(); /* 802F1BA0 */ virtual void setIndTexStageNum(u8); - /* 802F1BA8 */ virtual bool getIndTexStageNum() const; + /* 802F1BA8 */ virtual u8 getIndTexStageNum() const; /* 802F1BB0 */ virtual void setIndTexOrder(u32, J2DIndTexOrder); - /* 802F1BCC */ virtual bool getIndTexOrder(u32); + /* 802F1BCC */ virtual J2DIndTexOrder* getIndTexOrder(u32); /* 802F1BE0 */ virtual void setIndTexMtx(u32, J2DIndTexMtx); - /* 802F1C38 */ virtual bool getIndTexMtx(u32); + /* 802F1C38 */ virtual J2DIndTexMtx* getIndTexMtx(u32); /* 802F1C4C */ virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale); - /* 802F1C68 */ virtual bool getIndTexCoordScale(u32); + /* 802F1C68 */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32); /* 802F1C7C */ virtual ~J2DIndBlockFull(); private: @@ -497,7 +501,7 @@ public: J2DIndBlockNull() {} /* 802EB1E0 */ virtual void setGX(); - /* 802EB1E4 */ virtual void getType(); + /* 802EB1E4 */ virtual u32 getType(); /* 802EB1F0 */ virtual ~J2DIndBlockNull(); }; @@ -515,6 +519,8 @@ public: /* 802EB6A4 */ void setTexMtx(u32, J2DTexMtx&); /* 802EB7E0 */ void getTexMtx(u32, J2DTexMtx&); + u32 getTexGenNum() const { return mTexGenNum; } + /* 802EB620 */ virtual ~J2DTexGenBlock(); }; // Size: 0x48 @@ -526,6 +532,8 @@ class J2DColorChan { public: /* 802EB280 */ J2DColorChan(); + u16 getMatSrc() const { return mColorChanInfo.field_0x0 & 1; } + private: /* 0x0 */ J2DColorChanInfo mColorChanInfo; }; @@ -544,6 +552,10 @@ public: /* 802EB424 */ void setGX(); /* 802EB0F4 */ virtual ~J2DColorBlock(); + + JUtility::TColor* getMatColor(u32 i) { return &mMatColor[i]; } + J2DColorChan* getColorChan(u32 i) { return &mColorChan[i]; } + void setCullMode(u8 mode) { mCullMode = mode; } }; #endif /* J2DMATBLOCK_H */ diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h index ebea34bec85..e30143379f4 100644 --- a/include/JSystem/J2DGraph/J2DMaterial.h +++ b/include/JSystem/J2DGraph/J2DMaterial.h @@ -41,9 +41,11 @@ public: J2DPEBlock* getPEBlock() { return &mPEBlock; } J2DTevBlock* getTevBlock() { return mTevBlock; } J2DIndBlock* getIndBlock() { return mIndBlock; } + bool isVisible() const { return mVisible; } + int getMaterialAlphaCalc() const { return mMaterialAlphaCalc; } -private: - /* 0x04 */ int field_0x4; +// private: + /* 0x04 */ void* field_0x4; /* 0x08 */ int field_0x8; /* 0x0C */ u16 mIndex; /* 0x0E */ bool mVisible; diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 6653617fc8f..04cbb143cd2 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -23,48 +23,78 @@ enum J2DRotateAxis { enum J2DBasePosition {}; +struct J2DPaneHeader { + /* 0x0 */ u32 mKind; + /* 0x4 */ u32 mSize; +}; + class J2DPane { public: J2DPane(); J2DPane(J2DPane*, bool, u64, const JGeometry::TBox2&); J2DPane(u64, const JGeometry::TBox2&); J2DPane(J2DPane* other, JSURandomInputStream* stream, u8 arg3); + void initiate(); + void initialize(J2DPane*, bool, u64, const JGeometry::TBox2&); + void initialize(u64 tag, const JGeometry::TBox2& dim); + void makePaneStream(J2DPane* other, JSURandomInputStream* stream); + void changeUseTrans(J2DPane* other); + bool appendChild(J2DPane* child); + bool insertChild(J2DPane* before, J2DPane* child); + void draw(f32 a1, f32 a2, const J2DGrafContext* ctx, bool a4, bool a5); + void place(const JGeometry::TBox2& dim); + JGeometry::TBox2& getBounds(); + void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle); + void rotate(f32 angle); + void clip(const JGeometry::TBox2& bounds); + void setBasePosition(J2DBasePosition position); + void setInfluencedAlpha(bool arg1, bool arg2); + JGeometry::TVec3 getGlbVtx(u8 arg1) const; + J2DPane* getFirstChildPane(); + J2DPane* getNextChildPane(); + J2DPane* getParentPane(); + void makePaneExStream(J2DPane* other, JSURandomInputStream* stream); + void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); + void animationTransform(); + void updateTransform(const J2DAnmTransform* transform); + virtual ~J2DPane(); - /* 0x0c */ virtual s32 getTypeID() const { return 16; } - /* 0x10 */ virtual void move(f32 x, f32 y); - /* 0x14 */ virtual void add(f32 x, f32 y); - /* 0x18 */ virtual void resize(f32 x, f32 y); - /* 0x1c */ virtual void setCullBack(bool cull); - /* 0x20 */ virtual void setCullBack(_GXCullMode cmode); - /* 0x24 */ virtual void setAlpha(u8); - /* 0x28 */ virtual bool setConnectParent(bool connected); - /* 0x2c */ virtual void calcMtx(); - /* 0x30 */ virtual void update(); - /* 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2); - /* 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx); - /* 0x3c */ virtual J2DPane* search(u64 tag); - /* 0x40 */ virtual J2DPane* searchUserInfo(u64 tag); - /* 0x44 */ virtual void makeMatrix(f32, f32); - /* 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d); - /* 0x4c */ virtual bool isUsed(const ResTIMG* timg); - /* 0x50 */ virtual bool isUsed(const ResFONT* font); - /* 0x54 */ virtual void clearAnmTransform(); - /* 0x58 */ virtual void rewriteAlpha(); - /* 0x5c */ virtual void setAnimation(J2DAnmBase* anm); - /* 0x60 */ virtual void setAnimation(J2DAnmTransform* anm); - /* 0x64 */ virtual void setAnimation(J2DAnmColor* anm) {} - /* 0x68 */ virtual void setAnimation(J2DAnmTexPattern* anm) {} - /* 0x6c */ virtual void setAnimation(J2DAnmTextureSRTKey* anm) {} - /* 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {} - /* 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {} - /* 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {} - /* 0x7c */ virtual const J2DAnmTransform* animationTransform(const J2DAnmTransform* transform); - /* 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility); - /* 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility); - /* 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color); - /* 0x8c */ virtual void setAnimationVC(J2DAnmVtxColor* vtx_color); - /* 0x90 */ virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* transform); + /* vt 0x0C */ virtual s32 getTypeID() const { return 16; } + /* vt 0x10 */ virtual void move(f32 x, f32 y); + /* vt 0x14 */ virtual void add(f32 x, f32 y); + /* vt 0x18 */ virtual void resize(f32 x, f32 y); + /* vt 0x1C */ virtual void setCullBack(bool cull); + /* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode); + /* vt 0x24 */ virtual void setAlpha(u8); + /* vt 0x28 */ virtual bool setConnectParent(bool connected); + /* vt 0x2C */ virtual void calcMtx(); + /* vt 0x30 */ virtual void update(); + /* vt 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2); + /* vt 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx); + /* vt 0x3C */ virtual J2DPane* search(u64 tag); + /* vt 0x40 */ virtual J2DPane* searchUserInfo(u64 tag); + /* vt 0x44 */ virtual void makeMatrix(f32, f32); + /* vt 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d); + /* vt 0x4C */ virtual bool isUsed(const ResTIMG* timg); + /* vt 0x50 */ virtual bool isUsed(const ResFONT* font); + /* vt 0x54 */ virtual void clearAnmTransform(); + /* vt 0x58 */ virtual void rewriteAlpha(); + /* vt 0x5C */ virtual void setAnimation(J2DAnmBase* anm); + /* vt 0x60 */ virtual void setAnimation(J2DAnmTransform* anm); + /* vt 0x64 */ virtual void setAnimation(J2DAnmColor* anm) {} + /* vt 0x68 */ virtual void setAnimation(J2DAnmTexPattern* anm) {} + /* vt 0x6C */ virtual void setAnimation(J2DAnmTextureSRTKey* anm) {} + /* vt 0x70 */ virtual void setAnimation(J2DAnmTevRegKey* anm) {} + /* vt 0x74 */ virtual void setAnimation(J2DAnmVisibilityFull* anm) {} + /* vt 0x78 */ virtual void setAnimation(J2DAnmVtxColor* anm) {} + /* vt 0x7C */ virtual const J2DAnmTransform* + animationTransform(const J2DAnmTransform* transform); + /* vt 0x80 */ virtual void setVisibileAnimation(J2DAnmVisibilityFull* visibility); + /* vt 0x84 */ virtual void setAnimationVF(J2DAnmVisibilityFull* visibility); + /* vt 0x88 */ virtual void setVtxColorAnimation(J2DAnmVtxColor* vtx_color); + /* vt 0x8C */ virtual void setAnimationVC(J2DAnmVtxColor* vtx_color); + /* vt 0x90 */ virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* transform); f32 getHeight() const { return mBounds.getHeight(); } f32 getWidth() const { return mBounds.getWidth(); } @@ -102,47 +132,23 @@ public: calcMtx(); } - int getKind() const { return id; } + int getKind() const { return mKind; } bool isVisible() const { return mVisible; } void show() { mVisible = true; } void hide() { mVisible = false; } - void initiate(); - void initialize(J2DPane*, bool, u64, const JGeometry::TBox2&); - void initialize(u64 tag, const JGeometry::TBox2& dim); - void makePaneStream(J2DPane* other, JSURandomInputStream* stream); - void changeUseTrans(J2DPane* other); - bool appendChild(J2DPane* child); - bool insertChild(J2DPane* before, J2DPane* child); - void draw(f32 a1, f32 a2, const J2DGrafContext* ctx, bool a4, bool a5); - void place(const JGeometry::TBox2& dim); - JGeometry::TBox2& getBounds(); - void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle); - void rotate(f32 angle); - void clip(const JGeometry::TBox2& bounds); - void setBasePosition(J2DBasePosition position); - void setInfluencedAlpha(bool arg1, bool arg2); - JGeometry::TVec3 getGlbVtx(u8 arg1) const; - J2DPane* getFirstChildPane(); - J2DPane* getNextChildPane(); - J2DPane* getParentPane(); - void makePaneExStream(J2DPane* other, JSURandomInputStream* stream); - static s16 J2DCast_F32_to_S16(f32 value, u8 arg2); - void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); - void animationTransform(); - void updateTransform(const J2DAnmTransform* transform); void setUserInfo(u64 info) { mUserInfoTag = info; } const Mtx* getMtx() const { return &mPositionMtx; } + static s16 J2DCast_F32_to_S16(f32 value, u8 arg2); + static JGeometry::TBox2 static_mBounds; public: - /* 0x04 */ u16 _4; - /* 0x06 */ u8 _6[2]; - /* 0x08 */ int id; - /* 0x0C */ u8 _c[4]; + /* 0x04 */ u16 field_0x4; + /* 0x08 */ int mKind; /* 0x10 */ u64 mInfoTag; /* 0x18 */ u64 mUserInfoTag; /* 0x20 */ JGeometry::TBox2 mBounds; diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index d75a2b2f2ee..b28e74fd837 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -14,6 +14,20 @@ enum J2DBinding { /* 0xF */ BIND15 = 15, // temp, figure out later }; +struct J2DPicHeader { + /* 0x0 */ u32 mTag; + /* 0x4 */ u32 mSize; +}; + +struct J2DScrnBlockPictureParameter { + /* 0x00 */ u16 field_0x0; + /* 0x02 */ u16 mMaterialNum; + /* 0x04 */ u16 field_0x4; + /* 0x04 */ u8 field_0x6[10]; + /* 0x10 */ JGeometry::TVec2 field_0x10[4]; + /* 0x20 */ u32 mCornerColor[4]; +}; // Size: 0x30 + class J2DPicture : public J2DPane { public: /* 802FCFF0 */ virtual ~J2DPicture(); @@ -103,7 +117,7 @@ private: /* 0x109 */ u8 field_0x109; /* 0x10A */ JGeometry::TVec2 field_0x10a[4]; /* 0x11C */ f32 field_0x11c[4]; - /* 0x12C */ JUTPalette* field_0x12c; + /* 0x12C */ JUTPalette* mPalette; /* 0x130 */ JUtility::TColor mWhite; /* 0x134 */ JUtility::TColor mBlack; /* 0x138 */ JUtility::TColor mCornerColor[4]; diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index d3a929b176f..dfc68a463b6 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -30,6 +30,24 @@ public: /* 802F4420 */ virtual ~J2DPrint(); + void setFontSize(f32 sizeX, f32 sizeY) { + f32 x; + if (sizeX > 0.0f) { + x = sizeX; + } else { + x = 0.0f; + } + mFontSizeX = x; + + f32 y; + if (sizeY > 0.0f) { + y = sizeY; + } else { + y = 0.0f; + } + mFontSizeY = y; + } + static const u8* mStrBuff; static size_t mStrBuffSize; diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h index e5a18e9c1ed..087e9d5396c 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/include/JSystem/J2DGraph/J2DTevs.h @@ -112,6 +112,24 @@ private: GXIndTexAlphaSel getAlphaSel() const { return (GXIndTexAlphaSel)((mFlags >> 22) & 0x03); } }; +struct J2DIndTevStageInfo { + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; + /* 0x2 */ u8 field_0x2; + /* 0x3 */ u8 field_0x3; + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; + /* 0x6 */ u8 field_0x6; + /* 0x7 */ u8 field_0x7; + /* 0x8 */ int field_0x8; +}; + +inline u32 J2DCalcIndTevStage(J2DIndTevStageInfo info) { + return (info.field_0x8 << 22) | (info.field_0x7 << 21) | (info.field_0x6 << 20) | + (info.field_0x3 << 16) | (info.field_0x5 << 11) | (info.field_0x4 << 8) | + (info.field_0x2 << 4) | (info.field_0x1 << 2) | info.field_0x0; +} + struct J2DTexCoordInfo { /* 0x0 */ u8 mTexGenType; /* 0x1 */ u8 mTexGenSrc; @@ -137,8 +155,12 @@ class J2DTevOrder { public: /* 802F1B70 */ J2DTevOrder(); -private: + GXChannelID getColor() const { return (GXChannelID)mTevOrderInfo.mColor; } + GXTexMapID getTexMap() const { return (GXTexMapID)mTevOrderInfo.mTexMap; } + GXTexCoordID getTexCoord() const { return (GXTexCoordID)mTevOrderInfo.mTexCoord; } + /* 0x0 */ J2DTevOrderInfo mTevOrderInfo; + /* 0x4 */ u8 field_0x4; }; struct J2DTevStageInfo { @@ -163,12 +185,41 @@ struct J2DTevStageInfo { /* 0x12 */ u8 field_0x12; }; +struct J2DTevSwapModeInfo { + /* 0x0 */ u8 field_0x0; + /* 0x1 */ u8 field_0x1; + /* 0x2 */ u8 field_0x2; + /* 0x3 */ u8 field_0x3; +}; + class J2DTevStage { public: /* 802F4110 */ J2DTevStage(J2DTevStageInfo const&); /* 802F1940 */ J2DTevStage(); /* 802F19A8 */ void setTevStageInfo(J2DTevStageInfo const&); + void setTevSwapModeInfo(const J2DTevSwapModeInfo& swapInfo) { + setTexSel(swapInfo.field_0x1); + setRasSel(swapInfo.field_0x0); + } + + void setTexSel(u8 param_0) { + field_0x7 = (field_0x7 & ~12) | (param_0 * 4); + } + + void setRasSel(u8 param_0) { + field_0x7 = (field_0x7 & ~3) | param_0; + } + + void operator=(J2DTevStage const& other) { + field_0x1 = other.field_0x1; + field_0x2 = other.field_0x2; + field_0x3 = other.field_0x3; + field_0x5 = other.field_0x5; + field_0x6 = other.field_0x6; + field_0x7 = other.field_0x7; + } + private: /* 0x0 */ u8 field_0x0; /* 0x1 */ u8 field_0x1; @@ -180,13 +231,6 @@ private: /* 0x7 */ u8 field_0x7; }; -struct J2DTevSwapModeInfo { - /* 0x0 */ u8 mR; - /* 0x1 */ u8 mG; - /* 0x2 */ u8 mB; - /* 0x3 */ u8 mA; -}; - class J2DTevSwapModeTable { public: /* 802F1934 */ J2DTevSwapModeTable(); diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index 6535cfc1eb1..67d1d663d31 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -17,6 +17,29 @@ enum J2DTextBoxHBinding { /* 0x2 */ HBIND_LEFT }; +struct J2DTbxBlockHeader { + /* 0x00 */ u32 mTag; + /* 0x04 */ s32 mSize; +}; + +struct J2DTextBoxInfo { + /* 0x00 */ u16 field_0x0; + /* 0x02 */ u16 field_0x2; + /* 0x04 */ u16 mMaterialNum; + /* 0x06 */ s16 mCharSpace; + /* 0x08 */ s16 mLineSpace; + /* 0x0A */ u16 mFontSizeX; + /* 0x0C */ u16 mFontSizeY; + /* 0x0E */ u8 mHBind; + /* 0x0F */ u8 mVBind; + /* 0x10 */ u32 mCharColor; + /* 0x14 */ u32 mGradColor; + /* 0x18 */ u8 mConnected; + /* 0x19 */ char field_0x19[3]; + /* 0x1C */ u16 field_0x1c; + /* 0x1E */ u16 field_0x1e; +}; // Size: 0x20 + class J2DTextBox : public J2DPane { public: struct TFontSize { @@ -33,13 +56,13 @@ public: /* 80300C70 */ virtual bool isUsed(ResTIMG const*); /* 80300BFC */ virtual bool isUsed(ResFONT const*); /* 80300C90 */ virtual void rewriteAlpha(); - /* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 803002E8 */ virtual void draw(f32, f32); + /* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 80300278 */ virtual void setFont(JUTFont*); /* 8021C7F4 */ virtual JUTFont* getFont() const; /* 80254408 */ virtual bool setBlack(JUtility::TColor); - /* 80186C84 */ virtual void setWhite(JUtility::TColor); - /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); + /* 80186C84 */ virtual bool setWhite(JUtility::TColor); + /* 8019230C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); /* 801DFA34 */ virtual JUtility::TColor getBlack() const; /* 801DFA28 */ virtual JUtility::TColor getWhite() const; /* 8025602C */ virtual bool getMaterial() const; @@ -63,7 +86,7 @@ public: } else { x = 0.0f; } - field_0x11c = x; + mFontSizeX = x; f32 y; if (sizeY > 0.0f) { @@ -71,13 +94,13 @@ public: } else { y = 0.0f; } - field_0x120 = y; + mFontSizeY = y; } void setFontSize(TFontSize size) { setFontSize(size.mSizeX, size.mSizeY); } void getFontSize(TFontSize& size) const { - size.mSizeX = field_0x11c; - size.mSizeY = field_0x120; + size.mSizeX = mFontSizeX; + size.mSizeY = mFontSizeY; } void setCharSpace(f32 space) { mCharSpacing = space; } @@ -85,7 +108,15 @@ public: void setLineSpace(f32 space) { mLineSpacing = space; } f32 getLineSpace() const { return mLineSpacing; } -private: + J2DTextBoxVBinding getVBinding() const { + return (J2DTextBoxVBinding)(mFlags & 3); + } + + J2DTextBoxHBinding getHBinding() const { + return (J2DTextBoxHBinding)((mFlags >> 2) & 3); + } + +// private: /* 0x0100 */ JUTFont* mFont; /* 0x0104 */ JUtility::TColor mCharColor; /* 0x0108 */ JUtility::TColor mGradientColor; @@ -93,14 +124,15 @@ private: /* 0x0110 */ f32 field_0x110; /* 0x0114 */ f32 mCharSpacing; /* 0x0118 */ f32 mLineSpacing; - /* 0x011C */ f32 field_0x11c; - /* 0x0120 */ f32 field_0x120; + /* 0x011C */ f32 mFontSizeX; + /* 0x0120 */ f32 mFontSizeY; /* 0x0124 */ char* mStringPtr; /* 0x0128 */ JUtility::TColor mWhiteColor; /* 0x012C */ JUtility::TColor mBlackColor; /* 0x0130 */ u8 mFlags; /* 0x0131 */ bool mTextFontOwned; /* 0x0132 */ s16 mStringLength; -}; + /* 0x0134 */ u8 field_0x134[4]; +}; // Size: 0x138 #endif /* J2DTEXTBOX_H */ diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h index d9b8a725a18..98f6c44c109 100644 --- a/include/JSystem/J2DGraph/J2DTextBoxEx.h +++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h @@ -8,22 +8,26 @@ class J2DTextBoxEx : public J2DTextBox { public: - enum stage_enum {}; + enum stage_enum { + STAGE_0, + STAGE_1, + STAGE_2, + }; /* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); /* 80307E0C */ void setTevOrder(bool); /* 80307EF0 */ void setTevStage(bool); /* 80307F94 */ void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum); - /* 803084CC */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; - /* 80308668 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; + /* 803084CC */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const; + /* 80308668 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const; /* 8030751C */ virtual ~J2DTextBoxEx(); /* 803089EC */ virtual void setCullBack(bool); /* 803087DC */ virtual void setCullBack(_GXCullMode); /* 803087BC */ virtual void setAlpha(u8); /* 803075AC */ virtual void drawSelf(f32, f32, f32 (*)[3][4]); - /* 80308A28 */ virtual void isUsed(ResTIMG const*); - /* 80308828 */ virtual void isUsed(ResFONT const*); + /* 80308A28 */ virtual bool isUsed(ResTIMG const*); + /* 80308828 */ virtual bool isUsed(ResFONT const*); /* 80308810 */ virtual void rewriteAlpha(); /* 80308A4C */ virtual void setAnimation(J2DAnmBase*); /* 80256044 */ virtual void setAnimation(J2DAnmTransform*); @@ -33,24 +37,24 @@ public: /* 80308938 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80308964 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 80308A48 */ virtual void setAnimation(J2DAnmVtxColor*); - /* 8030896C */ virtual void animationPane(J2DAnmTransform const*); + /* 8030896C */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 803078AC */ virtual void draw(f32, f32); /* 80307AF0 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding); /* 80307D5C */ virtual void setFont(JUTFont*); /* 80307DC0 */ virtual JUTFont* getFont() const; - /* 8030823C */ virtual void setBlack(JUtility::TColor); - /* 803082C4 */ virtual void setWhite(JUtility::TColor); - /* 8030834C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 803086FC */ virtual void getBlack() const; - /* 8030875C */ virtual void getWhite() const; - /* 80256024 */ virtual void getMaterial() const; + /* 8030823C */ virtual bool setBlack(JUtility::TColor); + /* 803082C4 */ virtual bool setWhite(JUtility::TColor); + /* 8030834C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); + /* 803086FC */ virtual JUtility::TColor getBlack() const; + /* 8030875C */ virtual JUtility::TColor getWhite() const; + /* 80256024 */ virtual bool getMaterial() const; private: - /* 0x134 */ u8 field_0x134[4]; /* 0x138 */ J2DMaterial* mMaterial; /* 0x13C */ u16 field_0x13c; /* 0x13E */ u16 field_0x13e; /* 0x140 */ u8 field_0x140; -}; // Size: 0x144 + /* 0x144 */ J2DAnmVisibilityFull* mVisibilityAnm; +}; // Size: 0x148 #endif /* J2DTEXTBOXEX_H */ diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h index 86d0af97206..38cc0e08c29 100644 --- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h +++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h @@ -32,17 +32,19 @@ public: void drawTail() const; inline void calcZRatio(); + void setNonSort() { mSortType = 5; } + void setZSort() { mSortType = 2; } public: - J3DPacket** mpBuf; - u32 mBufSize; - u32 mDrawType; - u32 mSortType; - float mZNear; - float mZFar; - float mZRatio; - Mtx* mpZMtx; - J3DPacket* mpCallBackPacket; + /* 0x00 */ J3DPacket** mpBuf; + /* 0x04 */ u32 mBufSize; + /* 0x08 */ u32 mDrawType; + /* 0x0C */ u32 mSortType; + /* 0x10 */ f32 mZNear; + /* 0x14 */ f32 mZFar; + /* 0x18 */ f32 mZRatio; + /* 0x1C */ Mtx* mpZMtx; + /* 0x20 */ J3DPacket* mpCallBackPacket; static u8 sortFuncTable[72]; static u8 drawFuncTable[24]; diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/include/JSystem/JAudio2/JAISoundStarter.h index 040d144f909..d891a8b4165 100644 --- a/include/JSystem/JAudio2/JAISoundStarter.h +++ b/include/JSystem/JAudio2/JAISoundStarter.h @@ -2,5 +2,13 @@ #define JAISOUNDSTARTER_H #include "dolphin/types.h" +#include "JSystem/JAudio2/JAISound.h" + +struct JAISoundStarter { + /* 802A2F6C */ JAISoundStarter(bool); + /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); + + virtual ~JAISoundStarter(); +}; #endif /* JAISOUNDSTARTER_H */ diff --git a/include/JSystem/JGadget/binary.h b/include/JSystem/JGadget/binary.h index abbe3f79952..ebb0f87299f 100644 --- a/include/JSystem/JGadget/binary.h +++ b/include/JSystem/JGadget/binary.h @@ -23,7 +23,7 @@ struct TParseData { const void* getRaw() const { return raw; } void setRaw(const void* p) { raw = p; } - const void* raw; + /* 0x0 */ const void* raw; }; template @@ -46,6 +46,10 @@ struct TParse_header_block { virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg2) = 0; bool parse_next(const void** ppData_inout, u32 a2); + + bool parse(const void* ppData_inout, u32 a2) { + return parse_next(&ppData_inout, a2); + } }; } // namespace binary diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index f1f92f4fe1c..d8be365b23c 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -10,9 +10,9 @@ struct TLinkListNode { mPrev = NULL; } - TLinkListNode* mNext; - TLinkListNode* mPrev; -}; + /* 0x0 */ TLinkListNode* mNext; + /* 0x4 */ TLinkListNode* mPrev; +}; // Size: 0x8 struct TNodeLinkList { struct iterator { diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 8ee16b87f02..d0ae61b76ed 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -10,11 +10,13 @@ public: friend class JKRExpHeap; public: - void initiate(CMemBlock*, CMemBlock*, u32, u8, u8); - JKRExpHeap::CMemBlock* allocFore(u32, u8, u8, u8, u8); - JKRExpHeap::CMemBlock* allocBack(u32, u8, u8, u8, u8); - int free(JKRExpHeap*); - static CMemBlock* getHeapBlock(void*); + void initiate(CMemBlock* prev, CMemBlock* next, u32 size, u8 groupId, u8 alignment); + JKRExpHeap::CMemBlock* allocFore(u32 size, u8 groupId1, u8 alignment1, u8 groupId2, + u8 alignment2); + JKRExpHeap::CMemBlock* allocBack(u32 size, u8 groupId1, u8 alignment1, u8 groupId2, + u8 alignment2); + int free(JKRExpHeap* heap); + static CMemBlock* getHeapBlock(void* ptr); void newGroupId(u8 groupId) { this->mGroupId = groupId; } bool isValid() const { return this->mMagic == 'HM'; } @@ -38,46 +40,46 @@ public: friend class CMemBlock; protected: - JKRExpHeap(void*, u32, JKRHeap*, bool); + JKRExpHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag); virtual ~JKRExpHeap(); - void* allocFromHead(u32, int); - void* allocFromHead(u32); - void* allocFromTail(u32, int); - void* allocFromTail(u32); - void appendUsedList(CMemBlock*); - void setFreeBlock(CMemBlock*, CMemBlock*, CMemBlock*); - void removeFreeBlock(CMemBlock*); - void removeUsedBlock(CMemBlock*); - void recycleFreeBlock(CMemBlock*); - void joinTwoBlocks(CMemBlock*); + void* allocFromHead(u32 size, int align); + void* allocFromHead(u32 size); + void* allocFromTail(u32 size, int align); + void* allocFromTail(u32 size); + void appendUsedList(CMemBlock* newblock); + void setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next); + void removeFreeBlock(CMemBlock* block); + void removeUsedBlock(CMemBlock* block); + void recycleFreeBlock(CMemBlock* block); + void joinTwoBlocks(CMemBlock* block); public: - s32 getUsedSize(u8) const; + s32 getUsedSize(u8 groupId) const; s32 getTotalUsedSize(void) const; CMemBlock* getHeadUsedList() const { return mHeadUsedList; } public: - /* vt[04] */ virtual u32 getHeapType(); /* override */ - /* vt[05] */ virtual bool check(); /* override */ - /* vt[06] */ virtual bool dump_sort(); /* override */ - /* vt[07] */ virtual bool dump(); /* override */ - /* vt[08] */ virtual void do_destroy(); /* override */ - /* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */ - /* vt[10] */ virtual void do_free(void* ptr); /* override */ - /* vt[11] */ virtual void do_freeAll(); /* override */ - /* vt[12] */ virtual void do_freeTail(); /* override */ - /* vt[13] */ virtual void do_fillFreeArea(); /* override */ - /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size); /* override */ - /* vt[15] */ virtual s32 do_getSize(void* ptr); /* override */ - /* vt[16] */ virtual s32 do_getFreeSize(); /* override */ - /* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */ - /* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */ - /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* override */ - /* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */ - /* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */ - /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, - JKRHeap::TState const&) const; /* override */ + /* vt[04] */ virtual u32 getHeapType(); /* override */ + /* vt[05] */ virtual bool check(); /* override */ + /* vt[06] */ virtual bool dump_sort(); /* override */ + /* vt[07] */ virtual bool dump(); /* override */ + /* vt[08] */ virtual void do_destroy(); /* override */ + /* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */ + /* vt[10] */ virtual void do_free(void* ptr); /* override */ + /* vt[11] */ virtual void do_freeAll(); /* override */ + /* vt[12] */ virtual void do_freeTail(); /* override */ + /* vt[13] */ virtual void do_fillFreeArea(); /* override */ + /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size); /* override */ + /* vt[15] */ virtual s32 do_getSize(void* ptr); /* override */ + /* vt[16] */ virtual s32 do_getFreeSize(); /* override */ + /* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */ + /* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */ + /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* override */ + /* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */ + /* vt[21] */ virtual void state_register(JKRHeap::TState* p, u32 id) const; /* override */ + /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1, + JKRHeap::TState const& r2) const; /* override */ u8 field_0x6c; u8 mCurrentGroupId; @@ -92,9 +94,9 @@ private: CMemBlock* mTailUsedList; public: - static JKRExpHeap* createRoot(int, bool); - static JKRExpHeap* create(u32, JKRHeap*, bool); - static JKRExpHeap* create(void*, u32, JKRHeap*, bool); + static JKRExpHeap* createRoot(int maxHeaps, bool errorFlag); + static JKRExpHeap* create(u32 size, JKRHeap* parent, bool errorFlag); + static JKRExpHeap* create(void* ptr, u32 size, JKRHeap* parent, bool errorFlag); }; inline JKRExpHeap* JKRCreateExpHeap(u32 size, JKRHeap* parent, bool errorFlag) { diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index bd123756500..38aba619a09 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -29,7 +29,7 @@ public: }; public: - JKRHeap(void*, u32, JKRHeap*, bool); + JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag); virtual ~JKRHeap(); JKRHeap* becomeSystemHeap(); @@ -77,9 +77,9 @@ public: /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0; /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* vt[20] */ virtual u8 do_getCurrentGroupId(); - /* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const; - /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const; - /* vt[23] */ virtual void state_dump(JKRHeap::TState const&) const; + /* vt[21] */ virtual void state_register(JKRHeap::TState* p, u32 id) const; + /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const; + /* vt[23] */ virtual void state_dump(JKRHeap::TState const& p) const; void setDebugFill(bool debugFill) { mDebugFill = debugFill; } bool getDebugFill() const { return mDebugFill; } @@ -123,7 +123,7 @@ protected: /* 0x6A */ u8 padding_0x6a[2]; public: - static bool initArena(char**, u32*, int); + static bool initArena(char** memory, u32* size, int maxHeaps); static void* alloc(u32 size, int alignment, JKRHeap* heap); static void free(void* ptr, JKRHeap* heap); static s32 resize(void* ptr, u32 size, JKRHeap* heap); @@ -212,7 +212,7 @@ inline void JKRFreeToSysHeap(void* ptr) { systemHeap->free(ptr); } -inline void JKRFree(void* ptr) { +inline void i_JKRFree(void* ptr) { JKRHeap::free(ptr, NULL); } diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index e695c8c35dd..58465c73170 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -1,5 +1,5 @@ -#ifndef CONTROL_H -#define CONTROL_H +#ifndef JMESSAGE_CONTROL_H +#define JMESSAGE_CONTROL_H #include "dolphin/types.h" #include "JSystem/JMessage/processor.h" @@ -36,4 +36,4 @@ struct jmessage_tControl : public JMessage::TControl { /* 80039B0C */ virtual ~jmessage_tControl(); }; -#endif /* CONTROL_H */ +#endif /* JMESSAGE_CONTROL_H */ diff --git a/include/JSystem/JMessage/data.h b/include/JSystem/JMessage/data.h index ef1791c89e4..57d65a2c6de 100644 --- a/include/JSystem/JMessage/data.h +++ b/include/JSystem/JMessage/data.h @@ -1,5 +1,5 @@ -#ifndef DATA_H -#define DATA_H +#ifndef JMESSAGE_DATA_H +#define JMESSAGE_DATA_H #include "dolphin/types.h" @@ -9,4 +9,4 @@ struct data { }; }; // namespace JMessage -#endif /* DATA_H */ +#endif /* JMESSAGE_DATA_H */ diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h index eebedb6fd46..984b2a3f529 100644 --- a/include/JSystem/JMessage/locale.h +++ b/include/JSystem/JMessage/locale.h @@ -1,5 +1,5 @@ -#ifndef LOCALE_H -#define LOCALE_H +#ifndef JMESSAGE_LOCALE_H +#define JMESSAGE_LOCALE_H #include "dolphin/types.h" @@ -12,4 +12,4 @@ struct locale { }; }; // namespace JMessage -#endif /* LOCALE_H */ +#endif /* JMESSAGE_LOCALE_H */ diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index a4e3cbe14d3..c4360327341 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -1,5 +1,5 @@ -#ifndef PROCESSOR_H -#define PROCESSOR_H +#ifndef JMESSAGE_PROCESSOR_H +#define JMESSAGE_PROCESSOR_H #include "SSystem/SComponent/c_xyz.h" #include "dolphin/types.h" @@ -298,4 +298,4 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor { /* 8022D74C */ virtual void do_tag(u32, void const*, u32); }; -#endif /* PROCESSOR_H */ +#endif /* JMESSAGE_PROCESSOR_H */ diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h index 891075a14d5..487f2d26df8 100644 --- a/include/JSystem/JMessage/resource.h +++ b/include/JSystem/JMessage/resource.h @@ -1,5 +1,5 @@ -#ifndef RESOURCE_H -#define RESOURCE_H +#ifndef JMESSAGE_RESOURCE_H +#define JMESSAGE_RESOURCE_H #include "dolphin/types.h" #include "JSystem/JGadget/linklist.h" @@ -34,4 +34,4 @@ struct TParse { }; }; // namespace JMessage -#endif /* RESOURCE_H */ +#endif /* JMESSAGE_RESOURCE_H */ diff --git a/include/JSystem/JStage/JSGActor.h b/include/JSystem/JStage/JSGActor.h index 05033d4fb2a..ac43705fa63 100644 --- a/include/JSystem/JStage/JSGActor.h +++ b/include/JSystem/JStage/JSGActor.h @@ -2,5 +2,33 @@ #define JSGACTOR_H #include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" + +namespace JStage { + struct TActor : public TObject { + /* 80280A48 */ virtual ~TActor() = 0; + /* 80280AA8 */ virtual s32 JSGFGetType() const; + /* 80280AB0 */ virtual void JSGGetTranslation(Vec*) const; + /* 80280AB4 */ virtual void JSGSetTranslation(Vec const&); + /* 80280AB8 */ virtual void JSGGetScaling(Vec*) const; + /* 80280ABC */ virtual void JSGSetScaling(Vec const&); + /* 80280AC0 */ virtual void JSGGetRotation(Vec*) const; + /* 80280AC4 */ virtual void JSGSetRotation(Vec const&); + /* 80280AC8 */ virtual s32 JSGGetShape() const; + /* 80280AD0 */ virtual void JSGSetShape(u32); + /* 80280AD4 */ virtual s32 JSGGetAnimation() const; + /* 80280ADC */ virtual void JSGSetAnimation(u32); + /* 80280AE0 */ virtual f32 JSGGetAnimationFrame() const; + /* 80280AE8 */ virtual void JSGSetAnimationFrame(f32); + /* 80280AEC */ virtual f32 JSGGetAnimationFrameMax() const; + /* 80280AF4 */ virtual f32 JSGGetAnimationTransition() const; + /* 80280AFC */ virtual void JSGSetAnimationTransition(f32); + /* 80280B00 */ virtual s32 JSGGetTextureAnimation() const; + /* 80280B08 */ virtual void JSGSetTextureAnimation(u32); + /* 80280B0C */ virtual f32 JSGGetTextureAnimationFrame() const; + /* 80280B14 */ virtual void JSGSetTextureAnimationFrame(f32); + /* 80280B18 */ virtual f32 JSGGetTextureAnimationFrameMax() const; + }; +}; #endif /* JSGACTOR_H */ diff --git a/include/JSystem/JStage/JSGAmbientLight.h b/include/JSystem/JStage/JSGAmbientLight.h index fe58fb69c8d..7d0d1835012 100644 --- a/include/JSystem/JStage/JSGAmbientLight.h +++ b/include/JSystem/JStage/JSGAmbientLight.h @@ -1,6 +1,16 @@ #ifndef JSGAMBIENTLIGHT_H #define JSGAMBIENTLIGHT_H -#include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" +#include "dolphin/gx/GX.h" + +namespace JStage { + struct TAmbientLight : public TObject { + /* 80280B20 */ virtual ~TAmbientLight() = 0; + /* 80280B80 */ virtual s32 JSGFGetType() const; + /* 80280B88 */ virtual GXColor JSGGetColor() const; + /* 80280B9C */ virtual void JSGSetColor(GXColor); + }; +}; #endif /* JSGAMBIENTLIGHT_H */ diff --git a/include/JSystem/JStage/JSGCamera.h b/include/JSystem/JStage/JSGCamera.h index 0e928ba95a1..bc8d6880b51 100644 --- a/include/JSystem/JStage/JSGCamera.h +++ b/include/JSystem/JStage/JSGCamera.h @@ -1,6 +1,39 @@ #ifndef JSGCAMERA_H #define JSGCAMERA_H -#include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" + +namespace JStage { + struct TECameraProjection {}; + + struct TECameraView {}; + + struct TCamera : public TObject { + /* 80280BA0 */ virtual ~TCamera() = 0; + /* 80280C00 */ virtual s32 JSGFGetType() const; + /* 80280C08 */ virtual bool JSGGetProjectionType() const; + /* 80280C10 */ virtual void JSGSetProjectionType(JStage::TECameraProjection); + /* 80280C14 */ virtual f32 JSGGetProjectionNear() const; + /* 80280C1C */ virtual void JSGSetProjectionNear(f32); + /* 80280C20 */ virtual f32 JSGGetProjectionFar() const; + /* 80280C2C */ virtual void JSGSetProjectionFar(f32); + /* 80280C30 */ virtual f32 JSGGetProjectionFovy() const; + /* 80280C38 */ virtual void JSGSetProjectionFovy(f32); + /* 80280C3C */ virtual f32 JSGGetProjectionAspect() const; + /* 80280C44 */ virtual void JSGSetProjectionAspect(f32); + /* 80280C48 */ virtual void JSGGetProjectionField(f32*) const; + /* 80280C4C */ virtual void JSGSetProjectionField(f32 const*); + /* 80280C50 */ virtual bool JSGGetViewType() const; + /* 80280C58 */ virtual void JSGSetViewType(JStage::TECameraView); + /* 80280C5C */ virtual void JSGGetViewPosition(Vec*) const; + /* 80280C60 */ virtual void JSGSetViewPosition(Vec const&); + /* 80280C64 */ virtual void JSGGetViewUpVector(Vec*) const; + /* 80280C68 */ virtual void JSGSetViewUpVector(Vec const&); + /* 80280C6C */ virtual void JSGGetViewTargetPosition(Vec*) const; + /* 80280C70 */ virtual void JSGSetViewTargetPosition(Vec const&); + /* 80280C74 */ virtual f32 JSGGetViewRoll() const; + /* 80280C7C */ virtual void JSGSetViewRoll(f32); + }; +}; #endif /* JSGCAMERA_H */ diff --git a/include/JSystem/JStage/JSGFog.h b/include/JSystem/JStage/JSGFog.h index 99ba5abfc1a..beb8f761df1 100644 --- a/include/JSystem/JStage/JSGFog.h +++ b/include/JSystem/JStage/JSGFog.h @@ -1,6 +1,22 @@ #ifndef JSGFOG_H #define JSGFOG_H -#include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" +#include "dolphin/gx/GX.h" + +namespace JStage { + struct TFog : public TObject { + /* 80280C80 */ virtual ~TFog() = 0; + /* 80280CE0 */ virtual s32 JSGFGetType() const; + /* 80280CE8 */ virtual bool JSGGetFogFunction() const; + /* 80280CF0 */ virtual void JSGSetFogFunction(GXFogType); + /* 80280CF4 */ virtual f32 JSGGetStartZ() const; + /* 80280CFC */ virtual void JSGSetStartZ(f32); + /* 80280D00 */ virtual f32 JSGGetEndZ() const; + /* 80280D0C */ virtual void JSGSetEndZ(f32); + /* 80280D10 */ virtual GXColor JSGGetColor() const; + /* 80280D24 */ virtual void JSGSetColor(GXColor); + }; +}; #endif /* JSGFOG_H */ diff --git a/include/JSystem/JStage/JSGLight.h b/include/JSystem/JStage/JSGLight.h index 04477768615..7317c8845f0 100644 --- a/include/JSystem/JStage/JSGLight.h +++ b/include/JSystem/JStage/JSGLight.h @@ -1,6 +1,28 @@ #ifndef JSGLIGHT_H #define JSGLIGHT_H -#include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" +#include "dolphin/gx/GX.h" + +namespace JStage { + enum TELight {}; + + struct TLight : public TObject { + /* 80280D28 */ virtual ~TLight() = 0; + /* 80280D88 */ virtual s32 JSGFGetType() const; + /* 80280D90 */ virtual bool JSGGetLightType() const; + /* 80280D98 */ virtual void JSGSetLightType(JStage::TELight); + /* 80280DC4 */ virtual void JSGGetPosition(Vec*) const; + /* 80280DC8 */ virtual void JSGSetPosition(Vec const&); + /* 80280D9C */ virtual GXColor JSGGetColor() const; + /* 80280DB0 */ virtual void JSGSetColor(GXColor); + /* 80280DB4 */ virtual void JSGGetDistanceAttenuation(f32*, f32*, GXDistAttnFn*) const; + /* 80280DB8 */ virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn); + /* 80280DBC */ virtual void JSGGetAngleAttenuation(f32*, GXSpotFn*) const; + /* 80280DC0 */ virtual void JSGSetAngleAttenuation(f32, GXSpotFn); + /* 80280DCC */ virtual void JSGGetDirection(Vec*) const; + /* 80280DD0 */ virtual void JSGSetDirection(Vec const&); + }; +}; #endif /* JSGLIGHT_H */ diff --git a/include/JSystem/JStage/JSGObject.h b/include/JSystem/JStage/JSGObject.h index 2ad83c97c53..06410cf1382 100644 --- a/include/JSystem/JStage/JSGObject.h +++ b/include/JSystem/JStage/JSGObject.h @@ -2,5 +2,24 @@ #define JSGOBJECT_H #include "dolphin/types.h" +#include "dolphin/mtx/mtxvec.h" + +namespace JStage { + struct TObject { + /* 80280DD4 */ virtual ~TObject() = 0; + virtual s32 JSGFGetType() const = 0; + /* 80280E1C */ virtual bool JSGGetName() const; + /* 80280E24 */ virtual void JSGUpdate(); + /* 80280E28 */ virtual bool JSGGetFlag() const; + /* 80280E30 */ virtual void JSGSetFlag(u32); + /* 80280E34 */ virtual bool JSGGetData(u32, void*, u32) const; + /* 80280E3C */ virtual void JSGSetData(u32, void const*, u32); + /* 80280E40 */ virtual void JSGGetParent(JStage::TObject**, u32*) const; + /* 80280E44 */ virtual void JSGSetParent(JStage::TObject*, u32); + /* 80280E48 */ virtual void JSGSetRelation(bool, JStage::TObject*, u32); + /* 80280E4C */ virtual s32 JSGFindNodeID(char const*) const; + /* 80280E54 */ virtual int JSGGetNodeTransformation(u32, f32 (*)[4]) const; + }; +}; #endif /* JSGOBJECT_H */ diff --git a/include/JSystem/JStage/JSGSystem.h b/include/JSystem/JStage/JSGSystem.h index be77b80e046..2ced8fb8987 100644 --- a/include/JSystem/JStage/JSGSystem.h +++ b/include/JSystem/JStage/JSGSystem.h @@ -2,5 +2,28 @@ #define JSGSYSTEM_H #include "dolphin/types.h" +#include "JSystem/JStage/JSGObject.h" + +namespace JStage { + enum TEObject { + /* 0x0 */ TOBJ_ACTOR_UNK, + /* 0x1 */ TOBJ_UNK1, + /* 0x2 */ TOBJ_ACTOR, + /* 0x3 */ TOBJ_CAMERA, + /* 0x4 */ TOBJ_AMBIENT, + /* 0x5 */ TOBJ_LIGHT, + /* 0x6 */ TOBJ_FOG, + }; + + struct TSystem : public TObject { + /* 80280E90 */ virtual ~TSystem() = 0; + /* 80280EF0 */ virtual s32 JSGFGetType() const; + /* 80280EF8 */ virtual bool JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; + /* 80280F00 */ virtual bool JSGCreateObject(char const*, JStage::TEObject, u32); + /* 80280F08 */ virtual void JSGDestroyObject(JStage::TObject*); + /* 80280F0C */ virtual bool JSGGetSystemData(u32); + /* 80280F14 */ virtual void JSGSetSystemData(u32, u32); + }; +}; #endif /* JSGSYSTEM_H */ diff --git a/include/JSystem/JStudio/JStudio/ctb.h b/include/JSystem/JStudio/JStudio/ctb.h index 26202dcefd0..aab0f7681ff 100644 --- a/include/JSystem/JStudio/JStudio/ctb.h +++ b/include/JSystem/JStudio/JStudio/ctb.h @@ -2,5 +2,65 @@ #define CTB_H #include "dolphin/types.h" +#include "JSystem/JGadget/binary.h" +#include "JSystem/JGadget/linklist.h" +#include "JSystem/JStudio/JStudio/object-id.h" + +namespace JStudio { +namespace ctb { +struct TObject : public object::TObject_ID { + /* 80280F18 */ virtual ~TObject() = 0; + + /* 0x08 vtable */ + /* 0x0C */ JGadget::TLinkListNode field_0xc; + /* 0x14 */ void* pData_; +}; + +struct data { + struct TParse_TBlock : public JGadget::binary::TParseData_aligned<4> {}; + + static u32 ga4cSignature; +}; + +struct TObject_TxyzRy : public TObject { + /* 80280F60 */ TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const&); + + /* 80281554 */ virtual ~TObject_TxyzRy(); + /* 80280FBC */ virtual bool getScheme() const; +}; + +struct TFactory { + TFactory() {} + + /* 80281274 */ virtual ~TFactory(); + /* 802812BC */ virtual void create(JStudio::ctb::data::TParse_TBlock const&); + /* 80281320 */ virtual void destroy(JStudio::ctb::TObject*); +}; + +struct TControl { + /* 80280FC4 */ TControl(); + /* 80280FF4 */ virtual ~TControl(); + /* 80281060 */ void appendObject(JStudio::ctb::TObject*); + /* 802810AC */ void removeObject(JStudio::ctb::TObject*); + /* 802810DC */ void destroyObject(JStudio::ctb::TObject*); + /* 8028112C */ void destroyObject_all(); + /* 80281190 */ void getObject(void const*, u32); + /* 80281230 */ void getObject_index(u32); + + /* 0x4 */ TFactory* pFactory_; + /* 0x8 */ JGadget::TLinkList mList; +}; + +struct TParse : public JGadget::binary::TParse_header_block { + /* 8028135C */ TParse(JStudio::ctb::TControl*); + /* 8028137C */ virtual ~TParse(); + /* 802813DC */ virtual void parseHeader_next(void const**, u32*, u32); + /* 80281470 */ virtual void parseBlock_next(void const**, u32*, u32); + + /* 0x4 */ TControl* pControl_; +}; + +}; // namespace ctb +}; // namespace JStudio #endif /* CTB_H */ diff --git a/include/JSystem/JStudio/JStudio/fvb-data.h b/include/JSystem/JStudio/JStudio/fvb-data.h index bbc3a5d3130..6469a31645f 100644 --- a/include/JSystem/JStudio/JStudio/fvb-data.h +++ b/include/JSystem/JStudio/JStudio/fvb-data.h @@ -10,7 +10,7 @@ namespace JStudio { namespace fvb { namespace data { -extern f32 ga4cSignature[1 + 1 /* padding */]; +extern const char ga4cSignature[4]; const int PARAGRAPH_DATA = 1; diff --git a/include/JSystem/JStudio/JStudio/fvb.h b/include/JSystem/JStudio/JStudio/fvb.h index 4303b96c141..59f99514794 100644 --- a/include/JSystem/JStudio/JStudio/fvb.h +++ b/include/JSystem/JStudio/JStudio/fvb.h @@ -49,8 +49,9 @@ private: class TFactory { public: - /* 80284918 */ virtual ~TFactory(); + TFactory() {} + /* 80284918 */ virtual ~TFactory(); /* 80284960 */ virtual TObject* create(JStudio::fvb::data::TParse_TBlock const&); /* 80284AA0 */ virtual void destroy(JStudio::fvb::TObject*); }; @@ -70,9 +71,9 @@ public: TFactory* getFactory() const { return pFactory; } private: - TFactory* pFactory; - JGadget::TLinkList ocObject_; -}; + /* 0x4 */ TFactory* pFactory; + /* 0x8 */ JGadget::TLinkList ocObject_; +}; // Size: 0x14 class TObject_composite : public TObject { public: diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index c5e1db09edf..b2cd99f6b8b 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -1,6 +1,96 @@ #ifndef JSTUDIO_CONTROL_H #define JSTUDIO_CONTROL_H -#include "dolphin/types.h" +#include "JSystem/JGadget/binary.h" +#include "JSystem/JStudio/JStudio/fvb.h" +#include "JSystem/JStudio/JStudio/stb.h" +#include "JSystem/JStudio/JStudio/ctb.h" +#include "dolphin/gx/GX.h" + +namespace JStudio { +struct TCreateObject { + TCreateObject() {} + /* 80285488 */ virtual ~TCreateObject() = 0; + + /* 0x4 */ JGadget::TLinkListNode mNode; +}; // Size: 0xC + +struct TFactory : public stb::TFactory { + TFactory() {} + + /* 802854D0 */ virtual ~TFactory(); + /* 802855AC */ virtual void create(JStudio::stb::data::TParse_TBlock_object const&); + + /* 80285560 */ void appendCreateObject(JStudio::TCreateObject*); + + /* 0x04 */ JGadget::TLinkList mList; + /* 0x10 */ fvb::TFactory fvb_Factory; + /* 0x14 */ ctb::TFactory ctb_Factory; +}; + +class TControl : public stb::TControl { +public: + struct TTransform_translation_rotation_scaling {}; + struct TTransform_position {}; + + /* 80285114 */ TControl(); + /* 802851AC */ virtual ~TControl(); + /* 80285228 */ void setFactory(JStudio::TFactory*); + /* 80285250 */ void transformOnSet_setOrigin_TxyzRy(Vec const&, f32); + /* 802852D0 */ void transformOnGet_setOrigin_TxyzRy(Vec const&, f32); + /* 80285368 */ void transform_setOrigin_ctb(JStudio::ctb::TObject const&); + /* 8028543C */ void transform_setOrigin_ctb_index(u32); + + void stb_destroyObject_all() { stb::TControl::destroyObject_all(); } + void fvb_destroyObject_all() { fvb_Control.destroyObject_all(); } + void ctb_destroyObject_all() { ctb_Control.destroyObject_all(); } + + void destroyObject_all() { + stb_destroyObject_all(); + fvb_destroyObject_all(); + ctb_destroyObject_all(); + } + + void transformOnSet_enable(bool param_0) { mTransformOnSet = param_0; } + void transformOnGet_enable(bool param_0) { mTransformOnGet = param_0; } + + void transform_enable(bool param_0) { + transformOnSet_enable(param_0); + transformOnGet_enable(param_0); + } + + void transform_setOrigin_TxyzRy(const Vec& xyz, f32 rotY) { + transformOnSet_setOrigin_TxyzRy(xyz, rotY); + transformOnGet_setOrigin_TxyzRy(xyz, rotY); + } + + void transform_setOrigin(const Vec& xyz, f32 rotY) { + transform_setOrigin_TxyzRy(xyz, rotY); + } + + /* 0x58 */ f64 mSecondPerFrame; + /* 0x60 */ fvb::TControl fvb_Control; + /* 0x74 */ ctb::TControl ctb_Control; + /* 0x88 */ bool mTransformOnSet; + /* 0x89 */ bool mTransformOnGet; + /* 0x8C */ Vec field_0x8c; + /* 0x98 */ Vec field_0x98; + /* 0xA4 */ f32 mTransformOnSet_RotationY; + /* 0xA8 */ u8 field_0xa8[4]; + /* 0xAC */ Mtx mTransformOnSet_Matrix; + /* 0xDC */ Mtx mTransformOnGet_Matrix; +}; + +struct TParse : public stb::TParse { + /* 8028566C */ TParse(JStudio::TControl*); + /* 80285844 */ void parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const&, u32); + /* 802858F0 */ void parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const&, u32); + + /* 802856A8 */ virtual ~TParse(); + /* 80285708 */ virtual void parseHeader(JStudio::stb::data::TParse_THeader const&, u32); + /* 802857E4 */ virtual void parseBlock_block(JStudio::stb::data::TParse_TBlock const&, u32); +}; + +}; // namespace JStudio #endif /* JSTUDIO_CONTROL_H */ diff --git a/include/JSystem/JStudio/JStudio/jstudio-data.h b/include/JSystem/JStudio/JStudio/jstudio-data.h index 9b7e9a92d88..b9e998e3b90 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-data.h +++ b/include/JSystem/JStudio/JStudio/jstudio-data.h @@ -3,4 +3,10 @@ #include "dolphin/types.h" +namespace JStudio { +namespace data { + extern const char ga8cSignature[8]; +} // namespace data +} // namespace JStudio + #endif /* JSTUDIO_DATA_H */ diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index f95dd0ac5fc..6dea237a5b9 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,5 +2,14 @@ #define JSTUDIO_MATH_H #include "dolphin/types.h" +#include "dolphin/mtx/mtxvec.h" + +namespace JStudio { +namespace math { + /* 802859DC */ void getRotation_xyz(MtxP, f32, f32, f32); + /* 80285B44 */ void getTransformation_SRxyzT(MtxP, Vec const&, Vec const&, Vec const&); + /* 80285BCC */ void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, CMtxP); +}; +}; // namespace JStudio #endif /* JSTUDIO_MATH_H */ diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 19976cead86..9f78474e13e 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -1,6 +1,237 @@ #ifndef JSTUDIO_OBJECT_H #define JSTUDIO_OBJECT_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio/fvb.h" +#include "JSystem/JStudio/JStudio/stb.h" +#include "JSystem/JStudio/JStudio/ctb.h" +#include "JSystem/JStudio/JStudio/jstudio-control.h" +#include "dolphin/gx/GX.h" + +namespace JStudio { +namespace data { + struct TEOperationData {}; +}; + +struct TAdaptor; +struct TVariableValue { + struct TOutput { + /* 80285E0C */ ~TOutput(); + }; + + struct TOutput_none_ { + /* 80285F6C */ ~TOutput_none_(); + /* 80285FCC */ void operator()(f32, JStudio::TAdaptor*) const; + }; + + /* 80285E54 */ void update(f64, JStudio::TAdaptor*); + /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); + /* 80285ECC */ void update_time_(JStudio::TVariableValue*, f64); + /* 80285F08 */ void update_functionValue_(JStudio::TVariableValue*, f64); + /* 8028B568 */ TVariableValue(); + + static u8 soOutput_none_[4 + 4 /* padding */]; + + /* 0x00 */ f32 mValue; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ void (*field_0x8)(TVariableValue*, double); + /* 0x0C */ TFunctionValue* field_0xc; + /* 0x10 */ TOutput* pOutput_; +}; // Size: 0x14 + +class TObject : public stb::TObject { +public: + /* 80286864 */ TObject(JStudio::stb::data::TParse_TBlock_object const&, JStudio::TAdaptor*); + /* 80286734 */ void forward_value(u32); + + /* 802866B0 */ virtual ~TObject() = 0; + /* 8028679C */ virtual void do_begin(); + /* 802867D4 */ virtual void do_end(); + virtual void do_paragraph(u32, void const*, u32) = 0; + /* 8028680C */ virtual void do_wait(u32); + /* 8028682C */ virtual void do_data(void const*, u32, void const*, u32); + + /* 0x34 */ TAdaptor* mpAdaptor; +}; + +struct TAdaptor { + struct TSetVariableValue_immediate {}; + + /* 80285FD0 */ virtual ~TAdaptor() = 0; + /* 80286018 */ virtual void adaptor_do_prepare(); + /* 8028601C */ virtual void adaptor_do_begin(); + /* 80286020 */ virtual void adaptor_do_end(); + /* 80286024 */ virtual void adaptor_do_update(u32); + /* 80286028 */ virtual void adaptor_do_data(void const*, u32, void const*, u32); + + /* 8028602C */ void adaptor_setVariableValue(JStudio::TControl*, u32, + JStudio::data::TEOperationData, void const*, u32); + /* 802860CC */ void adaptor_setVariableValue_n(JStudio::TControl*, u32 const*, u32, + JStudio::data::TEOperationData, void const*, + u32); + /* 802861C0 */ void + adaptor_setVariableValue_immediate(JStudio::TAdaptor::TSetVariableValue_immediate const*); + /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&); + /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; + /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, GXColor const&); + /* 8028638C */ void adaptor_getVariableValue_GXColor(GXColor*, u32 const*) const; + /* 802864D8 */ void adaptor_updateVariableValue(JStudio::TControl*, u32); + /* 8028656C */ void adaptor_setVariableValue_VOID_(JStudio::TAdaptor*, JStudio::TControl*, u32, + void const*, u32); + /* 80286584 */ void adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor*, JStudio::TControl*, + u32, void const*, u32); + /* 802865B0 */ void adaptor_setVariableValue_TIME_(JStudio::TAdaptor*, JStudio::TControl*, u32, + void const*, u32); + /* 802865DC */ void adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor*, JStudio::TControl*, + u32, void const*, u32); + /* 80286648 */ void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*, + u32, void const*, u32); + + /* 0x4 */ TObject* pObject_; + /* 0x8 */ TVariableValue* pValue_; + /* 0xC */ u32 u; +}; + +struct TAdaptor_actor : public TAdaptor { + /* 802868B0 */ virtual ~TAdaptor_actor() = 0; + + /* 0x10 */ TVariableValue mValue[14]; + + static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; + static u8 const sauVariableValue_3_ROTATION_XYZ[12]; + static u8 const sauVariableValue_3_SCALING_XYZ[12]; +}; // Size: 0x128 + +struct TObject_actor : public TObject { + /* 80286910 */ TObject_actor(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_actor*); + + /* 802881A4 */ virtual ~TObject_actor(); + /* 8028694C */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_ambientLight : public TAdaptor { + /* 80286C9C */ virtual ~TAdaptor_ambientLight() = 0; + + /* 0x10 */ TVariableValue mValue[4]; + + static u8 const sauVariableValue_3_COLOR_RGB[12]; + static u8 const sauVariableValue_4_COLOR_RGBA[16]; +}; + +struct TObject_ambientLight : public TObject { + /* 80286CFC */ TObject_ambientLight(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_ambientLight*); + + /* 80288144 */ virtual ~TObject_ambientLight(); + /* 80286D38 */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_camera : public TAdaptor { + /* 80286E1C */ virtual ~TAdaptor_camera() = 0; + + /* 0x10 */ TVariableValue mValue[12]; + + static u8 const sauVariableValue_3_POSITION_XYZ[12]; + static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; + static u8 sauVariableValue_2_DISTANCE_NEAR_FAR[8]; +}; + +struct TObject_camera : public TObject { + /* 80286E7C */ TObject_camera(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_camera*); + + /* 802880E4 */ virtual ~TObject_camera(); + /* 80286EB8 */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_fog : public TAdaptor { + /* 8028717C */ virtual ~TAdaptor_fog() = 0; + + /* 0x10 */ TVariableValue mValue[6]; + + static u8 const sauVariableValue_3_COLOR_RGB[12]; + static u8 const sauVariableValue_4_COLOR_RGBA[16]; + static u8 sauVariableValue_2_RANGE_BEGIN_END[8]; +}; + +struct TObject_fog : public TObject { + /* 802871DC */ TObject_fog(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_fog*); + + /* 80288084 */ virtual ~TObject_fog(); + /* 80287218 */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_light : public TAdaptor { + /* 80287308 */ virtual ~TAdaptor_light() = 0; + + /* 0x10 */ TVariableValue mValue[13]; + + static u8 const sauVariableValue_3_COLOR_RGB[12]; + static u8 const sauVariableValue_4_COLOR_RGBA[16]; + static u8 const sauVariableValue_3_POSITION_XYZ[12]; + static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; + static u8 sauVariableValue_2_DIRECTION_THETA_PHI[8]; +}; + +struct TObject_light : public TObject { + /* 80287368 */ TObject_light(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_light*); + + /* 80288024 */ virtual ~TObject_light(); + /* 802873A4 */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_message : public TAdaptor { + /* 802875E0 */ virtual ~TAdaptor_message() = 0; +}; + +struct TObject_message : public TObject { + /* 80287640 */ TObject_message(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_message*); + + /* 80287FC4 */ virtual ~TObject_message(); + /* 8028767C */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_particle : public TAdaptor { + /* 8028770C */ virtual ~TAdaptor_particle() = 0; + + /* 0x10 */ TVariableValue mValue[20]; + + static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; + static u8 const sauVariableValue_3_ROTATION_XYZ[12]; + static u8 const sauVariableValue_3_SCALING_XYZ[12]; + static u8 const sauVariableValue_3_COLOR_RGB[12]; + static u8 const sauVariableValue_4_COLOR_RGBA[16]; + static u8 const sauVariableValue_3_COLOR1_RGB[12]; + static u8 const sauVariableValue_4_COLOR1_RGBA[16]; +}; + +struct TObject_particle : public TObject { + /* 8028776C */ TObject_particle(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_particle*); + + /* 80287F64 */ virtual ~TObject_particle(); + /* 802877A8 */ virtual void do_paragraph(u32, void const*, u32); +}; + +struct TAdaptor_sound : public TAdaptor { + /* 80287B3C */ virtual ~TAdaptor_sound() = 0; + + /* 0x10 */ TVariableValue mValue[13]; + + static u8 const sauVariableValue_3_POSITION_XYZ[12]; +}; // Size: 0x114 + +struct TObject_sound : public TObject { + /* 80287B9C */ TObject_sound(JStudio::stb::data::TParse_TBlock_object const&, + JStudio::TAdaptor_sound*); + + /* 80287F04 */ virtual ~TObject_sound(); + /* 80287BD8 */ virtual void do_paragraph(u32, void const*, u32); +}; + +}; // namespace JStudio #endif /* JSTUDIO_OBJECT_H */ diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/include/JSystem/JStudio/JStudio/object-id.h index 28864fc5dcc..7a536762a42 100644 --- a/include/JSystem/JStudio/JStudio/object-id.h +++ b/include/JSystem/JStudio/JStudio/object-id.h @@ -15,8 +15,8 @@ public: /* 80288988 */ void isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&); private: - const void* mID; - u32 mID_size; + /* 0x00 */ const void* mID; + /* 0x04 */ u32 mID_size; }; struct TObject_ID : public TIDData { diff --git a/include/JSystem/JStudio/JStudio/stb-data.h b/include/JSystem/JStudio/JStudio/stb-data.h index fde46c96def..178154d70cc 100644 --- a/include/JSystem/JStudio/JStudio/stb-data.h +++ b/include/JSystem/JStudio/JStudio/stb-data.h @@ -21,8 +21,8 @@ const int BLOCK_NONE = -1; // Used to expand a signed 24 int to a signed 32 int const u32 gu32Mask_TSequence_value_signExpansion = 0xFF000000; -extern const u32 ga4cSignature; // 'STB/0' -extern const u8 gauDataSize_TEParagraph_data[32]; +extern u32 ga4cSignature; // 'STB/0' +extern const s32 gauDataSize_TEParagraph_data[8]; inline void toString_block(char* a5c, u32 arg1) { // from debug, todo diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index e4e0188cc62..e54ddb4b838 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -107,6 +107,8 @@ private: class TFactory { public: + TFactory() {} + /* 802895B4 */ virtual ~TFactory(); /* 802895FC */ virtual TObject* create(data::TParse_TBlock_object const&); /* 80289604 */ virtual void destroy(TObject*); @@ -130,13 +132,15 @@ public: /* 80289300 */ void destroyObject_all(); /* 80289364 */ TObject* getObject(void const*, u32); /* 80289404 */ void reset(); - /* 802894B4 */ void forward(u32); + /* 802894B4 */ u8 forward(u32); void setStatus_(u32 status) { mStatus = status; } void resetStatus_() { setStatus_(0); } bool isSuspended() const { return _54 > 0; } TFactory* getFactory() const { return pFactory; } TObject_control& referObject_control() { return mObject_control; } + int getSuspend() const { return _54; } + void setSuspend(s32 suspend) { mObject_control.setSuspend(suspend); } private: /* 0x04 */ u32 _4; @@ -145,7 +149,7 @@ private: /* 0x10 */ JGadget::TLinkList mObjectContainer; /* 0x1C */ u32 mStatus; /* 0x20 */ TObject_control mObject_control; - /* 0x54 */ s32 _54; // "second per frame"? + /* 0x54 */ s32 _54; }; } // namespace stb diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h index 17c271167cc..439ac2de194 100644 --- a/include/JSystem/JStudio/JStudio_JAudio2/control.h +++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h @@ -1,6 +1,81 @@ -#ifndef CONTROL_H -#define CONTROL_H +#ifndef JSTUDIO_JAUDIO2_CONTROL_H +#define JSTUDIO_JAUDIO2_CONTROL_H #include "dolphin/types.h" +#include "JSystem/JAudio2/JAISoundHandles.h" +#include "JSystem/JAudio2/JAISoundStarter.h" +#include "JSystem/JStage/JSGSystem.h" +#include "JSystem/JStudio/JStudio/jstudio-object.h" -#endif /* CONTROL_H */ +namespace JStudio_JAudio2 { +struct TCreateObject : public JStudio::TCreateObject { + TCreateObject(JAISoundStarter* p_soundStarter, const JStage::TSystem* p_system) { + pJAISoundStarter_ = p_soundStarter; + pJSGSystem_ = p_system; + mPermit_onExit_notEnd = false; + } + + /* 8028D550 */ virtual ~TCreateObject(); + /* 8028D5B0 */ virtual void create(JStudio::TObject**, + JStudio::stb::data::TParse_TBlock_object const&); + /* 8028D624 */ void createObject_JAI_SOUND_(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JAudio2::TCreateObject*); + + /* 0x0C */ JAISoundStarter* pJAISoundStarter_; + /* 0x10 */ const JStage::TSystem* pJSGSystem_; + /* 0x14 */ bool mPermit_onExit_notEnd; +}; + +struct TAdaptor_sound : public JStudio::TAdaptor_sound { + struct TVVOSetValue_ { + /* 8028DECC */ void operator()(f32, JStudio::TAdaptor*) const; + /* 8028E094 */ ~TVVOSetValue_(); + }; + + /* 8028D828 */ TAdaptor_sound(JStudio_JAudio2::TCreateObject*); + /* 8028DF04 */ void prepareSound_(); + /* 8028DFA4 */ void beginSound_fadeIn_(); + /* 8028E054 */ void endSound_fadeOut_(u32); + + /* 8028D8F4 */ virtual ~TAdaptor_sound(); + /* 8028D9A4 */ virtual void adaptor_do_prepare(); + /* 8028DA74 */ virtual void adaptor_do_end(); + /* 8028DA78 */ virtual void adaptor_do_update(u32); + /* 8028DC20 */ virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, void const*, u32); + /* 8028DC54 */ virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32); + /* 8028DC88 */ virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*, + u32); + /* 8028DCD0 */ virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32); + /* 8028DD00 */ virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*, + u32); + /* 8028DD48 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); + /* 8028DDB4 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028DE34 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028DE50 */ virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32); + /* 8028DE6C */ virtual void adaptor_do_CONTINUOUS(JStudio::data::TEOperationData, void const*, u32); + /* 8028DE88 */ virtual void adaptor_do_LOCATED(JStudio::data::TEOperationData, void const*, u32); + /* 8028DEB0 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, + u32); + + static u8 saoVVOSetValue_[72]; + + /* 0x114 */ TCreateObject* pCreateObject_; + /* 0x118 */ JAISoundHandle opJAISoundHandle_; + /* 0x11C */ u8 field_0x11c; + /* 0x11D */ u8 field_0x11d; + /* 0x11E */ u8 field_0x11e; + /* 0x11F */ u8 field_0x11f; + /* 0x120 */ u8 field_0x120; + /* 0x124 */ u32 field_0x124; + /* 0x128 */ u32 field_0x128; + /* 0x12C */ u32 field_0x12c; + /* 0x130 */ JGeometry::TVec3 field_0x130; + /* 0x13C */ u32 field_0x13c; + /* 0x140 */ u32 field_0x140; + /* 0x144 */ u8 field_0x144; +}; +}; // namespace JStudio_JAudio2 + +#endif /* JSTUDIO_JAUDIO2_CONTROL_H */ diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/include/JSystem/JStudio/JStudio_JParticle/control.h index 17c271167cc..93f628b2684 100644 --- a/include/JSystem/JStudio/JStudio_JParticle/control.h +++ b/include/JSystem/JStudio/JStudio_JParticle/control.h @@ -1,6 +1,69 @@ -#ifndef CONTROL_H -#define CONTROL_H +#ifndef JSTUDIO_JPARTICLE_CONTROL_H +#define JSTUDIO_JPARTICLE_CONTROL_H +#include "JSystem/JParticle/JPAParticle.h" +#include "JSystem/JStage/JSGSystem.h" +#include "JSystem/JStudio/JStudio/jstudio-object.h" #include "dolphin/types.h" -#endif /* CONTROL_H */ +namespace JStudio_JParticle { +struct TCreateObject : public JStudio::TCreateObject { + TCreateObject(JPAEmitterManager* p_emitMgr, const JStage::TSystem* p_system) { + pJPAEmitterManager_ = p_emitMgr; + pJSGSystem_ = p_system; + mPermit_onExit_notEnd = false; + } + + /* 8028E3A0 */ virtual ~TCreateObject(); + /* 8028E400 */ virtual void create(JStudio::TObject**, + JStudio::stb::data::TParse_TBlock_object const&); + /* 8028E474 */ virtual void emitter_create(u32); + /* 8028E4E4 */ virtual void emitter_destroy(JPABaseEmitter*); + + /* 8028E508 */ void createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&, + JStudio_JParticle::TCreateObject*); + + /* 0x0C */ JPAEmitterManager* pJPAEmitterManager_; + /* 0x10 */ const JStage::TSystem* pJSGSystem_; + /* 0x14 */ bool mPermit_onExit_notEnd; +}; + +struct TAdaptor_particle : public JStudio::TAdaptor_particle { + struct TJPACallback_emitter_ { + /* 8028E700 */ ~TJPACallback_emitter_(); + /* 8028ECC0 */ void execute(JPABaseEmitter*); + /* 8028F060 */ void executeAfter(JPABaseEmitter*); + /* 8028F098 */ void draw(JPABaseEmitter*); + /* 8028F0D0 */ void drawAfter(JPABaseEmitter*); + }; + + /* 8028E60C */ TAdaptor_particle(JStudio_JParticle::TCreateObject*); + /* 8028F108 */ void beginParticle_fadeIn_(); + /* 8028F1C0 */ void endParticle_fadeOut_(u32); + + /* 8028E760 */ virtual ~TAdaptor_particle(); + /* 8028E850 */ virtual void adaptor_do_prepare(); + /* 8028E97C */ virtual void adaptor_do_end(); + /* 8028E980 */ virtual void adaptor_do_update(u32); + /* 8028EA68 */ virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32); + /* 8028EA7C */ virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32); + /* 8028EAB0 */ virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*, + u32); + /* 8028EAF8 */ virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32); + /* 8028EB24 */ virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*, + u32); + /* 8028EB6C */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); + /* 8028EBD8 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028EC58 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028EC74 */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, + u32); + /* 8028EC88 */ virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32); + /* 8028ECA4 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, + u32); +}; + +}; // namespace JStudio_JParticle + +#endif /* JSTUDIO_JPARTICLE_CONTROL_H */ diff --git a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h b/include/JSystem/JStudio/JStudio_JParticle/object-particle.h index 948c6c6203b..c887a183ee6 100644 --- a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h +++ b/include/JSystem/JStudio/JStudio_JParticle/object-particle.h @@ -1,6 +1,6 @@ #ifndef OBJECT_PARTICLE_H #define OBJECT_PARTICLE_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JParticle/control.h" #endif /* OBJECT_PARTICLE_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 17c271167cc..0ffd4c83fa7 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -1,6 +1,174 @@ -#ifndef CONTROL_H -#define CONTROL_H +#ifndef JSTUDIO_JSTAGE_CONTROL_H +#define JSTUDIO_JSTAGE_CONTROL_H -#include "dolphin/types.h" +#include "JSystem/JStage/JSGActor.h" +#include "JSystem/JStage/JSGAmbientLight.h" +#include "JSystem/JStage/JSGCamera.h" +#include "JSystem/JStage/JSGFog.h" +#include "JSystem/JStage/JSGLight.h" +#include "JSystem/JStage/JSGSystem.h" +#include "JSystem/JStudio/JStudio/jstudio-object.h" -#endif /* CONTROL_H */ +namespace JStudio_JStage { +struct TCreateObject : public JStudio::TCreateObject { + TCreateObject(const JStage::TSystem* pSystem) { + pJSGSystem_ = pSystem; + } + + /* 80289B00 */ virtual ~TCreateObject(); + /* 80289B60 */ virtual void create(JStudio::TObject**, + JStudio::stb::data::TParse_TBlock_object const&); + + /* 0x0C */ const JStage::TSystem* pJSGSystem_; +}; + +struct TAdaptor_object_ { + /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); + /* 8028A4BC */ void adaptor_object_findJSGObject_(char const*); + /* 8028A50C */ void adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); + /* 8028A550 */ void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, u32); + + /* 0x0 */ JStudio::TAdaptor* field_0x0; + /* 0x4 */ JStage::TSystem* pJSGSystem_; + /* 0x8 */ JStage::TObject* pJSGObject_; +}; + +struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::TAdaptor_object_ { + struct TVVOutput_ANIMATION_FRAME_ { + /* 8028B064 */ void operator()(f32, JStudio::TAdaptor*) const; + /* 8028B138 */ ~TVVOutput_ANIMATION_FRAME_(); + }; + + /* 8028A5F0 */ TAdaptor_actor(JStage::TSystem const*, JStage::TActor*); + + /* 8028A6B4 */ virtual ~TAdaptor_actor(); + /* 8028A728 */ virtual void adaptor_do_prepare(); + /* 8028A7B4 */ virtual void adaptor_do_begin(); + /* 8028A8D8 */ virtual void adaptor_do_end(); + /* 8028A92C */ virtual void adaptor_do_update(u32); + /* 8028A974 */ virtual void adaptor_do_data(void const*, u32, void const*, u32); + /* 8028AAC8 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); + /* 8028AB0C */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028AB68 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028ABF0 */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, + u32); + /* 8028AC04 */ virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, void const*, u32); + /* 8028AC48 */ virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028ACA4 */ virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028A998 */ virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, void const*, u32); + /* 8028A9F0 */ virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, void const*, u32); + /* 8028AA48 */ virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028AA5C */ virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, + void const*, u32); + /* 8028AAB4 */ virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, + void const*, u32); + + /* 8028ACFC */ void setJSG_ID_(void (JStage::TActor::*)(u32), + JStudio::data::TEOperationData, void const*, u32); + /* 8028AD38 */ void setJSG_SRT_(JStudio::TControl const*); + /* 8028AECC */ void getJSG_SRT_(JStudio::TControl const*); + + static u8 saoVVOutput_[64]; + static u8 saoVVOutput_ANIMATION_FRAME_[144 + 4 /* padding */]; + + /* 0x134 */ u32 field_0x134; + /* 0x138 */ u32 field_0x138; + /* 0x13C */ u32 field_0x13c; + /* 0x140 */ u32 field_0x140; + /* 0x144 */ u32 field_0x144; + /* 0x148 */ u8 field_0x148; + /* 0x14C */ u32 field_0x14c; + /* 0x150 */ u32 field_0x150; +}; + +struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight { + /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*); + + /* 8028B6AC */ virtual ~TAdaptor_ambientLight(); + /* 8028B720 */ virtual void adaptor_do_prepare(); + /* 8028B724 */ virtual void adaptor_do_begin(); + /* 8028B7B0 */ virtual void adaptor_do_end(); + /* 8028B804 */ virtual void adaptor_do_update(u32); + /* 8028B87C */ virtual void adaptor_do_data(void const*, u32, void const*, u32); +}; + +struct TAdaptor_camera : public JStudio::TAdaptor_camera { + /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); + /* 8028B960 */ virtual ~TAdaptor_camera(); + /* 8028B9D4 */ virtual void adaptor_do_prepare(); + /* 8028BA1C */ virtual void adaptor_do_begin(); + /* 8028BAF8 */ virtual void adaptor_do_end(); + /* 8028BB4C */ virtual void adaptor_do_update(u32); + /* 8028BBAC */ virtual void adaptor_do_data(void const*, u32, void const*, u32); + /* 8028BBD0 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); + /* 8028BC14 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, u32); + /* 8028BC70 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, u32); + /* 8028BCEC */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, + u32); + /* 8028BD00 */ virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, void const*, u32); + /* 8028BD44 */ virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, void const*, + u32); + /* 8028BDA0 */ virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, + u32); + + /* 8028BDBC */ void setJSG_position_(JStudio::TControl const*); + /* 8028BEB8 */ void getJSG_position_(JStudio::TControl const*); + /* 8028BFBC */ void setJSG_targetPosition_(JStudio::TControl const*); + /* 8028C09C */ void getJSG_targetPosition_(JStudio::TControl const*); + + static u8 saoVVOutput_[160 + 4 /* padding */]; +}; + +struct TAdaptor_fog : public JStudio::TAdaptor_fog { + /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*); + /* 8028C610 */ virtual ~TAdaptor_fog(); + /* 8028C684 */ virtual void adaptor_do_prepare(); + /* 8028C6CC */ virtual void adaptor_do_begin(); + /* 8028C7B4 */ virtual void adaptor_do_end(); + /* 8028C808 */ virtual void adaptor_do_update(u32); + /* 8028C880 */ virtual void adaptor_do_data(void const*, u32, void const*, u32); + + static u8 saoVVOutput_[96 + 4 /* padding */]; +}; + +struct TAdaptor_light : public JStudio::TAdaptor_light { + struct TVVOutput_direction_ { + /* 8028D24C */ void operator()(f32, JStudio::TAdaptor*) const; + /* 8028D258 */ ~TVVOutput_direction_(); + }; + + /* 8028CB50 */ TAdaptor_light(JStage::TSystem const*, JStage::TLight*); + /* 8028CBF4 */ virtual ~TAdaptor_light(); + /* 8028CC68 */ virtual void adaptor_do_prepare(); + /* 8028CCB0 */ virtual void adaptor_do_begin(); + /* 8028CF68 */ virtual void adaptor_do_end(); + /* 8028CFBC */ virtual void adaptor_do_update(u32); + /* 8028D18C */ virtual void adaptor_do_data(void const*, u32, void const*, u32); + /* 8028D228 */ virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, void const*, u32); + /* 8028D1B0 */ virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, void const*, u32); + + static u8 saoVVOutput_direction_[72]; +}; + +/* 8028A1F8 */ void + transform_toGlobalFromLocal(f32 (*)[4], + JStudio::TControl::TTransform_translation_rotation_scaling const&, + JStage::TObject const*, u32); +/* 8028A290 */ void transform_toGlobalFromLocal(f32 (*)[4], + JStudio::TControl::TTransform_position const&, + JStage::TObject const*, u32); +/* 8028A328 */ void + transform_toLocalFromGlobal(f32 (*)[4], + JStudio::TControl::TTransform_translation_rotation_scaling const&, + JStage::TObject const*, u32); +/* 8028A3CC */ void transform_toLocalFromGlobal(f32 (*)[4], + JStudio::TControl::TTransform_position const&, + JStage::TObject const*, u32); +}; // namespace JStudio_JStage + +#endif /* JSTUDIO_JSTAGE_CONTROL_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object-actor.h b/include/JSystem/JStudio/JStudio_JStage/object-actor.h index 8933a3d7fef..09332fbfef1 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object-actor.h +++ b/include/JSystem/JStudio/JStudio_JStage/object-actor.h @@ -1,6 +1,6 @@ #ifndef OBJECT_ACTOR_H #define OBJECT_ACTOR_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_ACTOR_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h b/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h index 65211a6713a..237e598abc7 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h +++ b/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h @@ -1,6 +1,6 @@ #ifndef OBJECT_AMBIENTLIGHT_H #define OBJECT_AMBIENTLIGHT_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_AMBIENTLIGHT_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object-camera.h b/include/JSystem/JStudio/JStudio_JStage/object-camera.h index ba0337a40b4..a9fa7e8d676 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object-camera.h +++ b/include/JSystem/JStudio/JStudio_JStage/object-camera.h @@ -1,6 +1,6 @@ #ifndef OBJECT_CAMERA_H #define OBJECT_CAMERA_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_CAMERA_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object-fog.h b/include/JSystem/JStudio/JStudio_JStage/object-fog.h index 9bc0166870a..9e80d013884 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object-fog.h +++ b/include/JSystem/JStudio/JStudio_JStage/object-fog.h @@ -1,6 +1,6 @@ #ifndef OBJECT_FOG_H #define OBJECT_FOG_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_FOG_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object-light.h b/include/JSystem/JStudio/JStudio_JStage/object-light.h index 1f408f064b5..dec73e88d5f 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object-light.h +++ b/include/JSystem/JStudio/JStudio_JStage/object-light.h @@ -1,6 +1,6 @@ #ifndef OBJECT_LIGHT_H #define OBJECT_LIGHT_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_LIGHT_H */ diff --git a/include/JSystem/JStudio/JStudio_JStage/object.h b/include/JSystem/JStudio/JStudio_JStage/object.h index 9b5239f0245..4c04fdcc2a4 100644 --- a/include/JSystem/JStudio/JStudio_JStage/object.h +++ b/include/JSystem/JStudio/JStudio_JStage/object.h @@ -1,6 +1,6 @@ #ifndef OBJECT_H #define OBJECT_H -#include "dolphin/types.h" +#include "JSystem/JStudio/JStudio_JStage/control.h" #endif /* OBJECT_H */ diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index 5bb0f4f98e6..888179bab21 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -25,6 +25,12 @@ public: return val; } + s32 readS32() { + s32 val; + this->read(&val, sizeof(val)); + return val; + } + s16 readS16() { s16 val; this->read(&val, sizeof(val)); @@ -43,6 +49,18 @@ public: return val; } + u8 read8b() { + u8 val; + this->read(&val, sizeof(val)); + return val; + } + + u16 read16b() { + u16 val; + this->read(&val, sizeof(val)); + return val; + } + // TODO: return value probably wrong /* 802DC298 */ s32 read(void*, s32); }; // Size = 0x8 diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index e18fc11bf48..8ed869395df 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -68,7 +68,7 @@ public: void setVisible(bool visible) { mVisible = visible; } void setLineAttr(int param_0, u8 param_1) { mBuf[(field_0x20 + 2) * param_0] = param_1; } - u8* getLinePtr(int param_0) const { return &mBuf[(field_0x20 + 2) * param_0 + 1]; } + u8* getLinePtr(int param_0) const { return &mBuf[(field_0x20 + 2) * param_0] + 1; } int diffIndex(int param_0, int param_1) const { int diff = param_1 - param_0; if (diff >= 0) { diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index a6d7904493a..f297f75b6b9 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -68,7 +68,7 @@ public: /* 0x0C */ virtual void setGX() = 0; /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2); /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0; - /* 0x18 */ virtual u16 getLeading() const = 0; + /* 0x18 */ virtual int getLeading() const = 0; /* 0x1C */ virtual u16 getAscent() const = 0; /* 0x20 */ virtual u16 getDescent() const = 0; /* 0x24 */ virtual s32 getHeight() const = 0; diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index f269bed4641..329ca6ff2ef 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -17,6 +17,11 @@ public: JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { this->storeTLUT(p1, p2, p3, p4, p5); } + + JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) { + storeTLUT(tlutNo, p_tlutRes); + } + /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); /* 802DE95C */ bool load(); diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 91861e6539c..3135738314b 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -11,7 +11,7 @@ public: /* 802DF48C */ virtual void setGX(); /* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor); /* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool); - /* 802DDFEC */ virtual u16 getLeading() const; + /* 802DDFEC */ virtual int getLeading() const; /* 802DE004 */ virtual u16 getAscent() const; /* 802DE010 */ virtual u16 getDescent() const; /* 802DE01C */ virtual s32 getHeight() const; diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index d2832d81d72..9dcd5cb8596 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -4,22 +4,25 @@ #include "JSystem/JUtility/JUTPalette.h" #include "dolphin/types.h" -struct ResTIMG { /* Acts as the header to image data. Usually texture data immediately follows it, - so any pointer arithmetic to go past the end of this structure is so that a - variable sized allocated buffer can be accessed. */ +/* + * Acts as the header to image data. Usually texture data immediately follows it, + * so any pointer arithmetic to go past the end of this structure is so that a + * variable sized allocated buffer can be accessed. + */ +struct ResTIMG { /* 0x00 */ u8 format; - /* 0x01 */ bool alphaEnabled; + /* 0x01 */ u8 alphaEnabled; /* 0x02 */ u16 width; /* 0x04 */ u16 height; /* 0x06 */ u8 wrapS; /* 0x07 */ u8 wrapT; - /* 0x08 */ bool palettesEnabled; + /* 0x08 */ u8 palettesEnabled; /* 0x09 */ u8 paletteFormat; /* 0x0A */ u16 paletteCount; /* 0x0C */ u32 paletteOffset; - /* 0x10 */ bool mipmapEnabled; - /* 0x11 */ bool doEdgeLOD; - /* 0x12 */ bool biasClamp; + /* 0x10 */ u8 mipmapEnabled; + /* 0x11 */ u8 doEdgeLOD; + /* 0x12 */ u8 biasClamp; /* 0x13 */ u8 maxAnisotropy; /* 0x14 */ u8 minFilter; /* 0x15 */ u8 magFilter; @@ -38,6 +41,13 @@ public: mEmbPalette = NULL; mTexInfo = NULL; } + + JUTTexture(const ResTIMG* p_timg, u8 param_1) { + mEmbPalette = NULL; + storeTIMG(p_timg, param_1); + setCaptureFlag(false); + } + ~JUTTexture(); void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); void storeTIMG(ResTIMG const*, u8); @@ -52,9 +62,10 @@ public: void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } u8 getCaptureFlag() const { return mFlags & 1; } u8 getEmbPaletteDelFlag() const { return mFlags & 2; } + u8 getTlutName() const { return mTlutName; } private: - /* 0x00 */ _GXTexObj mTexObj; + /* 0x00 */ GXTexObj mTexObj; /* 0x20 */ const ResTIMG* mTexInfo; /* 0x24 */ void* mTexData; /* 0x28 */ JUTPalette* mEmbPalette; diff --git a/include/MSL_C/math.h b/include/MSL_C/math.h index 837522fb444..eaf436dc132 100644 --- a/include/MSL_C/math.h +++ b/include/MSL_C/math.h @@ -4,6 +4,10 @@ #include "MSL_C/MSL_Common/Src/float.h" #include "dolphin/types.h" +#define M_PI 3.14159265358979323846f + +#define DEG_TO_RAD(degrees) (degrees * (M_PI / 180.0f)) + #ifdef __cplusplus extern "C" { #endif diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h index d1b2ceef598..14a03b87428 100644 --- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h +++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h @@ -15,6 +15,9 @@ public: /* 80267C94 */ virtual ~cBgS_GndChk(); + f32 GetNowY() const { return mNowY; } + void SetNowY(f32 y) { mNowY = y; } + private: /* 0x24 */ cXyz m_pos; /* 0x30 */ u32 mFlags; diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h index 984c0cd5b9a..a3b5e915bff 100644 --- a/include/SSystem/SComponent/c_bg_s_poly_info.h +++ b/include/SSystem/SComponent/c_bg_s_poly_info.h @@ -8,7 +8,7 @@ private: /* 0x00 */ u16 mPolyIndex; /* 0x02 */ u16 mBgIndex; /* 0x04 */ void* unk_0x04; - /* 0x08 */ u32 unk_0x08; + /* 0x08 */ unsigned int mActorId; public: cBgS_PolyInfo(); diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index 9837f8a2e0b..4e755a9cee3 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -17,6 +17,8 @@ public: cBgW_BgId() { Ct(); } void Ct() { m_id = 0x100; } + + u16 GetId() const { return m_id; } }; bool cBgW_CheckBGround(float a1); diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 1f1dfce7df5..5259f17acd9 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -18,6 +18,28 @@ class cCcD_AabAttr; class cCcD_CylAttr; class cCcD_SphAttr; +enum cCcD_ObjAtType { + /* 0x00000002 */ AT_TYPE_NORMAL_SWORD = (1 << 1), // wooden or ordon + /* 0x00000004 */ AT_TYPE_HORSE = (1 << 2), + /* 0x00000008 */ AT_TYPE_THROW_OBJ = (1 << 3), + /* 0x00000010 */ AT_TYPE_SHIELD_ATTACK = (1 << 4), + /* 0x00000020 */ AT_TYPE_BOMB = (1 << 5), + /* 0x00000080 */ AT_TYPE_SLINGSHOT = (1 << 7), + /* 0x00000400 */ AT_TYPE_CSTATUE_SWING = (1 << 10), + /* 0x00002000 */ AT_TYPE_ARROW = (1 << 13), + /* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14), + /* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16), + /* 0x00040000 */ AT_TYPE_SPINNER = (1 << 18), + /* 0x00100000 */ AT_TYPE_CSTATUE_BOSS_SWING = (1 << 20), + /* 0x00200000 */ AT_TYPE_HEAVY_BOOTS = (1 << 21), + /* 0x00400000 */ AT_TYPE_IRON_BALL = (1 << 22), + /* 0x00800000 */ AT_TYPE_COPY_ROD = (1 << 23), + /* 0x04000000 */ AT_TYPE_MASTER_SWORD = (1 << 26), + /* 0x08000000 */ AT_TYPE_MIDNA_LOCK = (1 << 27), + /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30), + /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31), +}; + class cCcD_ShapeAttr { public: /* 0x00 */ cM3dGAab mAab; diff --git a/include/Z2AudioLib/Z2SoundStarter.h b/include/Z2AudioLib/Z2SoundStarter.h index 18b8120fbc6..0849a4e38e6 100644 --- a/include/Z2AudioLib/Z2SoundStarter.h +++ b/include/Z2AudioLib/Z2SoundStarter.h @@ -2,12 +2,9 @@ #define Z2SOUNDSTARTER_H #include "JSystem/JAudio2/JAISound.h" +#include "JSystem/JAudio2/JAISoundStarter.h" #include "dolphin/types.h" -struct JAISoundStarter { - virtual ~JAISoundStarter(); -}; - struct Z2SoundStarter : public JAISoundStarter { Z2SoundStarter(bool); void setPortData(JAISoundHandle*, u32, u16, s8); diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index b7bc9b5bd69..16cdfbc8b97 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -19,10 +19,10 @@ #include "d/particle/d_particle.h" #include "d/particle/d_particle_copoly.h" #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "f_op/f_op_scene.h" #include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h" #include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h" -#include "f_op/f_op_scene.h" -#include "f_op/f_op_actor_mng.h" class fopEn_enemy_c; class daAlinkHIO_anm_c; @@ -90,7 +90,7 @@ public: /* 80125BF4 */ virtual void draw(); /* 800CFD58 */ virtual ~daAlink_blur_c(); -// private: + // private: /* 0x010 */ void* m_blurTex; /* 0x014 */ int field_0x14; /* 0x018 */ u8 field_0x18[4]; @@ -180,28 +180,38 @@ typedef int (daAlink_c::*daAlink_procFunc)(); class daAlink_c : public daPy_py_c { public: enum daAlink_ANM { - /* 0x13 */ ANM_DASH = 19, - /* 0x15 */ ANM_WAIT_TURN = 0x15, - /* 0x19 */ ANM_IDLE = 0x19, // name might be inaccurate - /* 0x1B */ ANM_WAIT_INIT = 0x1B, - /* 0x1D */ ANM_SIDE_STEP_LEFT = 0x1D, - /* 0x1E */ ANM_SIDE_STEP_RIGHT, - /* 0x1F */ ANM_SIDE_STEP_LEFT_LAND, - /* 0x20 */ ANM_SIDE_STEP_RIGHT_LAND, - /* 0x21 */ ANM_BACK_JUMP = 0x21, - /* 0x22 */ ANM_BACK_JUMP_LAND, - /* 0x23 */ ANM_FRONT_ROLL, - /* 0x24 */ ANM_ROLL_CRASH, - /* 0x71 */ ANM_CUT_JUMP = 0x71, - /* 0x90 */ ANM_SERVICE_WAIT = 0x90, - /* 0xB6 */ ANM_TIRED_WAIT = 0xB6, - /* 0xB7 */ ANM_TIRED_WAIT_INIT, - /* 0xBD */ ANM_FORWARD_SLIDE = 0xBD, - /* 0xBE */ ANM_BACKWARD_SLIDE, - /* 0xBF */ ANM_BACKWARD_SLIDE_LAND, - /* 0xC0 */ ANM_FORWARD_SLIDE_LAND, + /* 0x013 */ ANM_DASH = 19, + /* 0x015 */ ANM_WAIT_TURN = 0x15, + /* 0x019 */ ANM_IDLE = 0x19, // name might be inaccurate + /* 0x01B */ ANM_WAIT_INIT = 0x1B, + /* 0x01D */ ANM_SIDE_STEP_LEFT = 0x1D, + /* 0x01E */ ANM_SIDE_STEP_RIGHT, + /* 0x01F */ ANM_SIDE_STEP_LEFT_LAND, + /* 0x020 */ ANM_SIDE_STEP_RIGHT_LAND, + /* 0x021 */ ANM_BACK_JUMP = 0x21, + /* 0x022 */ ANM_BACK_JUMP_LAND, + /* 0x023 */ ANM_FRONT_ROLL, + /* 0x024 */ ANM_ROLL_CRASH, + /* 0x071 */ ANM_CUT_JUMP = 0x71, + /* 0x090 */ ANM_SERVICE_WAIT = 0x90, + /* 0x0B6 */ ANM_TIRED_WAIT = 0xB6, + /* 0x0B7 */ ANM_TIRED_WAIT_INIT, + /* 0x0BD */ ANM_FORWARD_SLIDE = 0xBD, + /* 0x0BE */ ANM_BACKWARD_SLIDE, + /* 0x0BF */ ANM_BACKWARD_SLIDE_LAND, + /* 0x0C0 */ ANM_FORWARD_SLIDE_LAND, - /* 0xFD */ ANM_TRANSFORM_WOLF = 0xFD, // verify + /* 0x0D7 */ ANM_BOARD_SPINNER = 0xD7, + + /* 0x0F2 */ ANM_SPINNER_STAND = 0xF2, + + /* 0x0F4 */ ANM_SPINNER_RIDE = 0xF4, + + /* 0x0F7 */ ANM_SPINNER_ATTACK = 0xF7, + /* 0x0F8 */ ANM_SPINNER_ATTACK_LAND, + /* 0x0F9 */ ANM_SPINNER_PUSH, + + /* 0x0FD */ ANM_TRANSFORM_WOLF = 0xFD, // verify /* 0x188 */ ANM_DUNGEON_WARP_READY_INIT = 0x188, @@ -209,7 +219,7 @@ public: /* 0x18F */ ANM_MASTER_SWORD_STICK_INIT = 0x18F, /* 0x190 */ ANM_MASTER_SWORD_STICK, /* 0x191 */ ANM_MASTER_SWORD_PULL_INIT, - /* 0x198 */ ANM_GANON_FINISH = 408, // name probably wrong, fix later + /* 0x198 */ ANM_GANON_FINISH = 408, // name probably wrong, fix later }; enum daAlink_UPPER { @@ -240,8 +250,7 @@ public: /* 0x00000100 */ MODE_UNK_100 = 0x100, /* 0x00000400 */ MODE_RIDING = 0x400, /* 0x00000800 */ MODE_UNK_800 = 0x800, - /* 0x00001000 */ MODE_UNK_1000 = - 0x1000, // affects things like anim set when controlling rod statue + /* 0x00001000 */ MODE_UNK_1000 = 0x1000, // affects things like anim set when controlling rod statue /* 0x00002000 */ MODE_UNK_2000 = 0x2000, /* 0x00004000 */ MODE_UNK_4000 = 0x4000, /* 0x00008000 */ MODE_UNK_8000 = 0x8000, @@ -634,6 +643,17 @@ public: /* 0x40 */ BTN_R = (1 << 6), }; + /** + * Moving direction calculated from an angle + */ + enum daAlink_DIR { + /* 0x0 */ DIR_FORWARD, + /* 0x1 */ DIR_BACKWARD, + /* 0x2 */ DIR_LEFT, + /* 0x3 */ DIR_RIGHT, + /* 0x4 */ DIR_NONE, + }; + class firePointEff_c { public: /* 800CFC3C */ ~firePointEff_c(); @@ -745,11 +765,11 @@ public: /* 800ACA14 */ void setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM, daAlink_c::daAlink_ANM, int, f32); /* 800ACD40 */ void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16); - /* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM); - /* 800ACFB0 */ void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM, f32); - /* 800ACFE0 */ void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM, f32, f32); - /* 800AD00C */ void setSingleAnime(daAlink_c::daAlink_ANM, f32, f32, s16, f32); - /* 800AD0F4 */ void setSingleAnimeParam(daAlink_c::daAlink_ANM, daAlinkHIO_anm_c const*); + /* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID); + /* 800ACFB0 */ void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anmID, f32); + /* 800ACFE0 */ void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anmID, f32 speed, f32 morf); + /* 800AD00C */ void setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF, f32 morf); + /* 800AD0F4 */ void setSingleAnimeParam(daAlink_c::daAlink_ANM anmID, daAlinkHIO_anm_c const*); /* 800AD128 */ void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*); /* 800AD170 */ void allAnimePlay(); /* 800AD2D8 */ void setUpperAnimeMorf(f32); @@ -819,7 +839,7 @@ public: /* 800B32B0 */ BOOL checkAtnWaitAnime(); /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*); /* 800B33E4 */ void checkRestHPAnime(); - /* 800B3494 */ void getDirectionFromAngle(s16); + /* 800B3494 */ static int getDirectionFromAngle(s16 angle); /* 800B3500 */ void checkAttentionState(); /* 800B3630 */ void getShapeAngleYAtnActor(); /* 800B3734 */ void setShapeAngleToAtnActor(int); @@ -959,42 +979,42 @@ public: /* 800C2DA4 */ BOOL commonProcInitNotSameProc(daAlink_PROC); /* 800C2DDC */ void procPreActionUnequipInit(int, fopAc_ac_c*); /* 800C2EAC */ void procPreActionUnequip(); - /* 800C3098 */ bool procServiceWaitInit(); - /* 800C30F0 */ bool procServiceWait(); + /* 800C3098 */ int procServiceWaitInit(); + /* 800C30F0 */ int procServiceWait(); /* 800C3224 */ void procTiredWaitInit(); - /* 800C3338 */ bool procTiredWait(); - /* 800C33B8 */ bool procWaitInit(); + /* 800C3338 */ int procTiredWait(); + /* 800C33B8 */ int procWaitInit(); /* 800C3504 */ void procWait(); - /* 800C36CC */ bool procMoveInit(); - /* 800C3730 */ bool procMove(); - /* 800C3810 */ bool procAtnMoveInit(); - /* 800C3868 */ bool procAtnMove(); - /* 800C38CC */ bool procAtnActorWaitInit(); - /* 800C397C */ bool procAtnActorWait(); - /* 800C39EC */ bool procAtnActorMoveInit(); - /* 800C3A44 */ bool procAtnActorMove(); - /* 800C3A94 */ bool procWaitTurnInit(); - /* 800C3B1C */ BOOL procWaitTurn(); - /* 800C3C3C */ bool procMoveTurnInit(int); - /* 800C3D38 */ bool procMoveTurn(); - /* 800C3DA0 */ bool procSideStepInit(int); - /* 800C3F60 */ bool procSideStep(); - /* 800C40F0 */ bool procSideStepLandInit(); - /* 800C4278 */ bool procSideStepLand(); - /* 800C4378 */ bool procSlideInit(s16); + /* 800C36CC */ int procMoveInit(); + /* 800C3730 */ int procMove(); + /* 800C3810 */ int procAtnMoveInit(); + /* 800C3868 */ int procAtnMove(); + /* 800C38CC */ int procAtnActorWaitInit(); + /* 800C397C */ int procAtnActorWait(); + /* 800C39EC */ int procAtnActorMoveInit(); + /* 800C3A44 */ int procAtnActorMove(); + /* 800C3A94 */ int procWaitTurnInit(); + /* 800C3B1C */ int procWaitTurn(); + /* 800C3C3C */ int procMoveTurnInit(int); + /* 800C3D38 */ int procMoveTurn(); + /* 800C3DA0 */ int procSideStepInit(int); + /* 800C3F60 */ int procSideStep(); + /* 800C40F0 */ int procSideStepLandInit(); + /* 800C4278 */ int procSideStepLand(); + /* 800C4378 */ int procSlideInit(s16); /* 800C4514 */ void procSlide(); - /* 800C47AC */ bool procSlideLandInit(int); - /* 800C4894 */ bool procSlideLand(); - /* 800C494C */ bool procFrontRollInit(); + /* 800C47AC */ int procSlideLandInit(int); + /* 800C4894 */ int procSlideLand(); + /* 800C494C */ int procFrontRollInit(); /* 800C4B40 */ void procFrontRoll(); /* 800C4F14 */ void procFrontRollCrashInit(); /* 800C4FFC */ void procFrontRollCrash(); /* 800C5160 */ void procFrontRollSuccessInit(); /* 800C5240 */ void procFrontRollSuccess(); - /* 800C5328 */ bool procSideRollInit(int); + /* 800C5328 */ int procSideRollInit(int); /* 800C5484 */ void procSideRoll(); /* 800C5700 */ void backJumpSpeedDec(); - /* 800C57A4 */ bool procBackJumpInit(int); + /* 800C57A4 */ int procBackJumpInit(int); /* 800C5964 */ void procBackJump(); /* 800C5A54 */ void procBackJumpLandInit(int); /* 800C5AF0 */ void procBackJumpLand(); @@ -1006,21 +1026,21 @@ public: /* 800C6798 */ void procDiveJump(); /* 800C6850 */ void procRollJumpInit(); /* 800C692C */ void procRollJump(); - /* 800C6A48 */ bool procFallInit(int, f32); + /* 800C6A48 */ int procFallInit(int, f32); /* 800C6D20 */ void procFall(); /* 800C6F18 */ void procLandInit(f32); /* 800C6FE4 */ void procLand(); - /* 800C70F8 */ void procSmallJumpInit(int); + /* 800C70F8 */ int procSmallJumpInit(int); /* 800C72D4 */ void procSmallJump(); /* 800C74D4 */ void procStepMoveInit(); /* 800C755C */ void procStepMove(); /* 800C7690 */ void procCrouchInit(); /* 800C76F8 */ void procCrouch(); - /* 800C77F4 */ bool procCoMetamorphoseInit(); + /* 800C77F4 */ int procCoMetamorphoseInit(); /* 800C7C64 */ void procCoMetamorphose(); /* 800C82E8 */ void procCoMetamorphoseOnlyInit(); /* 800C83A0 */ void procCoMetamorphoseOnly(); - /* 800C8460 */ BOOL procFloorDownReboundInit(); + /* 800C8460 */ int procFloorDownReboundInit(); /* 800C84D0 */ void procFloorDownRebound(); /* 800C854C */ void procGoronRideWaitInit(fopAc_ac_c*); /* 800C85D8 */ void procGoronRideWait(); @@ -1843,23 +1863,23 @@ public: /* 8010D38C */ void procHookshotWallWait(); /* 8010D5F4 */ void procHookshotWallShootInit(); /* 8010D6CC */ void procHookshotWallShoot(); - /* 8010D93C */ void getSpinnerGravity() const; - /* 8010D94C */ void getSpinnerMaxFallSpeed() const; - /* 8010D95C */ void getSpinnerJumpRate() const; - /* 8010D96C */ void getSpinnerRideMoveTime(); - /* 8010D9B0 */ void getSpinnerRideSpeedF(); - /* 8010D9F4 */ void getSpinnerRideDecSpeedMax() const; - /* 8010DA04 */ void getSpinnerRideDecSpeedMin() const; - /* 8010DA14 */ void getSpinnerRideDecSpeedRate() const; - /* 8010DA24 */ void getSpinnerRideRotAngleMax() const; - /* 8010DA34 */ void getSpinnerRideRotAngleMin() const; - /* 8010DAFC */ void checkLv4BossRoom(); + /* 8010D93C */ f32 getSpinnerGravity() const; + /* 8010D94C */ f32 getSpinnerMaxFallSpeed() const; + /* 8010D95C */ f32 getSpinnerJumpRate() const; + /* 8010D96C */ s16 getSpinnerRideMoveTime(); + /* 8010D9B0 */ f32 getSpinnerRideSpeedF(); + /* 8010D9F4 */ f32 getSpinnerRideDecSpeedMax() const; + /* 8010DA04 */ f32 getSpinnerRideDecSpeedMin() const; + /* 8010DA14 */ f32 getSpinnerRideDecSpeedRate() const; + /* 8010DA24 */ s16 getSpinnerRideRotAngleMax() const; + /* 8010DA34 */ s16 getSpinnerRideRotAngleMin() const; + /* 8010DAFC */ bool checkLv4BossRoom(); /* 8010DBC8 */ void setSpinnerSyncPos(); - /* 8010DC64 */ void procSpinnerReadyInit(); - /* 8010DDCC */ void procSpinnerReady(); + /* 8010DC64 */ int procSpinnerReadyInit(); + /* 8010DDCC */ int procSpinnerReady(); /* 8010DE64 */ void setSpinnerStatus(u8, u8); - /* 8010DE78 */ void procSpinnerWaitInit(); - /* 8010DF4C */ void procSpinnerWait(); + /* 8010DE78 */ int procSpinnerWaitInit(); + /* 8010DF4C */ int procSpinnerWait(); /* 8010E48C */ void bottleModelCallBack(); /* 8010E584 */ void checkOilBottleItemNotGet(u16); /* 8010E5D8 */ void setBottleModel(u16); @@ -2132,7 +2152,7 @@ public: /* 8012987C */ void checkWolfLandAction(int); /* 80129958 */ BOOL checkMidnaUseAbility() const; /* 801299A8 */ void checkWolfUseAbility(); - /* 80129A80 */ bool checkWolfGroundSpecialMode(); + /* 80129A80 */ int checkWolfGroundSpecialMode(); /* 80129B44 */ void checkNextActionWolf(int); /* 8012A02C */ void wolfSideBgCheck(s16); /* 8012A228 */ void checkWolfAttackReverse(int); @@ -2228,7 +2248,7 @@ public: /* 80134838 */ void procWolfTagJump(); /* 80134DB8 */ void procWolfTagJumpLandInit(fopAc_ac_c*); /* 80134EBC */ void procWolfTagJumpLand(); - /* 80135160 */ bool procWolfGiantPuzzleInit(); + /* 80135160 */ int procWolfGiantPuzzleInit(); /* 801351F8 */ void procWolfGiantPuzzle(); /* 80135458 */ void setWolfHangGroundY(); /* 801354C8 */ void changeWolfHangEndProc(); @@ -2246,7 +2266,7 @@ public: /* 80136C18 */ void procWolfLandDamageInit(int); /* 80136DE4 */ void procWolfLandDamage(); /* 80136EC4 */ void setWolfScreamWaitAnime(); - /* 80136F54 */ bool procWolfScreamWaitInit(); + /* 80136F54 */ int procWolfScreamWaitInit(); /* 80136FF8 */ void procWolfScreamWait(); /* 801370E4 */ void getWolfLieMoveAnmSpeed(); /* 8013712C */ void getWolfLieMoveSpeed(); @@ -2326,7 +2346,7 @@ public: /* 8013D86C */ void procWolfGrabThrow(); /* 8013D930 */ void procWolfPushInit(); /* 8013DA8C */ void procWolfPush(); - /* 8013DB6C */ bool procWolfCargoCarryInit(); + /* 8013DB6C */ int procWolfCargoCarryInit(); /* 8013DC5C */ void procWolfCargoCarry(); /* 8013DDF8 */ void procWolfChainUpInit(); /* 8013DE70 */ void procWolfChainUp(); @@ -2347,9 +2367,9 @@ public: /* 8013FF90 */ void setShieldArcName(); /* 8013FFD8 */ void setOriginalHeap(JKRExpHeap**, u32); /* 80140064 */ void setShieldChange(); - /* 80140070 */ void loadModelDVD(); + /* 80140070 */ int loadModelDVD(); /* 801401F8 */ void setShieldModel(); - /* 80140274 */ void loadShieldModelDVD(); + /* 80140274 */ int loadShieldModelDVD(); /* 80140338 */ void changeModelDataDirect(int); /* 80140550 */ void changeModelDataDirectWolf(int); /* 801406A8 */ void initStatusWindow(); @@ -2546,7 +2566,7 @@ public: void onModeFlg(u32 flag) { mModeFlg |= flag; } void offModeFlg(u32 flag) { mModeFlg &= ~flag; } bool swordButton() { return itemButtonCheck(8); } - daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangActor; } + daPy_actorKeep_c* getThrowBoomerangAcKeep() { return &mThrowBoomerangAcKeep; } s32 getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; } bool checkFisingRodLure() const { return mEquipItem == 0x105; } bool doTrigger() const { return mItemTrigger & 0x10; } @@ -2575,11 +2595,12 @@ public: bool var_r5; bool var_r4 = 1; bool var_r3 = 0; - + if (mProcID == PROC_FISHING_CAST) { var_r5 = 0; - if (mItemActor.getActor() != NULL && mItemActor.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) { + if (mItemAcKeep.getActor() != NULL && + mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) { var_r5 = 1; } @@ -2602,6 +2623,12 @@ public: return var_r4; } + J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) { + return initModel(p_modelData, 0x80000, param_1); + } + + bool checkWindSpeedOnXZ() const { return field_0x35b8.abs2XZ() > 1.0f; } + inline void startRestartRoomFromOut(int, u32, int); inline u16 getReadyItem(); @@ -2690,7 +2717,16 @@ private: /* 0x00770 */ hsChainShape_c* field_0x770; /* 0x00774 */ u8 field_0x0774[0x77C - 0x774]; /* 0x0077C */ dBgS_ObjLinChk* mpHookshotLinChk; - /* 0x00780 */ u8 field_0x780[0x7C4 - 0x780]; + /* 0x00780 */ u8 field_0x780[4]; + /* 0x00784 */ J3DModel* field_0x784[2]; + /* 0x0078C */ u8 field_0x78c[0x10]; + /* 0x0079C */ u32 field_0x79c; + /* 0x007A0 */ u32 field_0x7a0; + /* 0x007A4 */ u32 field_0x7a4; + /* 0x007A8 */ u32 field_0x7a8; + /* 0x007AC */ u8 field_0x7ac[0x10]; + /* 0x007BC */ mDoExt_bckAnm* m_sWindowBck; + /* 0x007C0 */ u8 field_0x7c0[4]; /* 0x007C4 */ daPy_actorKeep_c mWolfLockAcKeep[10]; /* 0x00814 */ dCcD_Stts field_0x814; /* 0x00850 */ dCcD_Cyl field_0x850[3]; @@ -2751,15 +2787,15 @@ private: /* 0x02804 */ fopAc_ac_c* field_0x2804; /* 0x02808 */ daScex_c* mpScnChg; /* 0x0280C */ daPy_actorKeep_c field_0x280c; - /* 0x02814 */ daPy_actorKeep_c mRideActor; // daspinnerc? + /* 0x02814 */ daPy_actorKeep_c mRideAcKeep; /* 0x0281C */ daPy_actorKeep_c field_0x281c; - /* 0x02824 */ daPy_actorKeep_c mItemActor; // name might be wrong - /* 0x0282C */ daPy_actorKeep_c mGrabItemActor; - /* 0x02834 */ daPy_actorKeep_c mThrowBoomerangActor; + /* 0x02824 */ daPy_actorKeep_c mItemAcKeep; // name might be wrong + /* 0x0282C */ daPy_actorKeep_c mGrabItemAcKeep; + /* 0x02834 */ daPy_actorKeep_c mThrowBoomerangAcKeep; /* 0x0283C */ daPy_actorKeep_c mCopyRodAcKeep; /* 0x02844 */ daPy_actorKeep_c field_0x2844; /* 0x0284C */ daPy_actorKeep_c field_0x284c; - /* 0x02854 */ daPy_actorKeep_c mCargoCarryActor; + /* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep; /* 0x0285C */ daPy_actorKeep_c field_0x285c; /* 0x02864 */ dMsgFlow_c mMsgFlow; /* 0x028B0 */ int field_0x28b0[0x10]; @@ -2878,7 +2914,7 @@ private: /* 0x02FD9 */ u8 field_0x2fd9[3]; /* 0x02FDC */ u16 mEquipItem; /* 0x02FDE */ u16 field_0x2fde; - /* 0x02FE0 */ u16 field_0x2fe0; + /* 0x02FE0 */ s16 mStickAngle; /* 0x02FE2 */ s16 field_0x2fe2; /* 0x02FE4 */ s16 field_0x2fe4; /* 0x02FE6 */ s16 field_0x2fe6; @@ -3228,10 +3264,10 @@ private: }; // Size: 0x38BC struct daAlinkHIO_anm_c { - /* 0x00 */ s16 field_0x00; // end f? - /* 0x04 */ f32 field_0x04; // speed? - /* 0x08 */ f32 field_0x08; // start? - /* 0x0C */ f32 field_0x0c; // interpolation? + /* 0x00 */ s16 mEndF; + /* 0x04 */ f32 mRate; + /* 0x08 */ f32 mStart; + /* 0x0C */ f32 mInterpolation; // morf /* 0x10 */ f32 field_0x10; // CF? }; // size = 0x14 @@ -3264,6 +3300,22 @@ struct daAlinkHIO_basic_c1 { /* 0x54 */ f32 mTransformBlockFarDis; }; +class daAlinkHIO_wolf_c { +public: + /* 80140B98 */ ~daAlinkHIO_wolf_c(); +}; + +class daAlinkHIO_cut_c { +public: + /* 80140BD4 */ ~daAlinkHIO_cut_c(); +}; + +class daAlinkHIO_c { +public: + /* 80140B88 */ daAlinkHIO_c(); + /* 80140C10 */ ~daAlinkHIO_c(); +}; + class daAlinkHIO_basic_c0 { public: static daAlinkHIO_basic_c1 const m; @@ -3286,37 +3338,37 @@ public: class daAlinkHIO_autoJump_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c mJump; - /* 0x14 */ daAlinkHIO_anm_c mLand; - /* 0x28 */ daAlinkHIO_anm_c mDive; - /* 0x3C */ daAlinkHIO_anm_c mDiveUnk; - /* 0x50 */ u8 field_0x50; - /* 0x52 */ s16 field_0x52; - /* 0x54 */ s16 field_0x54; - /* 0x56 */ s16 field_0x56; - /* 0x58 */ s16 field_0x58; - /* 0x5C */ f32 field_0x5c; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6c; - /* 0x70 */ f32 field_0x70; + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ daAlinkHIO_anm_c mDiveAnm; + /* 0x3C */ daAlinkHIO_anm_c mDiveUnkAnm; + /* 0x50 */ bool mAlwaysMaxSpeedJump; + /* 0x52 */ s16 mJumpAngle; + /* 0x54 */ s16 mSpinJumpRotateSpeed; + /* 0x56 */ s16 mSpinJumpLandStopTime; + /* 0x58 */ s16 mCuccoJumpAngle; + /* 0x5C */ f32 mJumpSpeedLimit; + /* 0x60 */ f32 mMinJumpSpeed; + /* 0x64 */ f32 mJumpSpeedRate; + /* 0x68 */ f32 mAirborneInterpolation; + /* 0x6C */ f32 mJumpFallInterpolation; + /* 0x70 */ f32 mFallInterpolation; /* 0x74 */ f32 mGravity; /* 0x78 */ f32 mMaxFallSpeed; - /* 0x7C */ f32 field_0x7c; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; - /* 0x8C */ f32 field_0x8c; - /* 0x90 */ f32 field_0x90; - /* 0x94 */ f32 field_0x94; - /* 0x98 */ f32 field_0x98; - /* 0x9C */ f32 field_0x9c; - /* 0xA0 */ f32 field_0xa0; - /* 0xA4 */ f32 field_0xa4; - /* 0xA8 */ f32 field_0xa8; - /* 0xAC */ f32 field_0xac; - /* 0xB0 */ f32 field_0xb0; + /* 0x7C */ f32 mMaxJumpSpeed; + /* 0x80 */ f32 mSpinJumpInterpolation; + /* 0x84 */ f32 mSpinJumpFallInterpolation; + /* 0x88 */ f32 mSpinJumpAddSpeed; + /* 0x8C */ f32 mSpinJumpAccel; + /* 0x90 */ f32 mHangHeightLimit; + /* 0x94 */ f32 mGrabHeightLimit; + /* 0x98 */ f32 mOoccooJumpMaxSpeed; + /* 0x9C */ f32 mDiveSpeedV; + /* 0xA0 */ f32 mDiveSpeedH; + /* 0xA4 */ f32 mDiveGravity; + /* 0xA8 */ f32 mCuccoJumpMaxSpeed; + /* 0xAC */ f32 mCuccoFallMaxSpeed; + /* 0xB0 */ f32 mCuccoStartSpeed; }; // size = 0xB4 class daAlinkHIO_autoJump_c0 { @@ -3324,6 +3376,21 @@ public: static daAlinkHIO_autoJump_c1 const m; }; +class daAlinkHIO_smallJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSmallJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mStepClimbAnm; + /* 0x28 */ daAlinkHIO_anm_c mStepLandAnm; + /* 0x3C */ f32 mSpeedH; + /* 0x40 */ f32 mTargetHeightOffset; + /* 0x44 */ f32 mFallInterpolation; +}; // Size: 0x48 + +class daAlinkHIO_smallJump_c0 { +public: + static daAlinkHIO_smallJump_c1 const m; +}; + class daAlinkHIO_cut_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; @@ -3401,6 +3468,450 @@ public: static daAlinkHIO_cutLargeJump_c1 const m; }; +class daAlinkHIO_cutNmV_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_cutNmV_c0 { +public: + static daAlinkHIO_cutNmV_c1 const m; +}; + +class daAlinkHIO_cutNmL_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_cutNmL_c0 { +public: + static daAlinkHIO_cutNmL_c1 const m; +}; + +class daAlinkHIO_cutNmR_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_cutNmR_c0 { +public: + static daAlinkHIO_cutNmR_c1 const m; +}; + +class daAlinkHIO_cutNmSL_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_cutNmSL_c0 { +public: + static daAlinkHIO_cutNmSL_c1 const m; +}; + +class daAlinkHIO_cutNmSR_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_cutNmSR_c0 { +public: + static daAlinkHIO_cutNmSR_c1 const m; +}; + +class daAlinkHIO_cutFnL_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnL_c0 { +public: + static daAlinkHIO_cutFnL_c1 const m; +}; + +class daAlinkHIO_cutFnV_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnV_c0 { +public: + static daAlinkHIO_cutFnV_c1 const m; +}; + +class daAlinkHIO_cutFnS_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnS_c0 { +public: + static daAlinkHIO_cutFnS_c1 const m; +}; + +class daAlinkHIO_cutFnSl_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnSl_c0 { +public: + static daAlinkHIO_cutFnSl_c1 const m; +}; + +class daAlinkHIO_cutFnSm_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnSm_c0 { +public: + static daAlinkHIO_cutFnSm_c1 const m; +}; + +class daAlinkHIO_cutFnR_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; +}; // Size: 0x2C + +class daAlinkHIO_cutFnR_c0 { +public: + static daAlinkHIO_cutFnR_c1 const m; +}; + +class daAlinkHIO_cutFnJU_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; +}; // Size: 0x54 + +class daAlinkHIO_cutFnJU_c0 { +public: + static daAlinkHIO_cutFnJU_c1 const m; +}; + +class daAlinkHIO_cutTurn_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8C; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; +}; // Size: 0x98 + +class daAlinkHIO_cutTurn_c0 { +public: + static daAlinkHIO_cutTurn_c1 const m; +}; + +class daAlinkHIO_hoCutLA_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_hoCutLA_c0 { +public: + static daAlinkHIO_hoCutLA_c1 const m; +}; + +class daAlinkHIO_hoCutLB_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_hoCutLB_c0 { +public: + static daAlinkHIO_hoCutLB_c1 const m; +}; + +class daAlinkHIO_hoCutRA_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_hoCutRA_c0 { +public: + static daAlinkHIO_hoCutRA_c1 const m; +}; + +class daAlinkHIO_hoCutRB_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; +}; // Size: 0x20 + +class daAlinkHIO_hoCutRB_c0 { +public: + static daAlinkHIO_hoCutRB_c1 const m; +}; + +class daAlinkHIO_hoCutCharge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ s16 field_0x3C; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; +}; // Size: 0x54 + +class daAlinkHIO_hoCutCharge_c0 { +public: + static daAlinkHIO_hoCutCharge_c1 const m; +}; + +class daAlinkHIO_cutDaL_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_cutDaL_c0 { +public: + static daAlinkHIO_cutDaL_c1 const m; +}; + +class daAlinkHIO_cutDaR_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_cutDaR_c0 { +public: + static daAlinkHIO_cutDaR_c1 const m; +}; + +class daAlinkHIO_cutDaCharge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_cutDaCharge_c0 { +public: + static daAlinkHIO_cutDaCharge_c1 const m; +}; + +class daAlinkHIO_cutDown_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ s16 field_0x64; + /* 0x66 */ s16 field_0x66; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; +}; // Size: 0x74 + +class daAlinkHIO_cutDown_c0 { +public: + static daAlinkHIO_cutDown_c1 const m; +}; + +class daAlinkHIO_cutHead_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; +}; // Size: 0x60 + +class daAlinkHIO_cutHead_c0 { +public: + static daAlinkHIO_cutHead_c1 const m; +}; + +class daAlinkHIO_gAtPush_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; +}; // Size: 0x24 + +class daAlinkHIO_gAtPush_c0 { +public: + static daAlinkHIO_gAtPush_c1 const m; +}; + +class daAlinkHIO_gAtKick_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; +}; // Size: 0x24 + +class daAlinkHIO_gAtKick_c0 { +public: + static daAlinkHIO_gAtKick_c1 const m; +}; + +class daAlinkHIO_guard_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ s16 field_0x52; + /* 0x54 */ s16 field_0x54; + /* 0x56 */ s16 field_0x56; + /* 0x58 */ s16 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; +}; // Size: 0x80 + +class daAlinkHIO_guard_c0 { +public: + static daAlinkHIO_guard_c1 const m; +}; + +class daAlinkHIO_crouch_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ s16 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; +}; // Size: 0x4C + +class daAlinkHIO_crouch_c0 { +public: + static daAlinkHIO_crouch_c1 const m; +}; + class daAlinkHIO_move_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mSlideAnm; @@ -3479,6 +3990,37 @@ public: static daAlinkHIO_atnMove_c1 const m; }; +class daAlinkHIO_noActAtnMove_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; +}; // Size: 0x54 + +class daAlinkHIO_noActAtnMove_c0 { +public: + static daAlinkHIO_noActAtnMove_c1 const m; +}; + class daAlinkHIO_wallMove_c1 { public: /* 0x00 */ f32 mMinAnmSpeed; @@ -3493,6 +4035,73 @@ public: static daAlinkHIO_wallMove_c1 const m; }; +class daAlinkHIO_wallCatch_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ f32 field_0x50; +}; // Size: 0x54 + +class daAlinkHIO_wallFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; +}; // Size: 0x28 + +class daAlinkHIO_wallFall_c0 { +public: + static daAlinkHIO_wallFall_c1 const m; +}; + +class daAlinkHIO_wallCatch_c0 { +public: + static daAlinkHIO_wallCatch_c1 const m; +}; + +class daAlinkHIO_wallHang_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_wallHang_c0 { +public: + static daAlinkHIO_wallHang_c1 const m; +}; + +class daAlinkHIO_roofHang_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ s16 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; +}; // Size: 0x4C + +class daAlinkHIO_roofHang_c0 { +public: + static daAlinkHIO_roofHang_c1 const m; +}; + class daAlinkHIO_turnMove_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mTurnAnm; @@ -3574,8 +4183,8 @@ public: /* 0x56 */ s16 mUnderwaterTurnRate; /* 0x58 */ s16 mUnderwaterTurnMin; /* 0x5A */ s16 mUnderwaterTurnMax; - /* 0x5C */ s16 val1a; // related to dash - /* 0x5E */ s16 val1a_; // related to dash + /* 0x5C */ s16 field_0x5c; // related to dash + /* 0x5E */ s16 field_0x5e; // related to dash /* 0x60 */ f32 mInitHeight; /* 0x64 */ f32 mResurfaceHeight; /* 0x68 */ f32 mMaxForwardSpeed; @@ -3651,6 +4260,57 @@ public: static daAlinkHIO_ladder_c1 const m; }; +class daAlinkHIO_pushpull_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ s16 field_0xC; + /* 0x0E */ s16 field_0xE; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; +}; // Size: 0x3C + +class daAlinkHIO_pushpull_c0 { +public: + static daAlinkHIO_pushpull_c1 const m; +}; + +class daAlinkHIO_grab_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x8C */ daAlinkHIO_anm_c field_0x8C; + /* 0xA0 */ daAlinkHIO_anm_c field_0xA0; + /* 0xB4 */ daAlinkHIO_anm_c field_0xB4; + /* 0xC8 */ daAlinkHIO_anm_c field_0xC8; + /* 0xDC */ s16 field_0xDC; + /* 0xDE */ s16 field_0xDE; + /* 0xE0 */ f32 field_0xE0; +}; // Size: 0xE4 + +class daAlinkHIO_grab_c0 { +public: + static daAlinkHIO_grab_c1 const m; +}; + class daAlinkHIO_horse_c1 { public: /* 0x00 */ daAlinkHIO_anm_c field_0x0; @@ -3674,6 +4334,241 @@ public: static daAlinkHIO_horse_c1 const m; }; +class daAlinkHIO_canoe_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; +}; // Size: 0x48 + +class daAlinkHIO_canoe_c0 { +public: + static daAlinkHIO_canoe_c1 const m; +}; + +class daAlinkHIO_damage_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ u8 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ s16 field_0x2C; + /* 0x2E */ s16 field_0x2E; + /* 0x30 */ s16 field_0x30; + /* 0x32 */ s16 field_0x32; + /* 0x34 */ s16 field_0x34; + /* 0x36 */ s16 field_0x36; + /* 0x38 */ s16 field_0x38; + /* 0x3A */ s16 field_0x3A; + /* 0x3C */ s16 field_0x3C; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ s16 field_0x40; + /* 0x42 */ s16 field_0x42; + /* 0x44 */ s16 field_0x44; + /* 0x46 */ s16 field_0x46; + /* 0x48 */ s16 field_0x48; + /* 0x4A */ s16 field_0x4A; + /* 0x4C */ s16 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; +}; // Size: 0x58 + +class daAlinkHIO_damage_c0 { +public: + static daAlinkHIO_damage_c1 const m; +}; + +class daAlinkHIO_damNormal_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ s16 field_0x50; + /* 0x52 */ s16 field_0x52; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; +}; // Size: 0x64 + +class daAlinkHIO_damNormal_c0 { +public: + static daAlinkHIO_damNormal_c1 const m; +}; + +class daAlinkHIO_damLarge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x8C */ daAlinkHIO_anm_c field_0x8C; + /* 0xA0 */ s16 field_0xA0; + /* 0xA4 */ f32 field_0xA4; + /* 0xA8 */ f32 field_0xA8; + /* 0xAC */ f32 field_0xAC; + /* 0xB0 */ f32 field_0xB0; + /* 0xB4 */ f32 field_0xB4; + /* 0xB8 */ f32 field_0xB8; +}; // Size: 0xBC + +class daAlinkHIO_damLarge_c0 { +public: + static daAlinkHIO_damLarge_c1 const m; +}; + +class daAlinkHIO_damHuge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x8C */ daAlinkHIO_anm_c field_0x8C; + /* 0xA0 */ s16 field_0xA0; + /* 0xA4 */ f32 field_0xA4; + /* 0xA8 */ f32 field_0xA8; + /* 0xAC */ f32 field_0xAC; + /* 0xB0 */ f32 field_0xB0; + /* 0xB4 */ f32 field_0xB4; + /* 0xB8 */ f32 field_0xB8; +}; // Size: 0xBC + +class daAlinkHIO_damHuge_c0 { +public: + static daAlinkHIO_damHuge_c1 const m; +}; + +class daAlinkHIO_damHorse_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; +}; // Size: 0x2C + +class daAlinkHIO_damHorse_c0 { +public: + static daAlinkHIO_damHorse_c1 const m; +}; + +class daAlinkHIO_damFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; +}; // Size: 0x48 + +class daAlinkHIO_damFall_c0 { +public: + static daAlinkHIO_damFall_c1 const m; +}; + +class daAlinkHIO_damCaught_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; +}; // Size: 0x24 + +class daAlinkHIO_damCaught_c0 { +public: + static daAlinkHIO_damCaught_c1 const m; +}; + +class daAlinkHIO_damSwim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ s16 field_0x78; + /* 0x7A */ s16 field_0x7A; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; +}; // Size: 0x8C + +class daAlinkHIO_damSwim_c0 { +public: + static daAlinkHIO_damSwim_c1 const m; +}; + +class daAlinkHIO_huLight_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_huLight_c0 { +public: + static daAlinkHIO_huLight_c1 const m; +}; + +class daAlinkHIO_fmChain_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; +}; // Size: 0x28 + +class daAlinkHIO_fmChain_c0 { +public: + static daAlinkHIO_fmChain_c1 const m; +}; + +class daAlinkHIO_pickUp_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; +}; // Size: 0x30 + +class daAlinkHIO_pickUp_c0 { +public: + static daAlinkHIO_pickUp_c1 const m; +}; + class daAlinkHIO_wolf_c1 { public: /* 0x00 */ s16 mMaxNeckTurnH; @@ -4036,6 +4931,57 @@ public: static daAlinkHIO_wlAttack_c1 const m; }; +class daAlinkHIO_wlAtBite_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; +}; // Size: 0x5C + +class daAlinkHIO_wlAtBite_c0 { +public: + static daAlinkHIO_wlAtBite_c1 const m; +}; + +class daAlinkHIO_wlAtCjump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; +}; // Size: 0x64 + +class daAlinkHIO_wlAtCjump_c0 { +public: + static daAlinkHIO_wlAtCjump_c1 const m; +}; + class daAlinkHIO_wlHowl_c1 { public: /* 0x00 */ daAlinkHIO_anm_c field_0x0; @@ -4143,6 +5089,27 @@ public: static daAlinkHIO_wlLight_c1 const m; }; +class daAlinkHIO_wlAtDown_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ daAlinkHIO_anm_c field_0x28; + /* 0x3C */ daAlinkHIO_anm_c field_0x3C; + /* 0x50 */ daAlinkHIO_anm_c field_0x50; + /* 0x64 */ daAlinkHIO_anm_c field_0x64; + /* 0x78 */ daAlinkHIO_anm_c field_0x78; + /* 0x8C */ s16 field_0x8C; + /* 0x8E */ s16 field_0x8E; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ f32 field_0x98; +}; // Size: 0x9C + +class daAlinkHIO_wlAtDown_c0 { +public: + static daAlinkHIO_wlAtDown_c1 const m; +}; + class daAlinkHIO_wlAtWaTl_c1 { public: /* 0x00 */ daAlinkHIO_anm_c field_0x0; @@ -4392,29 +5359,29 @@ public: class daAlinkHIO_board_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ daAlinkHIO_anm_c field_0x14; - /* 0x28 */ daAlinkHIO_anm_c field_0x28; - /* 0x3C */ daAlinkHIO_anm_c field_0x3C; - /* 0x50 */ f32 field_0x50; - /* 0x54 */ f32 field_0x54; - /* 0x58 */ f32 field_0x58; - /* 0x5C */ f32 field_0x5C; - /* 0x60 */ f32 field_0x60; - /* 0x64 */ f32 field_0x64; - /* 0x68 */ f32 field_0x68; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 field_0x70; - /* 0x74 */ f32 field_0x74; - /* 0x78 */ f32 field_0x78; - /* 0x7C */ f32 field_0x7C; - /* 0x80 */ f32 field_0x80; - /* 0x84 */ f32 field_0x84; - /* 0x88 */ f32 field_0x88; - /* 0x8C */ f32 field_0x8C; - /* 0x90 */ f32 field_0x90; - /* 0x94 */ f32 field_0x94; - /* 0x98 */ f32 field_0x98; + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; // might be wrong + /* 0x14 */ daAlinkHIO_anm_c mAirborneAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ daAlinkHIO_anm_c mSpinAnm; + /* 0x50 */ f32 mMaxSpeed; + /* 0x54 */ f32 mPushAccel; + /* 0x58 */ f32 mMinJumpSpeedY; + /* 0x5C */ f32 mMaxJumpSpeedY; + /* 0x60 */ f32 mStandAnmSpeed; + /* 0x64 */ f32 mStandInterpolation; + /* 0x68 */ f32 mSitAnmSpeed; + /* 0x6C */ f32 mSitInterpolation; + /* 0x70 */ f32 mStartMinSpeed; + /* 0x74 */ f32 mStartAddSpeed; + /* 0x78 */ f32 mPushAnmMaxSpeed; + /* 0x7C */ f32 mFastPushSwitchSpeed; + /* 0x80 */ f32 mFastPushInterpolation; + /* 0x84 */ f32 mPushInterpolation; + /* 0x88 */ f32 mPushAnmMinSpeed; + /* 0x8C */ f32 mMaxPushSpeed; + /* 0x90 */ f32 mSpinMinJumpSpeedY; + /* 0x94 */ f32 mSpinMaxJumpSpeedY; + /* 0x98 */ f32 mEffectMaxSpeed; }; // Size: 0x9C class daAlinkHIO_board_c0 { @@ -4440,6 +5407,27 @@ public: static daAlinkHIO_item_c1 const m; }; +class daAlinkHIO_kandelaar_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mShakeAnm; + /* 0x14 */ daAlinkHIO_anm_c mBeginUnkAnm; + /* 0x28 */ daAlinkHIO_anm_c mEndUnkAnm; + /* 0x3C */ s16 mColorReg1R; + /* 0x3E */ s16 mColorReg1G; + /* 0x40 */ s16 mColorReg1B; + /* 0x42 */ s16 mColorReg2R; + /* 0x44 */ s16 mColorReg2G; + /* 0x46 */ s16 mColorReg2B; + /* 0x48 */ u16 mNormalOilLoss; + /* 0x4A */ u16 mShakeOilLoss; + /* 0x4C */ f32 mFlameTrackRate; +}; // Size: 0x50 + +class daAlinkHIO_kandelaar_c0 { +public: + static daAlinkHIO_kandelaar_c1 const m; +}; + class daAlinkHIO_bottle_c1 { public: /* 0x00 */ daAlinkHIO_anm_c field_0x0; @@ -4481,27 +5469,27 @@ public: class daAlinkHIO_bow_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c val0; - /* 0x14 */ daAlinkHIO_anm_c val5; - /* 0x28 */ s16 vala; - /* 0x2A */ s16 valb; - /* 0x2C */ s16 valc; - /* 0x30 */ f32 vale; - /* 0x34 */ f32 valf; - /* 0x38 */ f32 val10; - /* 0x3C */ f32 val11; - /* 0x40 */ f32 val12; - /* 0x44 */ f32 val13; - /* 0x48 */ f32 val14; - /* 0x4C */ f32 val15; - /* 0x50 */ f32 val16; - /* 0x54 */ f32 val17; - /* 0x58 */ f32 val18; - /* 0x5C */ f32 val19; - /* 0x60 */ f32 val1a; - /* 0x64 */ f32 val1b; - /* 0x68 */ f32 val1c; - /* 0x6C */ f32 val1d; + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ daAlinkHIO_anm_c field_0x14; + /* 0x28 */ s16 field_0x28; + /* 0x2A */ s16 field_0x2a; + /* 0x2C */ s16 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3c; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4c; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5c; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6c; }; // Size: 0x70 class daAlinkHIO_bow_c0 { @@ -4509,6 +5497,47 @@ public: static daAlinkHIO_bow_c1 const m; }; +class daAlinkHIO_ironBall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c field_0x0; + /* 0x14 */ s16 field_0x14; + /* 0x16 */ s16 field_0x16; + /* 0x18 */ f32 field_0x18; + /* 0x1C */ f32 field_0x1C; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ f32 field_0x38; + /* 0x3C */ f32 field_0x3C; + /* 0x40 */ f32 field_0x40; + /* 0x44 */ f32 field_0x44; + /* 0x48 */ f32 field_0x48; + /* 0x4C */ f32 field_0x4C; + /* 0x50 */ f32 field_0x50; + /* 0x54 */ f32 field_0x54; + /* 0x58 */ f32 field_0x58; + /* 0x5C */ f32 field_0x5C; + /* 0x60 */ f32 field_0x60; + /* 0x64 */ f32 field_0x64; + /* 0x68 */ f32 field_0x68; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 field_0x70; + /* 0x74 */ f32 field_0x74; + /* 0x78 */ f32 field_0x78; + /* 0x7C */ f32 field_0x7C; + /* 0x80 */ f32 field_0x80; + /* 0x84 */ f32 field_0x84; + /* 0x88 */ f32 field_0x88; +}; // Size: 0x8C + +class daAlinkHIO_ironBall_c0 { +public: + static daAlinkHIO_ironBall_c1 const m; +}; + class daAlinkHIO_copyRod_c1 { public: /* 0x00 */ daAlinkHIO_anm_c mSwingAnm; @@ -4579,20 +5608,20 @@ public: class daAlinkHIO_spinner_c1 { public: - /* 0x00 */ daAlinkHIO_anm_c field_0x0; - /* 0x14 */ s16 field_0x14; - /* 0x16 */ s16 field_0x16; - /* 0x18 */ s16 field_0x18; - /* 0x1A */ s16 field_0x1A; - /* 0x1C */ s16 field_0x1C; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 field_0x34; - /* 0x38 */ f32 field_0x38; - /* 0x3C */ f32 field_0x3C; + /* 0x00 */ daAlinkHIO_anm_c mKickAnm; + /* 0x14 */ s16 mRideMoveTime; + /* 0x16 */ s16 mBoardWaitTime; + /* 0x18 */ s16 mRideRotAngleMax; + /* 0x1A */ s16 mRideRotAngleMin; + /* 0x1C */ s16 mBossRideMoveTime; + /* 0x20 */ f32 mGravity; + /* 0x24 */ f32 mMaxFallSpeed; + /* 0x28 */ f32 mJumpRate; + /* 0x2C */ f32 mRideSpeed; + /* 0x30 */ f32 mDecelSpeedMax; + /* 0x34 */ f32 mDecelSpeedMin; + /* 0x38 */ f32 mDecelRate; + /* 0x3C */ f32 mBossRideSpeed; }; // Size: 0x40 class daAlinkHIO_spinner_c0 { diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 9043847a0fa..2effbc58a36 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -220,6 +220,7 @@ public: FLG2_UNK_2080000 = 0x2080000, BOAR_SINGLE_BATTLE = 0x1800000, STATUS_WINDOW_DRAW = 0x400000, + FLG2_UNK_280000 = 0x280000, UNK_ARMOR = 0x80000, SCENE_CHANGE_START = 0x8000, FLG2_UNK_4000 = 0x4000, @@ -243,6 +244,7 @@ public: enum daPy_ERFLG1 { GANON_FINISH = 0x80000000, UNK_FORCE_PUT_POS = 0x2000, + ERFLG1_UNK_2 = 2, ERFLG1_UNK_1 = 1, }; enum daPy_ERFLG2 { @@ -539,7 +541,7 @@ public: bool getSumouCameraMode() const { bool sumouCameraMode = false; - if (field_0x560[0xA] != 0 && field_0x560[0xA] < 0x26) { + if (mSpecialMode != 0 && mSpecialMode < 0x26) { sumouCameraMode = true; } return sumouCameraMode; @@ -568,6 +570,7 @@ public: void i_onNoResetFlg2(int pFlg) { mNoResetFlg2 |= pFlg; } void i_onNoResetFlg3(int pFlg) { mNoResetFlg3 |= pFlg; } void i_offNoResetFlg0(int pFlg) { mNoResetFlg0 &= ~pFlg; } + void i_offNoResetFlg2(int pFlg) { mNoResetFlg2 &= ~pFlg; } void i_offNoResetFlg3(int pFlg) { mNoResetFlg3 &= ~pFlg; } void i_offResetFlg0(int flag) { mResetFlg0 &= ~flag; } void i_onResetFlg0(int flag) { mResetFlg0 |= flag; } diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index deb17d3027c..f07fbc2ff5a 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -12,7 +12,7 @@ class cBgS_ChkElm { public: /* 0x00 */ dBgW_Base* m_bgw_base_ptr; /* 0x04 */ bool m_used; - /* 0x08 */ u32 field_0x8; + /* 0x08 */ u32 m_actor_id; /* 0x0C */ fopAc_ac_c* m_actor_ptr; /* 0x10 vtable */ @@ -37,7 +37,7 @@ public: public: cBgS() {} bool Regist(dBgW_Base*, unsigned int, void*); - void Release(dBgW_Base*); + int Release(dBgW_Base*); bool LineCross(cBgS_LinChk*); f32 GroundCross(cBgS_GndChk*); static void ConvDzb(void*); @@ -75,14 +75,14 @@ public: s32 GetExitId(cBgS_PolyInfo const&); s32 GetPolyColor(cBgS_PolyInfo const&); BOOL GetHorseNoEntry(cBgS_PolyInfo const&); - bool GetSpecialCode(cBgS_PolyInfo const&); + int GetSpecialCode(cBgS_PolyInfo const&); int GetMagnetCode(cBgS_PolyInfo const&); - bool GetMonkeyBarsCode(cBgS_PolyInfo const&); - bool GetUnderwaterRoofCode(cBgS_PolyInfo const&); + int GetMonkeyBarsCode(cBgS_PolyInfo const&); + int GetUnderwaterRoofCode(cBgS_PolyInfo const&); s32 GetWallCode(cBgS_PolyInfo const&); int GetPolyAtt0(cBgS_PolyInfo const&); int GetPolyAtt1(cBgS_PolyInfo const&); - bool GetGroundCode(cBgS_PolyInfo const&); + int GetGroundCode(cBgS_PolyInfo const&); s32 GetCamMoveBG(cBgS_PolyInfo const&); s32 GetRoomCamId(cBgS_PolyInfo const&); s32 GetRoomPathId(cBgS_PolyInfo const&); @@ -96,7 +96,7 @@ public: void WallCorrectSort(dBgS_Acch*); f32 RoofChk(dBgS_RoofChk*); bool SplGrpChk(dBgS_SplGrpChk*); - void SphChk(dBgS_SphChk*, void*); + bool SphChk(dBgS_SphChk*, void*); void MoveBgCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*, bool, bool); void MoveBgTransPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void MoveBgMatrixCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); diff --git a/include/d/bg/d_bg_s_acch.h b/include/d/bg/d_bg_s_acch.h index 7aec8fd20bf..0754ceb3ec8 100644 --- a/include/d/bg/d_bg_s_acch.h +++ b/include/d/bg/d_bg_s_acch.h @@ -148,6 +148,7 @@ public: void SetWtrChkMode(int mode) { m_wtr_mode = mode; } void SetGrndNone() { m_flags |= GRND_NONE; } void ClrGrndNone() { m_flags &= ~GRND_NONE; } + bool ChkMoveBGOnly() const { return m_flags & MOVE_BG_ONLY; } // inline dupe void i_ClrGroundHit() { m_flags &= ~GROUND_HIT; } diff --git a/include/d/bg/d_bg_s_roof_chk.h b/include/d/bg/d_bg_s_roof_chk.h index 0b1558fba0e..aebf24ff6c6 100644 --- a/include/d/bg/d_bg_s_roof_chk.h +++ b/include/d/bg/d_bg_s_roof_chk.h @@ -17,6 +17,7 @@ public: void SetNowY(f32 y) { mNowY = y; } void i_SetPos(cXyz const& pos) { m_pos = pos; } + f32 GetNowY() { return mNowY; } private: /* 0x3C */ cXyz m_pos; diff --git a/include/d/bg/d_bg_s_sph_chk.h b/include/d/bg/d_bg_s_sph_chk.h index 6a5225ace12..dfe60878d4c 100644 --- a/include/d/bg/d_bg_s_sph_chk.h +++ b/include/d/bg/d_bg_s_sph_chk.h @@ -15,10 +15,8 @@ typedef void* (*SphChk_Callback)(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dG class dBgS_SphChk : public cM3dGSph, public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk { public: /* 80078A14 */ dBgS_SphChk(); - /* 80078AC0 */ virtual ~dBgS_SphChk(); -private: /* 0x50 */ SphChk_Callback mCallback; }; diff --git a/include/d/bg/d_bg_s_spl_grp_chk.h b/include/d/bg/d_bg_s_spl_grp_chk.h index 76d4f0212e0..67ca7c8a387 100644 --- a/include/d/bg/d_bg_s_spl_grp_chk.h +++ b/include/d/bg/d_bg_s_spl_grp_chk.h @@ -25,6 +25,8 @@ public: void OffIn() { m_flags &= ~IN; } void OffMoveBGOnly() { m_flags &= ~MOVE_BG_ONLY; } void OnMoveBGOnly() { m_flags |= MOVE_BG_ONLY; } + void OnFind() { m_flags |= FIND; } + bool ChkMoveBGOnly() { return m_flags & MOVE_BG_ONLY; } void SetHeight(f32 height) { m_height = height; } f32 GetHeight() { return m_height; } cXyz& GetPosP() { return m_ground; } diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index d8cdabd50b6..ec015bcede5 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -87,31 +87,31 @@ public: /* 8007933C */ virtual ~cBgW(); /* 80079EEC */ virtual void ChkMemoryError(); - /* 8007B948 */ virtual void ChkNotReady() const; + /* 8007B948 */ virtual bool ChkNotReady() const; /* 8007B958 */ virtual bool ChkLock() const; /* 8007B964 */ virtual bool ChkMoveBg() const; virtual u32 ChkMoveFlag() const = 0; - /* 8007B270 */ virtual void GetTriPla(cBgS_PolyInfo const&) const; + /* 8007B270 */ virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const; /* 8007B1B4 */ virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; /* 8007B164 */ virtual void GetBnd() const; /* 8007B2B0 */ virtual u32 GetGrpInf(cBgS_PolyInfo const&) const; virtual void OffMoveFlag() = 0; /* 8007B240 */ virtual void GetTopUnder(f32*, f32*) const; /* 8007A658 */ virtual bool LineCheck(cBgS_LinChk*); - /* 8007AB9C */ virtual void GroundCross(cBgS_GndChk*); + /* 8007AB9C */ virtual bool GroundCross(cBgS_GndChk*); /* 8007B084 */ virtual void ShdwDraw(cBgS_ShdwDraw*); virtual void CaptPoly(dBgS_CaptPoly&) = 0; virtual void WallCorrect(dBgS_Acch*) = 0; virtual void WallCorrectSort(dBgS_Acch*) = 0; - virtual void RoofChk(dBgS_RoofChk*) = 0; - virtual void SplGrpChk(dBgS_SplGrpChk*) = 0; - virtual void SphChk(dBgS_SphChk*, void*) = 0; + virtual bool RoofChk(dBgS_RoofChk*) = 0; + virtual bool SplGrpChk(dBgS_SplGrpChk*) = 0; + virtual bool SphChk(dBgS_SphChk*, void*) = 0; /* 8007B0E4 */ virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const; virtual s32 GetExitId(cBgS_PolyInfo const&) = 0; virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0; virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0; - virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0; - virtual void GetSpecialCode(int) = 0; + virtual int GetSpecialCode(cBgS_PolyInfo const&) = 0; + virtual int GetSpecialCode(int) = 0; virtual int GetMagnetCode(cBgS_PolyInfo const&) = 0; virtual void GetPolyObjThrough(int) = 0; virtual void GetPolyCamThrough(int) = 0; @@ -122,12 +122,12 @@ public: virtual void GetPolyRopeThrough(int) = 0; virtual void GetPolyBombThrough(int) = 0; virtual void GetShdwThrough(int) = 0; - virtual bool GetUnderwaterRoofCode(int) = 0; - virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; + virtual int GetUnderwaterRoofCode(int) = 0; + virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0; virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0; virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0; - virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0; + virtual int GetGroundCode(cBgS_PolyInfo const&) = 0; virtual void GetIronBallThrough(int) = 0; virtual u32 GetAttackThrough(int) = 0; virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0; @@ -203,14 +203,14 @@ public: /* 8007DAF8 */ virtual void CaptPoly(dBgS_CaptPoly&); /* 8007C484 */ virtual void WallCorrect(dBgS_Acch*); /* 8007C910 */ virtual void WallCorrectSort(dBgS_Acch*); - /* 8007D470 */ virtual void RoofChk(dBgS_RoofChk*); - /* 8007D830 */ virtual void SplGrpChk(dBgS_SplGrpChk*); - /* 8007DF00 */ virtual void SphChk(dBgS_SphChk*, virtual void*); + /* 8007D470 */ virtual bool RoofChk(dBgS_RoofChk*); + /* 8007D830 */ virtual bool SplGrpChk(dBgS_SplGrpChk*); + /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, virtual void*); /* 8007B3AC */ virtual s32 GetExitId(cBgS_PolyInfo const&); /* 8007B3D8 */ virtual s32 GetPolyColor(cBgS_PolyInfo const&); /* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&); - /* 8007B430 */ virtual bool GetSpecialCode(cBgS_PolyInfo const&); - /* 8007B460 */ virtual void GetSpecialCode(int); + /* 8007B430 */ virtual int GetSpecialCode(cBgS_PolyInfo const&); + /* 8007B460 */ virtual int GetSpecialCode(int); /* 8007B488 */ virtual int GetMagnetCode(cBgS_PolyInfo const&); /* 8007B4E0 */ virtual void GetPolyObjThrough(int); /* 8007B504 */ virtual void GetPolyCamThrough(int); @@ -221,13 +221,13 @@ public: /* 8007B5BC */ virtual void GetPolyRopeThrough(int); /* 8007B5E0 */ virtual void GetPolyBombThrough(int); /* 8007B604 */ virtual void GetShdwThrough(int); - /* 8007B630 */ virtual bool GetUnderwaterRoofCode(int); - /* 8007B4B4 */ virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&); + /* 8007B630 */ virtual int GetUnderwaterRoofCode(int); + /* 8007B4B4 */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&); /* 8007B6AC */ virtual void GetLinkNo(cBgS_PolyInfo const&); /* 8007B6D8 */ virtual s32 GetWallCode(cBgS_PolyInfo const&); /* 8007B704 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&); /* 8007B734 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&); - /* 8007B760 */ virtual bool GetGroundCode(cBgS_PolyInfo const&); + /* 8007B760 */ virtual int GetGroundCode(cBgS_PolyInfo const&); /* 8007B7DC */ virtual void GetIronBallThrough(int); /* 8007B800 */ virtual u32 GetAttackThrough(int); /* 8007B87C */ virtual s32 GetCamMoveBG(cBgS_PolyInfo const&); diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index 1cbf808f7a7..fee8c30efda 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -26,11 +26,11 @@ public: /* 8007E640 */ virtual ~dBgW_Base(); /* 8007E6D0 */ virtual bool ChkMemoryError(); - virtual void ChkNotReady() const = 0; + virtual bool ChkNotReady() const = 0; virtual bool ChkLock() const = 0; virtual bool ChkMoveBg() const = 0; virtual u32 ChkMoveFlag() const = 0; - virtual void GetTriPla(cBgS_PolyInfo const&) const = 0; + virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const = 0; virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const = 0; virtual void GetBnd() const = 0; virtual u32 GetGrpInf(cBgS_PolyInfo const&) const = 0; @@ -38,20 +38,20 @@ public: virtual void GetTopUnder(f32*, f32*) const = 0; /* 80074AB4 */ virtual void SetOldShapeAngleY(s16); virtual bool LineCheck(cBgS_LinChk*) = 0; - virtual void GroundCross(cBgS_GndChk*) = 0; + virtual bool GroundCross(cBgS_GndChk*) = 0; virtual void ShdwDraw(cBgS_ShdwDraw*) = 0; virtual void CaptPoly(dBgS_CaptPoly&) = 0; virtual void WallCorrect(dBgS_Acch*) = 0; virtual void WallCorrectSort(dBgS_Acch*) = 0; - virtual void RoofChk(dBgS_RoofChk*) = 0; - virtual void SplGrpChk(dBgS_SplGrpChk*) = 0; - virtual void SphChk(dBgS_SphChk*, void*) = 0; + virtual bool RoofChk(dBgS_RoofChk*) = 0; + virtual bool SplGrpChk(dBgS_SplGrpChk*) = 0; + virtual bool SphChk(dBgS_SphChk*, void*) = 0; virtual s32 GetGrpRoomIndex(cBgS_PolyInfo const&) const = 0; virtual s32 GetExitId(cBgS_PolyInfo const&) = 0; virtual s32 GetPolyColor(cBgS_PolyInfo const&) = 0; virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0; - virtual bool GetSpecialCode(cBgS_PolyInfo const&) = 0; - virtual void GetSpecialCode(int) = 0; + virtual int GetSpecialCode(cBgS_PolyInfo const&) = 0; + virtual int GetSpecialCode(int) = 0; virtual int GetMagnetCode(cBgS_PolyInfo const&) = 0; virtual void GetPolyObjThrough(int) = 0; virtual void GetPolyCamThrough(int) = 0; @@ -62,13 +62,13 @@ public: virtual void GetPolyRopeThrough(int) = 0; virtual void GetPolyBombThrough(int) = 0; virtual void GetShdwThrough(int) = 0; - virtual bool GetUnderwaterRoofCode(int) = 0; - virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; + virtual int GetUnderwaterRoofCode(int) = 0; + virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; virtual void GetLinkNo(cBgS_PolyInfo const&) = 0; virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0; virtual int GetPolyAtt0(cBgS_PolyInfo const&) = 0; virtual int GetPolyAtt1(cBgS_PolyInfo const&) = 0; - virtual bool GetGroundCode(cBgS_PolyInfo const&) = 0; + virtual int GetGroundCode(cBgS_PolyInfo const&) = 0; virtual void GetIronBallThrough(int) = 0; virtual u32 GetAttackThrough(int) = 0; virtual s32 GetCamMoveBG(cBgS_PolyInfo const&) = 0; @@ -85,10 +85,12 @@ public: PushPull_CallBack GetPushPullCallback() const { return m_pushPull_Callback; } s16 GetDiffShapeAngleY() { return m_diff_ShapeAngleY; } - u8 GetRoomId() { return m_roomId; } + int GetRoomId() { return m_roomId; } bool chkStickWall() { return field_0xb & 1; } bool chkStickRoof() { return field_0xb & 2; } bool ChkPushPullOk() const { return m_pushPull_Ok; } + void SetRoomId(int id) { m_roomId = id; } + bool ChkPriority(int prio) { return m_priority == prio; } private: /* 0x08 */ u8 m_priority; diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h index 924474ce354..a52e448cb8e 100644 --- a/include/d/bg/d_bg_w_kcol.h +++ b/include/d/bg/d_bg_w_kcol.h @@ -23,31 +23,31 @@ public: /* 8007FF00 */ void ChkShdwDrawThrough(dBgPc*); /* 8007E74C */ virtual ~dBgWKCol(); - /* 8007E86C */ virtual void ChkNotReady() const; + /* 8007E86C */ virtual bool ChkNotReady() const; /* 8007E87C */ virtual bool ChkLock() const; /* 8007E884 */ virtual bool ChkMoveBg() const; /* 8007E88C */ virtual bool ChkMoveFlag() const; - /* 8007E894 */ virtual void GetTriPla(cBgS_PolyInfo const&) const; + /* 8007E894 */ virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const; /* 8007E980 */ virtual void GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const; /* 8007EB28 */ virtual void GetBnd() const; /* 8007EB30 */ virtual void GetGrpInf(cBgS_PolyInfo const&) const; /* 8007EB6C */ virtual void OffMoveFlag(); /* 800829AC */ virtual void GetTopUnder(f32*, f32*) const; - /* 8007EE34 */ virtual void LineCheck(cBgS_LinChk*); - /* 8007F628 */ virtual void GroundCross(cBgS_GndChk*); + /* 8007EE34 */ virtual bool LineCheck(cBgS_LinChk*); + /* 8007F628 */ virtual bool GroundCross(cBgS_GndChk*); /* 8007F9A4 */ virtual void ShdwDraw(cBgS_ShdwDraw*); /* 8007FF1C */ virtual void CaptPoly(dBgS_CaptPoly&); /* 800811A0 */ virtual void WallCorrect(dBgS_Acch*); /* 80080330 */ virtual void WallCorrectSort(dBgS_Acch*); - /* 80081E18 */ virtual void RoofChk(dBgS_RoofChk*); - /* 80082184 */ virtual void SplGrpChk(dBgS_SplGrpChk*); - /* 800824EC */ virtual void SphChk(dBgS_SphChk*, virtual void*); + /* 80081E18 */ virtual bool RoofChk(dBgS_RoofChk*); + /* 80082184 */ virtual bool SplGrpChk(dBgS_SplGrpChk*); + /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, virtual void*); /* 800829F0 */ virtual void GetGrpRoomIndex(cBgS_PolyInfo const&) const; /* 80082A20 */ virtual void GetExitId(cBgS_PolyInfo const&); /* 80082A50 */ virtual void GetPolyColor(cBgS_PolyInfo const&); /* 80082A80 */ virtual void GetHorseNoEntry(cBgS_PolyInfo const&); - /* 80082AB0 */ virtual void GetSpecialCode(cBgS_PolyInfo const&); - /* 80082AE0 */ virtual void GetSpecialCode(int); + /* 80082AB0 */ virtual int GetSpecialCode(cBgS_PolyInfo const&); + /* 80082AE0 */ virtual int GetSpecialCode(int); /* 80082B0C */ virtual int GetMagnetCode(cBgS_PolyInfo const&); /* 80082B6C */ virtual void GetPolyObjThrough(int); /* 80082B98 */ virtual void GetPolyCamThrough(int); @@ -58,13 +58,13 @@ public: /* 80082C74 */ virtual void GetPolyRopeThrough(int); /* 80082CA0 */ virtual void GetPolyBombThrough(int); /* 80082CF8 */ virtual void GetShdwThrough(int); - /* 80082CCC */ virtual void GetUnderwaterRoofCode(int); - /* 80082B3C */ virtual void GetMonkeyBarsCode(cBgS_PolyInfo const&); + /* 80082CCC */ virtual int GetUnderwaterRoofCode(int); + /* 80082B3C */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&); /* 80082D24 */ virtual void GetLinkNo(cBgS_PolyInfo const&); /* 80082D54 */ virtual s32 GetWallCode(cBgS_PolyInfo const&); /* 80082D84 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&); /* 80082DB4 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&); - /* 80082DE4 */ virtual void GetGroundCode(cBgS_PolyInfo const&); + /* 80082DE4 */ virtual int GetGroundCode(cBgS_PolyInfo const&); /* 80082E14 */ virtual void GetIronBallThrough(int); /* 80082E40 */ virtual void GetAttackThrough(int); /* 80082E6C */ virtual void GetCamMoveBG(cBgS_PolyInfo const&); diff --git a/include/d/cc/d_cc_mass_s.h b/include/d/cc/d_cc_mass_s.h index a4c0a534782..9a0a0ec2cb1 100644 --- a/include/d/cc/d_cc_mass_s.h +++ b/include/d/cc/d_cc_mass_s.h @@ -13,11 +13,13 @@ private: /* 0x08 */ dCcMassS_ObjCallback mpCallback; /* 0x0C */ cCcD_DivideInfo mDivideInfo; /* 0x1C vtable */ + public: dCcMassS_Obj(); virtual ~dCcMassS_Obj() {} - /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); - /* 800852F0 */ void Clear(); + void Set(cCcD_Obj* p_obj, u8 priority, dCcMassS_ObjCallback callback); + void Clear(); + cCcD_Obj* GetObj() { return mpObj; } u8 GetPriority() const { return mPriority; } dCcMassS_ObjCallback GetCallback() const { return mpCallback; } @@ -34,7 +36,7 @@ private: /* 0x0C */ f32 mCoHitLen; public: - /* 80085334 */ void ClearPointer(); + void ClearPointer(); void SetAreaHitObj(cCcD_Obj* obj) { mpArea = obj; } void SetCoHitObj(cCcD_Obj* obj) { mpCoObj = obj; } void SetAtHitObj(cCcD_Obj* obj) { mpAtObj = obj; } @@ -60,18 +62,19 @@ public: /* 0x0224 */ cCcD_CpsAttr mCpsAttr; /* 0x0264 */ cCcD_DivideInfo mDivideInfo; /* 0x0274 vtable */ + public: - dCcMassS_Mng(void); + dCcMassS_Mng(); virtual ~dCcMassS_Mng() {} /* 800855E4 */ void Ct(); - /* 80085630 */ void SetAttr(f32, f32, u8, u8); + /* 80085630 */ void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3); /* 80085690 */ void Prepare(); - /* 800858AC */ u32 Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*); + /* 800858AC */ u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf); /* 80085CF0 */ void Clear(); - /* 80085D98 */ void Set(cCcD_Obj*, u8); - /* 80085E6C */ void SetCam(cM3dGCps const&); + /* 80085D98 */ void Set(cCcD_Obj* p_obj, u8 priority); + /* 80085E6C */ void SetCam(cM3dGCps const& cps); /* 80085EB0 */ u8 GetResultCam() const; - /* 80085EB8 */ void GetCamTopPos(Vec*); + /* 80085EB8 */ void GetCamTopPos(Vec* p_out); }; STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x278); diff --git a/include/d/cc/d_cc_uty.h b/include/d/cc/d_cc_uty.h index 243bcce7216..81719f4bf9a 100644 --- a/include/d/cc/d_cc_uty.h +++ b/include/d/cc/d_cc_uty.h @@ -5,6 +5,15 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" +enum dCcU_AtType { + /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1, + /* 0x02 */ HIT_TYPE_BOMB, + /* 0x09 */ HIT_TYPE_LINK_HEAVY_ATTACK = 9, + /* 0x0A */ HIT_TYPE_BOOMERANG, + /* 0x0F */ HIT_TYPE_ARROW = 15, + /* 0x10 */ HIT_TYPE_STUN, +}; + struct dCcU_AtInfo { /* 0x00 */ cCcD_Obj* mpCollider; /* 0x04 */ fopAc_ac_c* mpActor; diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index d9d978e58bd..6158da71822 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -643,7 +643,6 @@ public: /* 0x00000 */ dSv_info_c info; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c drawlist; - /* 0x1C104 */ u8 field_0x1C104[0x1F4]; /* 0x1C2F8 */ dRes_control_c mResControl; /* 0x1DDF8 */ u8 mFadeBrightness; /* 0x1DDF9 */ u8 mWorldDark; @@ -797,6 +796,7 @@ BOOL dComIfGs_isStageSwitch(int i_stageNo, int i_no); void dComIfGs_onStageSwitch(int i_stageNo, int i_no); void dComIfGs_offStageSwitch(int i_stageNo, int i_no); void dComIfGs_PolyDamageOff_Set(s8 param_0); +u8 dComIfGs_staffroll_next_go_check(); inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 12b995f6ea3..d0c674f9049 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -17,9 +17,9 @@ public: /* 80073970 */ void proc(); private: - u32 field_0x0; - u32 field_0x4; - u32 field_0x8; + /* 0x0 */ u32 mHintActorID; + /* 0x4 */ u32 mPriority; + /* 0x8 */ u32 field_0x8; }; class dAttCatch_c { @@ -30,52 +30,52 @@ public: void proc(); void request(fopAc_ac_c*, u8, f32, f32, f32, s16, int); - s32 getCatghTarget() { return convPId(field_0x10); } + s32 getCatghTarget() { return convPId(mCatghTargetID); } u8 getChangeItem() { return mChangeItem; } private: - void* field_0x0; - u32 field_0x4; - float field_0x8; - u8 field_0xc; - u8 field_0xd; - u8 field_0xe; - u8 field_0xf; - u32 field_0x10; - u8 mChangeItem; -}; // Size = 0x14 + /* 0x00 */ void* field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ u8 field_0xc; + /* 0x0D */ u8 field_0xd; + /* 0x0E */ u8 field_0xe; + /* 0x0F */ u8 field_0xf; + /* 0x10 */ u32 mCatghTargetID; + /* 0x14 */ u8 mChangeItem; +}; // Size: 0x18 class dAttParam_c { -private: - /* 0x00 vtable */ - /* 0x04 */ u8 field_0x4; - /* 0x05 */ u8 field_0x5; - /* 0x06 */ u16 mFlag; - /* 0x08 */ float field_0x8; - /* 0x0C */ float field_0xc; - /* 0x10 */ float field_0x10; - /* 0x14 */ float field_0x14; - /* 0x18 */ float field_0x18; - /* 0x1C */ float field_0x1c; - /* 0x20 */ float field_0x20; - /* 0x24 */ float field_0x24; - /* 0x28 */ float field_0x28; - /* 0x2C */ float field_0x2c; - /* 0x30 */ float field_0x30; - /* 0x34 */ float field_0x34; - /* 0x38 */ u8 field_0x38; - /* 0x39 */ u8 field_0x39; - public: dAttParam_c() {} /* 80070038 */ dAttParam_c(s32); - /* 80070110 */ virtual ~dAttParam_c(); private: - /* 0x3C */ float field_0x3c; - /* 0x40 */ float field_0x40; - /* 0x44 */ u32 field_0x44; - /* 0x48 */ u32 field_0x48; + /* 0x00 */ u16 field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 mDangerBGMDistance; + /* 0x14 */ f32 mBGMDistMargin; + /* 0x18 */ f32 mSWModeDisable; + /* 0x1C */ f32 mSelCursorScaleX; + /* 0x20 */ f32 mSelCursorScaleY; + /* 0x24 */ f32 mAttnCursorScaleX; + /* 0x28 */ f32 mAttnCursorScaleY; + /* 0x2C */ f32 mSelCursorOffsetY; + /* 0x30 */ f32 mAttnCursorOffsetY; + /* 0x34 */ u8 mAttnCursorAppearFrames; + /* 0x35 */ u8 mAttnCursorDisappearFrames; + +public: + /* 80070110 */ virtual ~dAttParam_c(); + /* 0x38 vtable */ + +private: + /* 0x3C */ f32 mSelCursorAnmSpeed; + /* 0x40 */ f32 mAttnCursorAnmSpeed; + /* 0x44 */ u32 mDispPosX; + /* 0x48 */ u32 mDispPosY; }; // Size = 0x4C class dAttLook_c { @@ -88,11 +88,10 @@ public: private: u32 field_0x0; u32 field_0x4; - float field_0x8; - u32 field_0xc; -}; // Size = 0x10 + f32 field_0x8; + u32 mLookTargetID; +}; // Size: 0x10 -#pragma pack(push, 1) class dAttList_c { public: /* 800304D0 */ ~dAttList_c() {} @@ -101,11 +100,12 @@ public: /* 80073898 */ void setActor(fopAc_ac_c*); private: - u8 field_0x0[8]; - cSAngle angle; - u8 field_0xa[10]; -}; // Size = 0x14 -#pragma pack(pop) + /* 0x00 */ f32 mWeight; + /* 0x04 */ f32 mDistance; + /* 0x08 */ cSAngle mAngle; + /* 0x0C */ u32 mType; + /* 0x10 */ u32 mActorID; +}; // Size: 0x14 class dAttDraw_c { public: @@ -116,14 +116,7 @@ public: /* 80073004 */ void alphaAnm(); /* 800732B0 */ void draw(cXyz&, f32 (*)[4]); - u8 field_0x0; - u8 field_0x1; - u8 field_0x2; - u8 field_0x3; - u8 field_0x4; - u8 field_0x5; - u8 field_0x6; - u8 field_0x7; + /* 0x000 */ J3DModel* mModel[2]; /* 0x008 */ mDoExt_bckAnm bckAnm[2]; /* 0x040 */ mDoExt_bpkAnm bpkAnm[2]; /* 0x070 */ mDoExt_brkAnm brkAnm[2]; @@ -225,9 +218,9 @@ public: static u32 chk_type_num; public: - /* 0x000 */ fopAc_ac_c* field_0x0; - /* 0x004 */ u32 field_0x4; - /* 0x008 */ dAttDraw_CallBack_c dattdraw_callback; + /* 0x000 */ fopAc_ac_c* mpPlayer; + /* 0x004 */ u32 mLockTargetID; + /* 0x008 */ dAttDraw_CallBack_c mpDrawCallback; /* 0x00C */ u32 field_0xc; /* 0x010 */ u32 field_0x10; /* 0x014 */ u8 field_0x14[4]; @@ -251,11 +244,11 @@ public: /* 0x334 */ u32 mFlags; /* 0x338 */ dAttList_c mLockOnList[8]; /* 0x3D8 */ int mLockonCount; - /* 0x3DC */ int field_0x3dc; + /* 0x3DC */ int mLockOnOffset; /* 0x3E0 */ dAttList_c mActionList[4]; /* 0x430 */ int mActionCount; - /* 0x434 */ int field_0x434; - /* 0x438 */ dAttList_c attention_list3[4]; + /* 0x434 */ int mActionOffset; + /* 0x438 */ dAttList_c field_0x438[4]; /* 0x488 */ int mCheckObjectCount; /* 0x48C */ int field_0x48c; /* 0x490 */ dAttHint_c mZHintTarget; @@ -270,7 +263,9 @@ public: /* 0x4CD */ u8 field_0x4cd; /* 0x4CE */ u8 field_0x4ce; /* 0x4CF */ u8 field_0x4cf; - /* 0x4D0 */ dAttParam_c attention_param; -}; // Size = 0x51C + /* 0x4D0 */ dAttParam_c mAttParam; +}; // Size: 0x51C + +STATIC_ASSERT(sizeof(dAttention_c) == 0x51C); #endif /* D_D_ATTENTION_H */ diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 0800616e31c..584e24cc858 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -1,91 +1,281 @@ #ifndef D_D_DEMO_H #define D_D_DEMO_H -#include "JSystem/JStudio/JStudio/stb.h" -#include "dolphin/types.h" +#include "JSystem/JGadget/binary.h" +#include "JSystem/JMessage/control.h" +#include "JSystem/JStage/JSGAmbientLight.h" +#include "JSystem/JStage/JSGCamera.h" +#include "JSystem/JStage/JSGFog.h" +#include "JSystem/JStage/JSGLight.h" +#include "JSystem/JStudio/JStudio/jstudio-object.h" +#include "JSystem/JStudio/JStudio_JAudio2/control.h" +#include "JSystem/JStudio/JStudio_JParticle/object-particle.h" +#include "JSystem/JStudio/JStudio_JStage/object.h" +#include "f_op/f_op_actor.h" -struct cXyz; -struct Vec; -struct fopAc_ac_c; class dDemo_actor_c; - +class dDemo_camera_c; +class dDemo_ambient_c; +class dDemo_light_c; +class dDemo_fog_c; class dDemo_object_c { public: /* 80038F54 */ dDemo_object_c(); /* 80038F70 */ ~dDemo_object_c(); - /* 80038FC0 */ void appendActor(fopAc_ac_c*); - /* 80039088 */ static dDemo_actor_c* getActor(u8); - /* 800390AC */ void createCamera(); - /* 80039128 */ void getActiveCamera(); - /* 8003913C */ void createAmbient(); - /* 800391B8 */ void appendLight(); - /* 80039258 */ void createFog(); + /* 80038FC0 */ JStage::TObject* appendActor(fopAc_ac_c*); + /* 80039088 */ dDemo_actor_c* getActor(u8); + /* 800390AC */ JStage::TObject* createCamera(); + /* 80039128 */ JStage::TObject* getActiveCamera(); + /* 8003913C */ JStage::TObject* createAmbient(); + /* 800391B8 */ JStage::TObject* appendLight(); + /* 80039258 */ JStage::TObject* createFog(); /* 800392D4 */ void remove(); + + /* 0x00 */ u8 mActorNum; + /* 0x01 */ u8 mLightNum; + /* 0x04 */ dDemo_actor_c* mpActors[32]; + /* 0x84 */ dDemo_camera_c* mpCamera; + /* 0x88 */ dDemo_ambient_c* mpAmbient; + /* 0x8C */ dDemo_light_c* mpLights[8]; + /* 0xAC */ dDemo_fog_c* mpFog; + /* 0xB0 */ dDemo_camera_c* mpEditorCamera; }; -class dDemo_actor_c { +class dDemo_prm_c { +public: + dDemo_prm_c() { mData = 0; } + + /* 0x0 */ u32 field_0x0; + /* 0x4 */ u32 mData; +}; + +class dDemo_actor_c : public JStage::TActor { public: /* 80038020 */ dDemo_actor_c(); - /* 80038098 */ ~dDemo_actor_c(); /* 80038128 */ void getActor(); /* 8003815C */ void setActor(fopAc_ac_c*); /* 8003819C */ void getPrm_Morf(); /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); - /* 800387EC */ void JSGSetData(u32, void const*, u32); - /* 80038920 */ void JSGSetTranslation(Vec const&); - /* 80038980 */ void JSGSetScaling(Vec const&); - /* 800389A8 */ void JSGSetRotation(Vec const&); - /* 80038A0C */ void JSGSetShape(u32); - /* 80038A20 */ void JSGSetAnimation(u32); - /* 80038A40 */ void JSGSetAnimationFrame(f32); - /* 80038A54 */ void JSGSetAnimationTransition(f32); - /* 80038A68 */ void JSGSetTextureAnimation(u32); - /* 80038A7C */ void JSGSetTextureAnimationFrame(f32); - /* 8003A05C */ void JSGFindNodeID(char const*) const; - /* 8003A088 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - /* 8003A0C8 */ void JSGGetAnimationFrameMax() const; - /* 8003A0D0 */ void JSGGetTextureAnimationFrameMax() const; - /* 8003A0D8 */ void JSGGetTranslation(Vec*) const; - /* 8003A0F4 */ void JSGGetScaling(Vec*) const; - /* 8003A110 */ void JSGGetRotation(Vec*) const; + + /* 80038098 */ virtual ~dDemo_actor_c(); + /* 800387EC */ virtual void JSGSetData(u32, void const*, u32); + /* 8003A05C */ virtual void JSGFindNodeID(char const*) const; + /* 8003A088 */ virtual void JSGGetNodeTransformation(u32, f32 (*)[4]) const; + /* 8003A0D8 */ virtual void JSGGetTranslation(Vec*) const; + /* 80038920 */ virtual void JSGSetTranslation(Vec const&); + /* 8003A0F4 */ virtual void JSGGetScaling(Vec*) const; + /* 80038980 */ virtual void JSGSetScaling(Vec const&); + /* 8003A110 */ virtual void JSGGetRotation(Vec*) const; + /* 800389A8 */ virtual void JSGSetRotation(Vec const&); + /* 80038A0C */ virtual void JSGSetShape(u32); + /* 80038A20 */ virtual void JSGSetAnimation(u32); + /* 80038A40 */ virtual void JSGSetAnimationFrame(f32); + /* 8003A0C8 */ virtual f32 JSGGetAnimationFrameMax() const; + /* 80038A54 */ virtual void JSGSetAnimationTransition(f32); + /* 80038A68 */ virtual void JSGSetTextureAnimation(u32); + /* 80038A7C */ virtual void JSGSetTextureAnimationFrame(f32); + /* 8003A0D0 */ virtual f32 JSGGetTextureAnimationFrameMax() const; + + void setModel(J3DModel* p_model) { mModel = p_model; } + +private: + /* 0x04 */ u16 mFlags; + /* 0x08 */ cXyz mTrans; + /* 0x14 */ cXyz mScale; + /* 0x20 */ csXyz mRotate; + /* 0x28 */ u32 mShape; + /* 0x2C */ u32 mAnmId; + /* 0x30 */ f32 mAnmFrame; + /* 0x34 */ f32 mAnmTransition; + /* 0x38 */ f32 mAnmFrameMax; + /* 0x3C */ u32 mTexAnm; + /* 0x40 */ f32 mTexAnmFrame; + /* 0x44 */ f32 mTexAnmFrameMax; + /* 0x48 */ J3DModel* mModel; + /* 0x4C */ dDemo_prm_c mPrm; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ u32 mActorId; + /* 0x5C */ u32 mOldAnmId; + /* 0x60 */ u32 mBtpId; + /* 0x64 */ u32 mBtkId; + /* 0x68 */ u32 mBrkId; }; +class dDemo_system_c : public JStage::TSystem { +public: + dDemo_system_c() { mpObject = NULL; } + + /* 80039AAC */ virtual ~dDemo_system_c(); + /* 80039528 */ virtual bool JSGFindObject(JStage::TObject**, char const*, + JStage::TEObject) const; + +private: + /* 0x4 */ dDemo_object_c* mpObject; +}; + +class dDemo_particle_c : public JStudio_JParticle::TCreateObject { +public: + dDemo_particle_c(JPAEmitterManager* p_emitMgr, const JStage::TSystem* p_system) + : JStudio_JParticle::TCreateObject(p_emitMgr, p_system) {} + + /* 80039F9C */ virtual ~dDemo_particle_c(); + /* 80039F1C */ virtual void emitter_create(u32); +}; + +class dDemo_light_c : public JStage::TLight { +public: + dDemo_light_c() { + mFlags = 0; + } + + /* 80039468 */ virtual ~dDemo_light_c(); + /* 80038E20 */ virtual void JSGSetLightType(JStage::TELight); + /* 80038E34 */ virtual void JSGSetPosition(Vec const&); + /* 80038E5C */ virtual void JSGSetColor(GXColor); + /* 80038E8C */ virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn); + /* 80038EA8 */ virtual void JSGSetAngleAttenuation(f32, GXSpotFn); + /* 80038EC0 */ virtual void JSGSetDirection(Vec const&); + +private: + /* 0x04 */ u8 mFlags; + /* 0x08 */ JStage::TELight mLightType; + /* 0x0C */ GXDistAttnFn mDistAttenFn; + /* 0x10 */ GXSpotFn mSpotFn; + /* 0x14 */ cXyz mPosition; + /* 0x20 */ GXColor mColor; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ cXyz mDirection; +}; + +class dDemo_fog_c : public JStage::TFog { +public: + dDemo_fog_c() { + mFlags = 0; + } + + /* 80039408 */ virtual ~dDemo_fog_c(); + /* 80038EE8 */ virtual void JSGSetFogFunction(GXFogType); + /* 80038EFC */ virtual void JSGSetStartZ(f32); + /* 80038F10 */ virtual void JSGSetEndZ(f32); + /* 80038F24 */ virtual void JSGSetColor(GXColor); + +private: + /* 0x04 */ u8 mFlags; + /* 0x05 */ u8 mFogType; + /* 0x08 */ f32 mStartZ; + /* 0x0C */ f32 mEndZ; + /* 0x10 */ GXColor mColor; +}; + +class dDemo_camera_c : public JStage::TCamera { +public: + dDemo_camera_c() { + mFlags = 0; + } + + /* 80039FFC */ virtual ~dDemo_camera_c(); + /* 80038AC4 */ virtual f32 JSGGetProjectionNear() const; + /* 80038AF8 */ virtual void JSGSetProjectionNear(f32); + /* 80038B0C */ virtual f32 JSGGetProjectionFar() const; + /* 80038B40 */ virtual void JSGSetProjectionFar(f32); + /* 80038B54 */ virtual f32 JSGGetProjectionFovy() const; + /* 80038B88 */ virtual void JSGSetProjectionFovy(f32); + /* 80038B9C */ virtual f32 JSGGetProjectionAspect() const; + /* 80038BD0 */ virtual void JSGSetProjectionAspect(f32); + /* 80038BE4 */ virtual void JSGGetViewPosition(Vec*) const; + /* 80038C44 */ virtual void JSGSetViewPosition(Vec const&); + /* 80038C6C */ virtual void JSGGetViewUpVector(Vec*) const; + /* 80038CD0 */ virtual void JSGSetViewUpVector(Vec const&); + /* 80038CF8 */ virtual void JSGGetViewTargetPosition(Vec*) const; + /* 80038D5C */ virtual void JSGSetViewTargetPosition(Vec const&); + /* 80038D84 */ virtual f32 JSGGetViewRoll() const; + /* 80038DDC */ virtual void JSGSetViewRoll(f32); + +private: + /* 0x04 */ u8 mFlags; + /* 0x08 */ f32 mProjNear; + /* 0x0C */ f32 mProjFar; + /* 0x10 */ f32 mProjFovy; + /* 0x14 */ f32 mProjAspect; + /* 0x18 */ cXyz mViewPos; + /* 0x24 */ cXyz mViewUpVector; + /* 0x30 */ cXyz mViewTargetVector; + /* 0x3C */ f32 mViewRoll; +}; + +class dDemo_ambient_c : public JStage::TAmbientLight { +public: + dDemo_ambient_c() { + mFlags = 0; + } + + /* 800394C8 */ virtual ~dDemo_ambient_c(); + /* 80038DF0 */ virtual void JSGSetColor(GXColor); + +private: + /* 0x04 */ u8 mFlags; + /* 0x05 */ GXColor mColor; +}; + +namespace { +class jstudio_tCreateObject_message : public JStudio::TCreateObject { +public: + jstudio_tCreateObject_message() {} + + virtual ~jstudio_tCreateObject_message(); + virtual void create(JStudio::TObject**, const JStudio::stb::data::TParse_TBlock_object&); +}; + +class jstudio_tAdaptor_message : public JStudio::TAdaptor_message { +public: + jstudio_tAdaptor_message() {} + + virtual ~jstudio_tAdaptor_message(); + virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32); +}; + +}; // namespace + class dDemo_c { public: /* 80039678 */ static void create(); - /* 80039910 */ void remove(); - /* 80039B6C */ void start(u8 const*, cXyz*, f32); + /* 80039910 */ static void remove(); + /* 80039B6C */ static int start(u8 const*, cXyz*, f32); /* 80039CF8 */ static void end(); - /* 80039D4C */ void branch(); - /* 80039DA4 */ static void update(); - /* 80039EDC */ void setBranchType(u16); - /* 80039EEC */ void setBranchId(u16, s16); - /* 80039F04 */ void reset(); + /* 80039D4C */ static void branch(); + /* 80039DA4 */ static int update(); + /* 80039EDC */ static void setBranchType(u16); + /* 80039EEC */ static void setBranchId(u16, s16); + /* 80039F04 */ static void reset(); static dDemo_actor_c* getActor(u8 param_0) { return m_object->getActor(param_0); } static u32 getFrameNoMsg() { return m_frameNoMsg; } static s32 getMode() { return m_mode; } static JStudio::stb::TControl* getControl() { return m_control; } + static bool isStatus(u32 status) { return m_status & status; } + static void setBranchData(const u8* p_data) { m_branchData = p_data; } - static u16 m_branchId[1 + 3 /* padding */]; - static u8 m_system[4]; - static JStudio::stb::TControl* m_control; - static u8 m_stage[4]; - static u8 m_audio[4]; - static u8 m_particle[4]; - static u8 m_message[4]; - static u8 m_factory[4]; - static u8 m_mesgControl[4]; + static s16 m_branchId; + static dDemo_system_c* m_system; + static JStudio::TControl* m_control; + static JStudio_JStage::TCreateObject* m_stage; + static JStudio_JAudio2::TCreateObject* m_audio; + static dDemo_particle_c* m_particle; + static jstudio_tCreateObject_message* m_message; + static JStudio::TFactory* m_factory; + static jmessage_tControl* m_mesgControl; static dDemo_object_c* m_object; - static u8 m_data[4]; - static u8 m_frame[4]; - static u8 m_translation[4]; + static const u8* m_data; + static int m_frame; + static cXyz* m_translation; static f32 m_rotationY; static u32 m_frameNoMsg; static s32 m_mode; - static u8 m_status[4]; - static u8 m_branchType[2 + 2 /* padding */]; - static u8 m_branchData[4]; + static u32 m_status; + static u16 m_branchType; + static const u8* m_branchData; }; #endif /* D_D_DEMO_H */ diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index ddbd6ea7eaf..b4d243bfcdf 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -36,7 +36,7 @@ public: class dDlst_FileInfo_c : public dDlst_base_c { public: dDlst_FileInfo_c() {} - virtual void draw(void); + virtual void draw(); virtual ~dDlst_FileInfo_c(); // inlined /* 0x04 */ J2DScreen* Scr; @@ -63,15 +63,40 @@ private: /* 0x160 */ u8 mAlpha; }; +class dDlst_2DT2_c : public dDlst_base_c { +public: + /* 80052354 */ virtual void draw(); + /* 80052B00 */ dDlst_2DT2_c(); + /* 80052B4C */ void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32); + + /* 0x04 */ GXTexObj mTexObj; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 mScaleX; + /* 0x38 */ f32 mScaleY; + /* 0x3C */ GXColor field_0x3c; + /* 0x40 */ GXColor field_0x40; + /* 0x44 */ u8 field_0x44; + /* 0x45 */ u8 field_0x45; + /* 0x46 */ u8 field_0x46; +}; // Size: 0x48 + class dDlst_peekZ_c { public: - dDlst_peekZ_c() { field_0x0 = 0; } - /* 80056018 */ void newData(s16, s16, u32*); + struct dDlst_peekZ_entry { + /* 0x0 */ s16 x; + /* 0x2 */ s16 y; + /* 0x4 */ u32* dst; + }; + + dDlst_peekZ_c() { mCount = 0; } + /* 80056018 */ int newData(s16, s16, u32*); /* 80056080 */ void peekData(); - /* 0x0 */ u8 field_0x0; - /* 0x2 */ u16 field_0x2; - /* 0x4 */ u32* field_0x4; + /* 0x0 */ u8 mCount; + /* 0x4 */ dDlst_peekZ_entry mEntries[0x40]; }; class dDlst_shadowSimple_c { @@ -93,7 +118,9 @@ public: /* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*); /* 800543B4 */ void draw(); - /* 0x0 */ void* field_0x0; // vtable + virtual void getTri() = 0; + virtual s32 getTriMax() = 0; + /* 0x4 */ u16 mCount; /* 0x6 */ u8 field_0x6[2]; }; @@ -106,12 +133,11 @@ public: /* 0x0 */ cXyz mPos[3]; }; -class dDlst_shadowRealPoly_c { +class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c { public: - /* 800569A0 */ void getTri(); - /* 800569A8 */ s32 getTriMax(); + /* 800569A0 */ virtual void getTri(); + /* 800569A8 */ virtual s32 getTriMax(); - /* 0x0 */ dDlst_shadowPoly_c mShadowPoly; /* 0x8 */ dDlst_shadowTri_c mShadowTri[256]; }; @@ -123,7 +149,7 @@ public: /* 80054BD0 */ void setShadowRealMtx(cXyz*, cXyz*, f32, f32, f32, dKy_tevstr_c*); /* 80055028 */ void set(u32, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*, f32, f32); /* 800551D4 */ bool add(J3DModel*); - /* 800561F8 */ ~dDlst_shadowReal_c(); + /* 800561F8 */ ~dDlst_shadowReal_c() {} /* 800562D0 */ dDlst_shadowReal_c(); private: @@ -174,33 +200,33 @@ private: class dDlst_window_c { public: - dDlst_window_c(void) {} + dDlst_window_c() {} ~dDlst_window_c() {} /* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32); /* 80051ADC */ void setScissor(f32, f32, f32, f32); void setCameraID(int id) { mCameraID = id; } void setMode(int mode) { mMode = mode; } - f32 getViewPort() { return mViewport; } + f32 getViewPort() { return mXOrig; } private: - /* 0x00 */ f32 mViewport; - /* 0x04 */ f32 field_0x04; - /* 0x08 */ f32 field_0x08; - /* 0x0C */ f32 field_0x0C; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 mScissor; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; + /* 0x00 */ f32 mXOrig; + /* 0x04 */ f32 mYOrig; + /* 0x08 */ f32 mWidth; + /* 0x0C */ f32 mHeight; + /* 0x10 */ f32 mNearZ; + /* 0x14 */ f32 mFarZ; + /* 0x18 */ f32 mScissorXOrig; + /* 0x1C */ f32 mScissorYOrig; + /* 0x20 */ f32 mScissorWidth; + /* 0x24 */ f32 mScissorHeight; /* 0x28 */ s8 mCameraID; /* 0x29 */ s8 mMode; }; STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C); -extern u8 data_80450ED0; // Wipe +extern u8 mWipe__12dDlst_list_c; // Wipe struct view_port_class; struct view_class; @@ -222,28 +248,52 @@ public: /* 800568D8 */ static void wipeIn(f32); /* 80056900 */ void calcWipe(); - void set2DOpa(dDlst_base_c* dlst) { set(field_0x1b4, field_0x1b8, dlst); } - void set2DOpaTop(dDlst_base_c* dlst) { set(field_0xac, field_0xb0, dlst); } + enum DrawBuffer { + /* 0x00 */ DB_OPA_LIST_SKY, + /* 0x01 */ DB_XLU_LIST_SKY, + /* 0x02 */ DB_LIST_P0, + /* 0x03 */ DB_OPA_LIST_BG, + /* 0x04 */ DB_XLU_LIST_BG, + /* 0x05 */ DB_OPA_LIST_DARK_BG, + /* 0x06 */ DB_XLU_LIST_DARK_BG, + /* 0x07 */ DB_OPA_LIST, + /* 0x08 */ DB_XLU_LIST, + /* 0x09 */ DB_OPA_LIST_DARK, + /* 0x0A */ DB_XLU_LIST_DARK, + /* 0x0B */ DB_OPA_LIST_PACKET, + /* 0x0C */ DB_LIST_FILTER, + /* 0x0D */ DB_OPA_LIST_ITEM3D, + /* 0x0E */ DB_XLU_LIST_ITEM3D, + /* 0x0F */ DB_OPA_LIST_INVISIBLE, + /* 0x10 */ DB_XLU_LIST_INVISIBLE, + /* 0x11 */ DB_LIST_Z_XLU, + /* 0x12 */ DB_LIST_2D_SCREEN, + /* 0x13 */ DB_LIST_MIDDLE, + /* 0x14 */ DB_LIST_3D_LAST, + }; + + void set2DOpa(dDlst_base_c* dlst) { set(mp2DOpaSet[0], mp2DOpaSet[1], dlst); } + void set2DOpaTop(dDlst_base_c* dlst) { set(mp2DOpaTopSet[0], mp2DOpaTopSet[1], dlst); } view_class* getView() { return mView; } void setView(view_class* view) { mView = view; } void setWindow(dDlst_window_c* window) { mWindow = window; } void setViewport(view_port_class* port) { mViewport = port; } - J3DDrawBuffer* getOpaListFilter() { return mListFilter; } - J3DDrawBuffer* getOpaListP0() { return mListP0; } - J3DDrawBuffer* getOpaListPacket() { return mOpaListPacket; } + J3DDrawBuffer* getOpaListFilter() { return mDrawBuffers[DB_LIST_FILTER]; } + J3DDrawBuffer* getOpaListP0() { return mDrawBuffers[DB_LIST_P0]; } + J3DDrawBuffer* getOpaListPacket() { return mDrawBuffers[DB_OPA_LIST_PACKET]; } void setXluDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, XLU_BUFFER); } void setOpaDrawList(J3DDrawBuffer* buffer) { j3dSys.setDrawBuffer(buffer, OPA_BUFFER); } - void setXluListSky() { setXluDrawList(mpXluListSky); } - void setOpaListSky() { setOpaDrawList(mOpaListSky); } - void setXluListDark() { setXluDrawList(mXluListDark); } - void setOpaListDark() { setOpaDrawList(mOpaListDark); } - void setOpaList() { setOpaDrawList(mOpaList); } - void setXluList() { setXluDrawList(mXluList); } - void setOpaListItem3D() { setOpaDrawList(mOpaListItem3d); } - void setXluListItem3D() { setXluDrawList(mXluListItem3d); } - void setXluListBG() { setXluDrawList(mXluListBG); } - void setOpaListBG() { setOpaDrawList(mOpaListBG); } - void setXluList2DScreen() { setXluDrawList(mList2DScreen); } + void setXluListSky() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_SKY]); } + void setOpaListSky() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); } + void setXluListDark() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); } + void setOpaListDark() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK]); } + void setOpaList() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST]); } + void setXluList() { setXluDrawList(mDrawBuffers[DB_XLU_LIST]); } + void setOpaListItem3D() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_ITEM3D]); } + void setXluListItem3D() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_ITEM3D]); } + void setXluListBG() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_BG]); } + void setOpaListBG() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_BG]); } + void setXluList2DScreen() { setXluDrawList(mDrawBuffers[DB_LIST_2D_SCREEN]); } void peekZdata() { mPeekZ.peekData(); } @@ -259,52 +309,25 @@ public: param_6); } - static void offWipe() { data_80450ED0 = 0; } + static void offWipe() { mWipe = 0; } static f32 getWipeRate() { return mWipeRate; } - static u8 mWipeDlst[72]; - static u8 mWipeColor[4]; + static dDlst_2DT2_c mWipeDlst; + static GXColor mWipeColor; static f32 mWipeRate; static f32 mWipeSpeed[1 + 1 /* padding */]; + static u8 mWipe; private: - /* 0x00000 */ J3DDrawBuffer* mOpaListSky; - /* 0x00004 */ J3DDrawBuffer* mpXluListSky; - /* 0x00008 */ J3DDrawBuffer* mListP0; - /* 0x0000C */ J3DDrawBuffer* mOpaListBG; - /* 0x00010 */ J3DDrawBuffer* mXluListBG; - /* 0x00014 */ J3DDrawBuffer* mOpaListDarkBG; - /* 0x00018 */ J3DDrawBuffer* mXluListDarkBG; - /* 0x0001C */ J3DDrawBuffer* mOpaList; - /* 0x00020 */ J3DDrawBuffer* mXluList; - /* 0x00024 */ J3DDrawBuffer* mOpaListDark; - /* 0x00028 */ J3DDrawBuffer* mXluListDark; - /* 0x0002C */ J3DDrawBuffer* mOpaListPacket; - /* 0x00030 */ J3DDrawBuffer* mListFilter; - /* 0x00034 */ J3DDrawBuffer* mOpaListItem3d; - /* 0x00038 */ J3DDrawBuffer* mXluListItem3d; - /* 0x0003C */ J3DDrawBuffer* mOpaListInvisible; - /* 0x00040 */ J3DDrawBuffer* mXluListInvisible; - /* 0x00044 */ J3DDrawBuffer* mListZxlu; - /* 0x00048 */ J3DDrawBuffer* mList2DScreen; - /* 0x0004C */ J3DDrawBuffer* mListMiddle; - /* 0x00050 */ J3DDrawBuffer* mList3Dlast; - /* 0x00054 */ dDlst_list_c** field_0x54; // array? - /* 0x00058 */ u8 field_0x58[0xC]; - /* 0x00064 */ dDlst_list_c* field_0x64; - /* 0x00068 */ dDlst_list_c** field_0x68; - /* 0x0006C */ dDlst_list_c** field_0x6c; // array? - /* 0x00070 */ u8 field_0x70[0x3C]; - /* 0x000AC */ dDlst_base_c** field_0xac; - /* 0x000B0 */ dDlst_base_c** field_0xb0; - /* 0x000B4 */ dDlst_list_c** field_0xb4; // array? - /* 0x000B8 */ u8 field_0xb8[0xFC]; - /* 0x001B4 */ dDlst_base_c** field_0x1b4; - /* 0x001B8 */ dDlst_base_c** field_0x1b8; - /* 0x001BC */ dDlst_list_c** field_0x1bc; // array? - /* 0x001C0 */ u8 field_0x1c0[0x7C]; - /* 0x0023C */ dDlst_list_c* field_0x23c; - /* 0x00240 */ dDlst_list_c** field_0x240; + /* 0x00000 */ J3DDrawBuffer* mDrawBuffers[21]; + /* 0x00054 */ dDlst_base_c** mpCopy2DDraw[4]; + /* 0x00064 */ dDlst_base_c** mpCopy2DSet[2]; + /* 0x0006C */ dDlst_base_c** mp2DOpaTopDraw[16]; + /* 0x000AC */ dDlst_base_c** mp2DOpaTopSet[2]; + /* 0x000B4 */ dDlst_base_c** mp2DOpaDraw[64]; + /* 0x001B4 */ dDlst_base_c** mp2DOpaSet[2]; + /* 0x001BC */ dDlst_base_c** mp2DXluDraw[32]; + /* 0x0023C */ dDlst_base_c** mp2DXluSet[2]; /* 0x00244 */ dDlst_window_c* mWindow; /* 0x00248 */ view_port_class* mViewport; /* 0x0024C */ view_class* mView; @@ -312,9 +335,8 @@ private: /* 0x0025C */ dDlst_shadowControl_c mShadowControl; /* 0x16154 */ mDoExt_3DlineMatSortPacket m3DLineMatSortPacket[3]; /* 0x16190 */ dDlst_peekZ_c mPeekZ; - /* 0x16198 */ u8 field_0x16198[8]; // might be part of peekZ -}; // Size: 0x161A0 +}; // Size: 0x16394 -STATIC_ASSERT(sizeof(dDlst_list_c) == 0x161A0); +STATIC_ASSERT(sizeof(dDlst_list_c) == 0x16394); #endif /* D_D_DRAWLIST_H */ diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 07811d479da..6cddd5d1d1d 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -250,23 +250,22 @@ struct dStage_DMap_c { }; struct dStage_MapEvent_dt_c { - u8 mType; - u8 field_0x1[3 - 1]; - u8 field_0x3; - u8 field_0x4; - u8 field_0x5; - u8 field_0x6; - u8 field_0x7; - u8 field_0x8; - u8 field_0x9; - u8 field_0xA[0xD - 0xA]; - char mName[6]; - u16 field_0x14; - u8 field_0x16; - u8 field_0x17; - u8 field_0x18; - u8 field_0x19[0x1B - 0x19]; - u8 field_0x1B; + /* 0x00 */ u8 mType; + /* 0x01 */ u8 field_0x1[3 - 1]; + /* 0x03 */ u8 field_0x3; + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5; + /* 0x06 */ u8 mPriority; + /* 0x07 */ u8 field_0x7; + /* 0x08 */ u8 field_0x8; + /* 0x09 */ u8 field_0x9; + /* 0x0A */ u8 field_0xA[0xD - 0xA]; + /* 0x0D */ char mName[9]; + /* 0x16 */ u8 field_0x16; + /* 0x17 */ u8 field_0x17; + /* 0x18 */ u8 mSeType; // 1: RIDDLE_A, 2: RIDDLE_B + /* 0x19 */ u8 field_0x19[0x1B - 0x19]; + /* 0x1B */ u8 mSwitch; }; // SIZE = 0x1C struct dStage_MapEventInfo_c { diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h index a80e4ff543e..58b6634557c 100644 --- a/include/d/d_vibration.h +++ b/include/d/d_vibration.h @@ -24,42 +24,36 @@ public: static u8 const CQ_patt[80]; private: - u32 field_0x0; - u32 field_0x4; - u32 field_0x8; - u32 field_0xc; - u32 field_0x10; - u32 field_0x14; - float field_0x18; - float field_0x1c; - float field_0x20; - u32 field_0x24; - u32 field_0x28; - u32 field_0x2c; - u32 field_0x30; - u32 field_0x34; - u32 field_0x38; - u32 field_0x3c; - float field_0x40; - float field_0x44; - float field_0x48; - u32 field_0x4c; - u32 field_0x50; - u32 field_0x54; - u32 field_0x58; - u32 field_0x5c; - u32 field_0x60; - u32 field_0x64; - u32 field_0x68; - u32 field_0x6c; - u32 field_0x70; - u32 field_0x74; - u32 field_0x78; - u32 field_0x7c; - u32 field_0x80; - u32 field_0x84; - u32 field_0x88; - u32 field_0x8c; -}; + class { + public: + class { + public: + /* 0x00 */ u32 field_0x0; + /* 0x04 */ int field_0x4; + /* 0x08 */ s32 field_0x8; + /* 0x0C */ s32 field_0xc; + /* 0x10 */ s32 field_0x10; + /* 0x14 */ int field_0x14; + /* 0x18 */ cXyz field_0x18; + /* 0x24 */ u32 field_0x24; + } mShock, mQuake; + } /* 0x00 */ field_0x0; + /* 0x50 */ u32 field_0x50; + /* 0x54 */ int field_0x54; + /* 0x58 */ s32 field_0x58; + /* 0x5C */ s32 field_0x5c; + /* 0x60 */ u32 field_0x60; + /* 0x64 */ u32 field_0x64; + /* 0x68 */ u32 field_0x68; + /* 0x6C */ u32 field_0x6c; + /* 0x70 */ u32 field_0x70; + /* 0x74 */ u32 field_0x74; + /* 0x78 */ u32 field_0x78; + /* 0x7C */ u32 field_0x7c; + /* 0x80 */ u32 field_0x80; + /* 0x84 */ u32 field_0x84; + /* 0x88 */ s32 field_0x88; + /* 0x8C */ u32 field_0x8c; +}; // Size: 0x90 #endif /* D_D_VIBRATION_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index c8b7cc9c1d3..04a9a610cb2 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -15,7 +15,7 @@ public: /* 0x00 */ u16 mEventType; /* 0x02 */ u16 mFlag; - /* 0x04 */ u16 field_0x04; + /* 0x04 */ u16 mHindFlag; /* 0x08 */ fopAc_ac_c* mActor1; /* 0x0C */ fopAc_ac_c* mActor2; /* 0x10 */ s16 mEventId; @@ -28,25 +28,50 @@ STATIC_ASSERT(sizeof(dEvt_order_c) == 0x18); typedef int (*SkipFunc)(void*, int); +enum EventMode { + /* 0x0 */ EVT_MODE_NONE, + /* 0x1 */ EVT_MODE_TALK, + /* 0x2 */ EVT_MODE_DEMO, + /* 0x3 */ +}; + +enum EventType { + /* 0x0 */ EVT_TYPE_TALK, + /* 0x1 */ EVT_TYPE_DOOR, + /* 0x2 */ EVT_TYPE_OTHER, + /* 0x3 */ EVT_TYPE_COMPULSORY, + /* 0x4 */ EVT_TYPE_POTENTIAL, + /* 0x5 */ EVT_TYPE_ITEM, + /* 0x6 */ EVT_TYPE_SHOWITEM_X, + /* 0x7 */ EVT_TYPE_SHOWITEM_Y, + /* 0xA */ EVT_TYPE_CATCH = 10, + /* 0xB */ EVT_TYPE_TREASURE, +}; + +enum EventStatus { + /* 0x0 */ STATUS_NONE, +}; + class dEvt_control_c { public: dEvt_control_c(); - s32 orderOld(u16, u16, u16, u16, void*, void*, void const*); + s32 orderOld(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5, + void const* param_6); s32 order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, void* param_5, s16 eventID, u8 infoIdx); - void setParam(dEvt_order_c*); - s32 beforeFlagProc(dEvt_order_c*); - void afterFlagProc(dEvt_order_c*); - int commonCheck(dEvt_order_c*, u16, u16); - int talkCheck(dEvt_order_c*); - int talkXyCheck(dEvt_order_c*); - int catchCheck(dEvt_order_c*); + void setParam(dEvt_order_c* p_order); + s32 beforeFlagProc(dEvt_order_c* p_order); + void afterFlagProc(dEvt_order_c* p_order); + int commonCheck(dEvt_order_c* p_order, u16 condition, u16 command); + int talkCheck(dEvt_order_c* p_order); + int talkXyCheck(dEvt_order_c* p_order); + int catchCheck(dEvt_order_c* p_order); int talkEnd(); - int demoCheck(dEvt_order_c*); + int demoCheck(dEvt_order_c* p_order); int demoEnd(); - int potentialCheck(dEvt_order_c*); - int doorCheck(dEvt_order_c*); - int itemCheck(dEvt_order_c*); + int potentialCheck(dEvt_order_c* p_order); + int doorCheck(dEvt_order_c* p_order); + int itemCheck(dEvt_order_c* p_order); int endProc(); int change(); int entry(); @@ -64,20 +89,20 @@ public: BOOL compulsory(void*, char const*, u16); void remove(); dStage_MapEvent_dt_c* getStageEventDt(); - void sceneChange(int); + void sceneChange(int exitId); u32 getPId(void*); void* convPId(unsigned int); - void* getStbDemoData(char*); - static dStage_MapEvent_dt_c* searchMapEventData(u8, s32); - static dStage_MapEvent_dt_c* searchMapEventData(u8); - s16 runningEventID(s16); - void setPt1(void*); - void setPt2(void*); - void setPtT(void*); - void setPtI(void*); - void setPtI_Id(unsigned int); - void setPtD(void*); - void setGtItm(u8); + void* getStbDemoData(char* resName); + static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID, s32 roomNo); + static dStage_MapEvent_dt_c* searchMapEventData(u8 mapToolID); + s16 runningEventID(s16 eventID); + void setPt1(void* ptr); + void setPt2(void* ptr); + void setPtT(void* ptr); + void setPtI(void* ptr); + void setPtI_Id(unsigned int id); + void setPtD(void* ptr); + void setGtItm(u8 itemNo); void isOrderOK(); u16 chkFlag2(u16 flag) { return flag & mFlag2; } @@ -111,9 +136,9 @@ public: /* 0x0DA */ u16 mFlag2; /* 0x0DC */ u16 mHindFlag; /* 0x0DE */ s16 mSpecifiedEvent; // name maybe wrong - /* 0x0E0 */ s16 field_0xe0; + /* 0x0E0 */ s16 mEventID; /* 0x0E2 */ s8 mNum; - /* 0x0E3 */ s8 field_0xe3; + /* 0x0E3 */ s8 mOrderIdx; /* 0x0E4 */ u8 mMode; /* 0x0E5 */ u8 mEventStatus; /* 0x0E6 */ u8 field_0xe6; @@ -137,7 +162,7 @@ public: /* 0x110 */ int mSkipFade; /* 0x114 */ char mSkipEventName[20]; /* 0x128 */ u8 mCompulsory; - /* 0x129 */ bool field_0x129; + /* 0x129 */ bool mRoomInfoSet; /* 0x12C */ int mRoomNo; }; // Size = 0x130 diff --git a/include/d/event/d_event_data.h b/include/d/event/d_event_data.h index 5d3a09031cb..b5857f51413 100644 --- a/include/d/event/d_event_data.h +++ b/include/d/event/d_event_data.h @@ -116,11 +116,11 @@ public: s32 unk; }; - void specialProc_WaitStart(int); + void specialProc_WaitStart(int index); void specialProc_WaitProc(int); void specialProc(); void init(); - void advanceCut(int); + void advanceCut(int cut); void specialProcLight(); void specialProcMessage(); void specialProcSound(); @@ -159,7 +159,7 @@ class dEvDtEvent_c { public: int finishCheck(); int forceFinish(); - void specialStaffProc(dEvDtStaff_c*); + void specialStaffProc(dEvDtStaff_c* p_staff); int getNStaff() { return mNStaff; } int getStaff(int idx) { return mStaff[idx]; } char* getName() { return mName; } @@ -183,9 +183,9 @@ public: class dEvDtFlag_c { public: dEvDtFlag_c() {} - BOOL flagCheck(int); - BOOL flagSet(int); - BOOL flagMaxCheck(int); + BOOL flagCheck(int flag); + BOOL flagSet(int flag); + BOOL flagMaxCheck(int flag); void init(); #define FlagMax 0x2800 @@ -199,9 +199,9 @@ public: dEvDtBase_c() { init(); } ~dEvDtBase_c() {} int init(); - int init(char*, int); - void advanceCut(dEvDtEvent_c*); - BOOL advanceCutLocal(dEvDtStaff_c*); + int init(char* p_data, int roomNo); + void advanceCut(dEvDtEvent_c* p_event); + BOOL advanceCutLocal(dEvDtStaff_c* p_staff); event_binary_data_header* getHeaderP() { return mHeaderP; } dEvDtStaff_c* getStaffP(int i) { return &mStaffP[i]; } diff --git a/include/d/event/d_event_manager.h b/include/d/event/d_event_manager.h index 74f48b1a0ef..1d8177b925c 100644 --- a/include/d/event/d_event_manager.h +++ b/include/d/event/d_event_manager.h @@ -8,62 +8,66 @@ class dEvent_exception_c { public: dEvent_exception_c() { mEventInfoIdx = -1; } void init(); - s32 setStartDemo(int); + s32 setStartDemo(int mapToolID); const char* getEventName(); // private: - s32 mEventInfoIdx; - u8 field_0x4; - u8 field_0x5; - u8 field_0x6; - u8 field_0x7; - s32 mState; + /* 0x0 */ s32 mEventInfoIdx; + /* 0x4 */ u8 field_0x4; + /* 0x5 */ u8 field_0x5; + /* 0x6 */ u8 field_0x6; + /* 0x7 */ u8 field_0x7; + /* 0x8 */ s32 mState; }; +#define EVT_SE_RIDDLE_A 1 +#define EVT_SE_RIDDLE_B 2 + class dEvent_manager_c { public: - void* getSubstance(dEvDtData_c*, int); + void* getSubstance(dEvDtData_c* p_data, int type); dEvent_manager_c(); ~dEvent_manager_c() {} int create(); - bool setObjectArchive(char*); + bool setObjectArchive(char* arcName); void demoInit(); - void roomInit(int); - void roomFinish(int); + void roomInit(int roomNo); + void roomFinish(int roomNo); int orderStartDemo(); void remove(); - void startProc(dEvDtEvent_c*); - void closeProc(dEvDtEvent_c*); - void endProc(s16, int); + void startProc(dEvDtEvent_c* p_evnt); + void closeProc(dEvDtEvent_c* p_evnt); + void endProc(s16 eventID, int close); void Sequencer(); void Experts(); - dEvDtEvent_c* getEventData(s16); + dEvDtEvent_c* getEventData(s16 eventCompositId); dEvDtEvent_c* getEventData(s16, int); - s16 getEventIdx(char const*, u8, s32); - s16 getEventIdx(fopAc_ac_c*, u8); - s16 getEventIdx(fopAc_ac_c*, char const*, u8); - int isMapToolCamera(u8, s32); - int order(s16); - int startCheck(s16); - int startCheckOld(char const*); + s16 getEventIdx(char const* eventName, u8 mapToolID, s32 roomNo); + s16 getEventIdx(fopAc_ac_c* pActor, u8 mapToolID); + s16 getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID); + int isMapToolCamera(u8 mapToolID, s32 roomNo); + int order(s16 eventCompositId); + int startCheck(s16 eventCompositId); + int startCheckOld(char const* name); int endCheck(s16); - int endCheckOld(char const*); - int getMyStaffId(char const*, fopAc_ac_c*, int); - int getIsAddvance(int); - int getMyActIdx(int, char const* const*, int, int, int); - char* getMyNowCutName(int); - dEvDtData_c* getMyDataP(int, char const*, int); - void* getMySubstanceP(int, char const*, int); - int getMySubstanceNum(int, char const*); - void cutEnd(int); - int getEventPrio(fopAc_ac_c*, s16); - void issueStaff(char const*); - void cancelStaff(char const*); - void setGoal(cXyz*); + int endCheckOld(char const* name); + int getMyStaffId(char const* staffName, fopAc_ac_c* pActor, int tagId); + int getIsAddvance(int staffIdx); + int getMyActIdx(int staffIdx, char const* const* param_1, int param_2, int param_3, + int param_4); + char* getMyNowCutName(int cutIndex); + dEvDtData_c* getMyDataP(int index, char const* name, int type); + void* getMySubstanceP(int index, char const* name, int type); + int getMySubstanceNum(int index, char const* name); + void cutEnd(int cutIndex); + int getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId); + void issueStaff(char const* name); + void cancelStaff(char const* name); + void setGoal(cXyz* p_goal); cXyz* getGoal(); const char* getRunEventName(); - fopAc_ac_c* specialCast_Shutter(s16, int); - fopAc_ac_c* specialCast(char const*, int); + fopAc_ac_c* specialCast_Shutter(s16 bsTypeId, int param_1); + fopAc_ac_c* specialCast(char const* name, int param_1); int ChkPresentEnd(); int checkStartDemo(); @@ -71,7 +75,7 @@ public: void setCameraPlay(int status) { mCameraPlay = status; } dEvDtBase_c& getBase() { return mEventList[mCurrentEventType]; } void setFlag(int flag) { mFlags.flagSet(flag); } - bool dataLoaded() { return mDataLoaded; } + bool dataLoaded() { return mDataLoaded; } int flagCheck(int flag) { return mFlags.flagCheck(flag); } static int getIndexCompositId(s16 param_0) { return param_0 != -1 ? (u8)param_0 : -1; } diff --git a/include/d/map/d_map_path.h b/include/d/map/d_map_path.h index b809043d8a4..23b511d6ae0 100644 --- a/include/d/map/d_map_path.h +++ b/include/d/map/d_map_path.h @@ -12,28 +12,49 @@ public: /* 0x02 */ u8 unk2; /* 0x03 */ u8 unk3; /* 0x04 */ u16* unk4; + }; // Size: 0x8 + + struct poly_class { + /* 0x00 */ u8 field_0x0; + /* 0x01 */ u8 field_0x1; + /* 0x04 */ u16* field_0x4; + }; // Size: 0x8 + + struct group_class { + /* 0x00 */ u8 field_0x0; + /* 0x01 */ u8 field_0x1; + /* 0x02 */ u8 field_0x2; + /* 0x03 */ u8 field_0x3; + /* 0x04 */ u8 field_0x4; + /* 0x08 */ dDrawPath_c::line_class* mpLine; + /* 0x0C */ u8 field_0xc[4]; + /* 0x10 */ dDrawPath_c::poly_class* mpPoly; + }; // Size: 0x14 + + struct floor_class { + /* 0x0 */ s8 field_0x0; + /* 0x1 */ u8 field_0x1; + /* 0x4 */ dDrawPath_c::group_class* mpGroup; + }; // Size: 0x8 + + struct room_class { + /* 0x0 */ u8 field_0x0; + /* 0x4 */ dDrawPath_c::floor_class* mpFloor; + /* 0x8 */ void* field_0x8; }; - struct poly_class {}; - - struct group_class {}; - - struct floor_class {}; - - struct room_class {}; - /* 8003CB00 */ void rendering(dDrawPath_c::group_class const*); /* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*); /* 8002AD3C */ virtual ~dDrawPath_c(); /* 8002ABF0 */ virtual bool isDrawType(int); - virtual void getColor(int) = 0; - /* 8002AD84 */ virtual void getLineColor(int, int); - virtual void getLineWidth(int) = 0; - virtual void isSwitch(dDrawPath_c::group_class const*) = 0; - virtual void isRenderingFloor(int) = 0; - virtual void getFirstRoomPointer() = 0; - virtual void getNextRoomPointer() = 0; + virtual GXColor* getColor(int) = 0; + /* 8002AD84 */ virtual GXColor* getLineColor(int, int); + virtual int getLineWidth(int) = 0; + virtual bool isSwitch(dDrawPath_c::group_class const*) = 0; + virtual bool isRenderingFloor(int) = 0; + virtual room_class* getFirstRoomPointer() = 0; + virtual room_class* getNextRoomPointer() = 0; /* 8003CCC4 */ virtual void drawPath(); /* 8003C94C */ virtual void rendering(dDrawPath_c::line_class const*); /* 8003CA40 */ virtual void rendering(dDrawPath_c::poly_class const*); @@ -55,7 +76,7 @@ public: virtual void afterDrawPath() = 0; virtual void preDrawPath() = 0; virtual void postDrawPath() = 0; - virtual void isDrawPath() = 0; + virtual bool isDrawPath() = 0; virtual void preRenderingMap() = 0; virtual void postRenderingMap() = 0; virtual GXColor* getBackColor() const = 0; @@ -75,7 +96,7 @@ public: /* 8003D6B8 */ virtual s32 getDecorationLineWidth(int); private: - /* 0x04 */ int field_0x4; + /* 0x04 */ void* field_0x4; /* 0x08 */ f32 field_0x8; /* 0x0C */ f32 field_0xc; /* 0x10 */ f32 field_0x10; @@ -87,4 +108,25 @@ private: /* 0x22 */ u16 field_0x22; }; // Size: 0x24 +struct dMpath_n { + class dTexObjAggregate_c { + public: + /* 8003C85C */ void create(); + /* 8003C8F4 */ void remove(); + /* 8003D740 */ ~dTexObjAggregate_c() { remove(); }; + + dTexObjAggregate_c() { + for (int i = 0; i < 7; i++) { + mp_texObj[i] = NULL; + } + } + + /* 0x0 */ GXTexObj* mp_texObj[7]; + }; + + static dTexObjAggregate_c m_texObjAgg; +}; + +STATIC_ASSERT(sizeof(dMpath_n::dTexObjAggregate_c) == 28); + #endif /* D_MAP_D_MAP_PATH_H */ diff --git a/include/d/map/d_map_path_dmap.h b/include/d/map/d_map_path_dmap.h index 37c2da358a5..210d09079f2 100644 --- a/include/d/map/d_map_path_dmap.h +++ b/include/d/map/d_map_path_dmap.h @@ -56,13 +56,13 @@ public: /* 8003FE18 */ virtual void draw(); /* 8002B150 */ virtual ~renderingDAmap_c(); - /* 8003FD9C */ virtual void isSwitch(dDrawPath_c::group_class const*); - /* 8003FE54 */ virtual void isRenderingFloor(int); - /* 80040134 */ virtual void getFirstRoomPointer(); - /* 800401E8 */ virtual void getNextRoomPointer(); + /* 8003FD9C */ virtual bool isSwitch(dDrawPath_c::group_class const*); + /* 8003FE54 */ virtual bool isRenderingFloor(int); + /* 80040134 */ virtual dDrawPath_c::room_class* getFirstRoomPointer(); + /* 800401E8 */ virtual dDrawPath_c::room_class* getNextRoomPointer(); /* 8003FF14 */ virtual void preDrawPath(); /* 8003FFC4 */ virtual void postDrawPath(); - /* 800402C0 */ virtual void isDrawPath(); + /* 800402C0 */ virtual bool isDrawPath(); /* 8003FE4C */ virtual GXColor* getBackColor() const; /* 800402E0 */ virtual bool getFirstDrawLayerNo(); /* 800402E8 */ virtual void getNextDrawLayerNo(int); diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h index 5462f54c37e..2d252e73a93 100644 --- a/include/d/menu/d_menu_window.h +++ b/include/d/menu/d_menu_window.h @@ -58,18 +58,18 @@ public: GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGB8, 0); GXBegin(GX_QUADS, GX_VTXFMT0, 4); - GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(), 0); + i_GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMinY(), 0); GXTexCoord2s8(0, 0); - GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY(), 0); + i_GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMinY(), 0); GXTexCoord2s8(1, 0); - GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY(), 0); + i_GXPosition3s16(mDoGph_gInf_c::getMaxX(), mDoGph_gInf_c::getMaxY(), 0); GXTexCoord2s8(1, 1); - GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY(), 0); + i_GXPosition3s16(mDoGph_gInf_c::getMinX(), mDoGph_gInf_c::getMaxY(), 0); GXTexCoord2s8(0, 1); - GXEnd(); + i_GXEnd(); } } */ /* 801FE2E8 */ virtual ~dDlst_MENU_CAPTURE_c(); diff --git a/include/d/meter/d_meter2_draw.h b/include/d/meter/d_meter2_draw.h index 7f6ebcd3bd1..8d4b45fefa5 100644 --- a/include/d/meter/d_meter2_draw.h +++ b/include/d/meter/d_meter2_draw.h @@ -9,6 +9,138 @@ #include "d/pane/d_pane_class.h" #include "dolphin/types.h" +enum dMeter2Draw_actionID { + /* 0x00 */ ACTION_STR_NONE, + /* 0x01 */ ACTION_STR_LET_GO, + /* 0x02 */ ACTION_STR_PEEK, + /* 0x03 */ ACTION_STR_ATTACK, + /* 0x04 */ ACTION_STR_PUT_AWAY, + /* 0x05 */ ACTION_STR_HOWL, + /* 0x06 */ ACTION_STR_OPEN, + /* 0x07 */ ACTION_STR_ENTER, + /* 0x08 */ ACTION_STR_CHECK, + /* 0x09 */ ACTION_STR_DASH, + /* 0x0A */ ACTION_STR_CROUCH, + /* 0x0B */ ACTION_STR_DEFEND, + /* 0x0C */ ACTION_STR_PICK_UP, + /* 0x0D */ ACTION_STR_DIG, + /* 0x0E */ ACTION_STR_EAT, + /* 0x0F */ ACTION_STR_SELECT, + /* 0x10 */ ACTION_STR_LOCK, + /* 0x11 */ ACTION_STR_SWITCH, + /* 0x12 */ ACTION_STR_BACK, + /* 0x13 */ ACTION_STR_THROW, + /* 0x14 */ ACTION_STR_PLACE, + /* 0x15 */ ACTION_STR_GRAB, + /* 0x16 */ ACTION_STR_GET_OFF, + /* 0x17 */ ACTION_STR_GET_ON, + /* 0x18 */ ACTION_STR_PADDLE, + /* 0x19 */ ACTION_STR_JUMP, + /* 0x1A */ ACTION_STR_READ, + /* 0x1B */ ACTION_STR_LOOK, + /* 0x1C */ ACTION_STR_SPEAK, + /* 0x1D */ ACTION_STR_LIFT, + /* 0x1E */ ACTION_STR_SWING, + /* 0x1F */ ACTION_STR_PICK_UP2, + /* 0x20 */ ACTION_STR_GET_ON2, + /* 0x21 */ ACTION_STR_GET_OFF2, + /* 0x22 */ ACTION_STR_CONFIRM, + /* 0x23 */ ACTION_STR_NEXT, + /* 0x24 */ ACTION_STR_INFO, + /* 0x25 */ ACTION_STR_NONE2, + /* 0x26 */ ACTION_STR_NONE3, + /* 0x27 */ ACTION_STR_NONE4, + /* 0x28 */ ACTION_STR_WHOOP, + /* 0x29 */ ACTION_STR_ZOOM, + /* 0x2A */ ACTION_STR_QUIT, + /* 0x2B */ ACTION_STR_PICK, + /* 0x2C */ ACTION_STR_BLOW, + /* 0x2D */ ACTION_STR_DODGE, + /* 0x2E */ ACTION_STR_CUT, + /* 0x2F */ ACTION_STR_HINT, + /* 0x30 */ ACTION_STR_FINISH, + /* 0x31 */ ACTION_STR_SET_FREE, + /* 0x32 */ ACTION_STR_DISMOUNT, + /* 0x33 */ ACTION_STR_DROP_DOWN, + /* 0x34 */ ACTION_STR_PICK_UP3, + /* 0x35 */ ACTION_STR_TAKE, + /* 0x36 */ ACTION_STR_HURRY, + /* 0x37 */ ACTION_STR_PULL_DOWN, + /* 0x38 */ ACTION_STR_PET, + /* 0x39 */ ACTION_STR_PICK_UP4, + /* 0x3A */ ACTION_STR_SHIELD_ATTACK, + /* 0x3B */ ACTION_STR_LISTEN, + /* 0x3C */ ACTION_STR_DRINK, + /* 0x3D */ ACTION_STR_ZOOM2, + /* 0x3E */ ACTION_STR_COVER, + /* 0x3F */ ACTION_STR_PUSH, + /* 0x40 */ ACTION_STR_RESIST, + /* 0x41 */ ACTION_STR_DIVE, + /* 0x42 */ ACTION_STR_PUT_TOGETHER, + /* 0x43 */ ACTION_STR_SKIP, + /* 0x44 */ ACTION_STR_SLAP, + /* 0x45 */ ACTION_STR_SNIFF, + /* 0x46 */ ACTION_STR_BITE, + /* 0x47 */ ACTION_STR_ROLL, + /* 0x48 */ ACTION_STR_FASTEN, + /* 0x49 */ ACTION_STR_GET_DOWN, + /* 0x4A */ ACTION_STR_HAWKEYE_OFF, + /* 0x4B */ ACTION_STR_DASH2, + /* 0x4C */ ACTION_STR_SWIM, + /* 0x4D */ ACTION_STR_CANT_SKIP, + /* 0x4E */ ACTION_STR_SENSE, + /* 0x4F */ ACTION_STR_NONE5, + /* 0x50 */ ACTION_STR_THROW2, + /* 0x51 */ ACTION_STR_LAND, + /* 0x52 */ ACTION_STR_HOOK, + /* 0x53 */ ACTION_STR_CHANGE_LOCKS, + /* 0x54 */ ACTION_STR_EQUIP, + /* 0x55 */ ACTION_STR_PULL, + /* 0x56 */ ACTION_STR_REEL, + /* 0x57 */ ACTION_STR_EXTRACT, + /* 0x58 */ ACTION_STR_SPIN, + /* 0x59 */ ACTION_STR_SWITCH2, + /* 0x5A */ ACTION_STR_SPIN_ATTACK, + /* 0x5B */ ACTION_STR_REEL_FAST, + /* 0x5C */ ACTION_STR_RAISE, + /* 0x5D */ ACTION_STR_RELEASE, + /* 0x5E */ ACTION_STR_CHECK2, + /* 0x5F */ ACTION_STR_MAP, + /* 0x60 */ ACTION_STR_ITEMS, + /* 0x61 */ ACTION_STR_INSERT, + /* 0x62 */ ACTION_STR_DRAW, + /* 0x63 */ ACTION_STR_STRIKE, + /* 0x64 */ ACTION_STR_BLANK, + /* 0x65 */ ACTION_STR_JUMP2, + /* 0x66 */ ACTION_STR_POINT_WII_REMOTE, + /* 0x67 */ ACTION_STR_FLIP, + /* 0x68 */ ACTION_STR_CHANGE_VIEW, + /* 0x69 */ ACTION_STR_ZOOM3, + /* 0x6A */ ACTION_STR_BACK2, + /* 0x6B */ ACTION_STR_CHANCE, + /* 0x6C */ ACTION_STR_SCOOP, + /* 0x6D */ ACTION_STR_SURVEY, + /* 0x6E */ ACTION_STR_CANCEL, + /* 0x6F */ ACTION_STR_SEIZE, + /* 0x70 */ ACTION_STR_COLLECTION, + /* 0x71 */ ACTION_STR_AREA_MAP, + /* 0x72 */ ACTION_STR_ACTION, + /* 0x73 */ ACTION_STR_SET_HOOK, + /* 0x74 */ ACTION_STR_TILT, + /* 0x75 */ ACTION_STR_THRUST, + /* 0x76 */ ACTION_STR_ROTATE, + /* 0x77 */ ACTION_STR_HELM_SPLITTER, + /* 0x78 */ ACTION_STR_MOVE, + /* 0x79 */ ACTION_STR_ROLL2, + /* 0x7A */ ACTION_STR_HOLD_ON, + /* 0x7B */ ACTION_STR_BITE2, + /* 0x7C */ ACTION_STR_HELP, + /* 0x7D */ ACTION_STR_ZOOM_IN, + /* 0x7E */ ACTION_STR_ZOOM_OUT, + /* 0x7F */ ACTION_STR_MOVE_CLOSER_TV, + /* 0x80 */ ACTION_STR_CHECK3, +}; + class dKantera_icon_c; class dMeter2Draw_c : public dDlst_base_c { diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 89a4644d7f3..bf07ea3be10 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -491,6 +491,10 @@ inline s16 dMeter2Info_getMsgKeyWaitTimer() { return g_meter2_info.getMsgKeyWaitTimer(); } +inline void dMeter2Info_onDirectUseItem(int param_0) { + g_meter2_info.onDirectUseItem(param_0); +} + char* dMeter2Info_getNumberTextureName(int pIndex); void dMeter2Info_recieveLetter(); u8 dMeter2Info_getNewLetterNum(); diff --git a/include/d/meter/d_meter_map.h b/include/d/meter/d_meter_map.h index b65ba6cc832..2cdc3ac04f2 100644 --- a/include/d/meter/d_meter_map.h +++ b/include/d/meter/d_meter_map.h @@ -19,8 +19,8 @@ public: /* 800284D0 */ virtual void draw(); /* 8002ADB0 */ virtual ~renderingAmap_c(); - /* 80028EE4 */ virtual void getLineColor(int, int); - /* 80028DD4 */ virtual void getLineWidth(int); + /* 80028EE4 */ virtual GXColor* getLineColor(int, int); + /* 80028DD4 */ virtual int getLineWidth(int); /* 80028A10 */ virtual void drawPath(); /* 80028A30 */ virtual void rendering(dDrawPath_c::line_class const*); /* 80028B3C */ virtual void rendering(dDrawPath_c::poly_class const*); @@ -68,8 +68,8 @@ public: /* 8002AB54 */ void _draw(); /* 8002AF20 */ virtual ~dMap_c(); - /* 800296EC */ virtual void isDrawType(int); - /* 80028DF4 */ virtual void getColor(int); + /* 800296EC */ virtual bool isDrawType(int); + /* 80028DF4 */ virtual GXColor* getColor(int); /* 800296F8 */ virtual void isRendAllRoom() const; /* 8002A254 */ virtual void getRoomNoSingle(); /* 8002A1DC */ virtual void isDrawRoom(int, int) const; diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h index 6b4383f8ba7..dbf173e88bb 100644 --- a/include/d/msg/d_msg_object.h +++ b/include/d/msg/d_msg_object.h @@ -136,7 +136,7 @@ public: /* 802383A4 */ void isMouthCheck(); /* 802383D0 */ static u32 getMessageID(); /* 802383E4 */ void getSmellTypeMessageID(); - /* 80238410 */ void setSmellType(u8); + /* 80238410 */ static void setSmellType(u8); /* 80238440 */ void getSelectCursorPos(); /* 8023846C */ static void setSelectCursorPos(u8); /* 8023849C */ void setPortalMessageID(u16); @@ -299,6 +299,10 @@ inline void dMsgObject_endFlowGroup() { dMsgObject_c::endFlowGroup(); } +inline void dMsgObject_setSmellType(u8 type) { + dMsgObject_c::setSmellType(type); +} + class dMsgObject_HowlHIO_c { public: diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index 932b72699d2..3659f4e4614 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -2,821 +2,16 @@ #define GX_H_ #include "dolphin/gx/GXDisplayList.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" #include "dolphin/mtx/mtx.h" #include "dolphin/mtx/mtx44.h" #include "dolphin/types.h" #include "global.h" -typedef struct _GXColor { - /* 0x0 */ u8 r; - /* 0x1 */ u8 g; - /* 0x2 */ u8 b; - /* 0x3 */ u8 a; -} GXColor; - -typedef struct _GXColorS10 { - /* 0x0 */ s16 r; - /* 0x2 */ s16 g; - /* 0x4 */ s16 b; - /* 0x6 */ s16 a; -} GXColorS10; - -typedef struct _GXRenderModeObj { - s32 vi_tv_mode; - u16 fb_width; - u16 efb_height; - u16 xfb_height; - u16 vi_x_origin; - u16 vi_y_origin; - u16 vi_width; - u16 vi_height; - s32 xfb_mode; - u8 field_rendering; - bool antialiasing; - u8 sample_pattern[12][2]; - u8 vfilter[7]; -} GXRenderModeObj; - -STATIC_ASSERT(sizeof(_GXRenderModeObj) == 60); - -typedef struct _GXTexObj { - /* 0x00 */ u32 texture_filter; - /* 0x04 */ u32 texture_lod; - /* 0x08 */ u32 texture_size; - /* 0x0C */ u32 texture_address; - /* 0x10 */ u32 user_data; - /* 0x14 */ u32 texture_format; - /* 0x18 */ u32 tlut_name; - /* 0x1C */ u16 texture_time_count; - /* 0x1E */ u8 texture_tile_type; - /* 0x1F */ u8 texture_flags; -} GXTexObj; - -typedef struct _GXTlutObj { - /* 0x0 */ u32 format; - /* 0x4 */ u32 address; - /* 0x8 */ u32 numEntries; -} GXTlutObj; - -typedef struct _GXLightObj { - /* 0x0 */ u32 data[16]; -} GXLightObj; - -typedef struct _GXFogAdjTable { - /* 0x0 */ u16 r[10]; -} GXFogAdjTable; - -typedef struct _GXFifoObj { - /* 0x00 */ void* base; - /* 0x04 */ u32 end; - /* 0x08 */ u32 size; - /* 0x0C */ u32 high_wtrmark; - /* 0x10 */ u32 low_wtrmark; - /* 0x14 */ void* read_ptr; - /* 0x18 */ void* write_ptr; - /* 0x1C */ void* rw_dst; - /* 0x20 */ u8 fifo_wrap; - /* 0x21 */ bool cpu_fifo_ready; - /* 0x22 */ bool gp_fifo_ready; - /* 0x23 */ u8 field_0x23[93]; -} GXFifoObj; // Size: 0x80 - -typedef struct _GXTexRegion { - /* 0x00 */ u8 dummy[0x10]; -} GXTexRegion; // Size: 0x10 - -typedef enum _GXPrimitive { - /* 0x80 */ GX_QUADS = 0x80, - /* 0x90 */ GX_TRIANGLES = 0x90, - /* 0x98 */ GX_TRIANGLESTRIP = 0x98, - /* 0xA0 */ GX_TRIANGLEFAN = 0xA0, - /* 0xA8 */ GX_LINES = 0xA8, - /* 0xB0 */ GX_LINESTRIP = 0xB0, - /* 0xB8 */ GX_POINTS = 0xB8, -} GXPrimitive; - -typedef enum _GXCullMode { - /* 0x0 */ GX_CULL_NONE, - /* 0x1 */ GX_CULL_FRONT, - /* 0x2 */ GX_CULL_BACK, - /* 0x3 */ GX_CULL_ALL -} GXCullMode; - -typedef enum _GXBool { - /* 0x0 */ GX_FALSE, - /* 0x1 */ GX_TRUE, - /* 0x0 */ GX_DISABLE = 0, - /* 0x1 */ GX_ENABLE -} GXBool; - -typedef enum _GXTexMapID { - /* 0x000 */ GX_TEXMAP0, - /* 0x001 */ GX_TEXMAP1, - /* 0x002 */ GX_TEXMAP2, - /* 0x003 */ GX_TEXMAP3, - /* 0x004 */ GX_TEXMAP4, - /* 0x005 */ GX_TEXMAP5, - /* 0x006 */ GX_TEXMAP6, - /* 0x007 */ GX_TEXMAP7, - /* 0x008 */ GX_MAX_TEXMAP, - /* 0x0FF */ GX_TEXMAP_NULL = 255, - /* 0x100 */ GX_TEXMAP_DISABLE, -} GXTexMapID; - -typedef enum _GXTevStageID { - /* 0x00 */ GX_TEVSTAGE0, - /* 0x01 */ GX_TEVSTAGE1, - /* 0x02 */ GX_TEVSTAGE2, - /* 0x03 */ GX_TEVSTAGE3, - /* 0x04 */ GX_TEVSTAGE4, - /* 0x05 */ GX_TEVSTAGE5, - /* 0x06 */ GX_TEVSTAGE6, - /* 0x07 */ GX_TEVSTAGE7, - /* 0x08 */ GX_TEVSTAGE8, - /* 0x09 */ GX_TEVSTAGE9, - /* 0x0A */ GX_TEVSTAGE10, - /* 0x0B */ GX_TEVSTAGE11, - /* 0x0C */ GX_TEVSTAGE12, - /* 0x0D */ GX_TEVSTAGE13, - /* 0x0E */ GX_TEVSTAGE14, - /* 0x0F */ GX_TEVSTAGE15, - /* 0x10 */ GX_MAX_TEVSTAGE, -} GXTevStageID; - -typedef enum _GXTexCoordID { - /* 0x00 */ GX_TEXCOORD0, - /* 0x01 */ GX_TEXCOORD1, - /* 0x02 */ GX_TEXCOORD2, - /* 0x03 */ GX_TEXCOORD3, - /* 0x04 */ GX_TEXCOORD4, - /* 0x05 */ GX_TEXCOORD5, - /* 0x06 */ GX_TEXCOORD6, - /* 0x07 */ GX_TEXCOORD7, - /* 0x08 */ GX_MAXCOORD, - /* 0xFF */ GX_TEXCOORD_NULL = 255, -} GXTexCoordID; - -typedef enum _GXChannelID { - /* 0x00 */ GX_COLOR0, - /* 0x01 */ GX_COLOR1, - /* 0x02 */ GX_ALPHA0, - /* 0x03 */ GX_ALPHA1, - /* 0x04 */ GX_COLOR0A0, - /* 0x05 */ GX_COLOR1A1, - /* 0x06 */ GX_COLOR_ZERO, - /* 0x07 */ GX_ALPHA_BUMP, - /* 0x08 */ GX_ALPHA_BUMPN, - /* 0xFF */ GX_COLOR_NULL = 255, -} GXChannelID; - -typedef enum _GXColorSrc { - /* 0x0 */ GX_SRC_REG, - /* 0x1 */ GX_SRC_VTX, -} GXColorSrc; - -typedef enum _GXLightID { - /* 0x000 */ GX_LIGHT_NULL = 0, - /* 0x001 */ GX_LIGHT0 = 1 << 0, - /* 0x002 */ GX_LIGHT1 = 1 << 1, - /* 0x004 */ GX_LIGHT2 = 1 << 2, - /* 0x008 */ GX_LIGHT3 = 1 << 3, - /* 0x010 */ GX_LIGHT4 = 1 << 4, - /* 0x020 */ GX_LIGHT5 = 1 << 5, - /* 0x040 */ GX_LIGHT6 = 1 << 6, - /* 0x080 */ GX_LIGHT7 = 1 << 7, - /* 0x100 */ GX_MAX_LIGHT = 1 << 8, -} GXLightID; - -typedef enum _GXDiffuseFn { - /* 0x0 */ GX_DF_NONE, - /* 0x1 */ GX_DF_SIGN, - /* 0x2 */ GX_DF_CLAMP, -} GXDiffuseFn; - -typedef enum _GXAttnFn { - /* 0x0 */ GX_AF_SPEC, - /* 0x1 */ GX_AF_SPOT, - /* 0x2 */ GX_AF_NONE, -} GXAttnFn; - -typedef enum _GXDistAttnFn { - /* 0x0 */ GX_DA_OFF, - /* 0x1 */ GX_DA_GENTLE, - /* 0x2 */ GX_DA_MEDIUM, - /* 0x3 */ GX_DA_STEEP -} GXDistAttnFn; - -typedef enum _GXSpotFn { - /* 0x0 */ GX_SP_OFF, - /* 0x1 */ GX_SP_FLAT, - /* 0x2 */ GX_SP_COS, - /* 0x3 */ GX_SP_COS2, - /* 0x4 */ GX_SP_SHARP, - /* 0x5 */ GX_SP_RING1, - /* 0x6 */ GX_SP_RING2 -} GXSpotFn; - -typedef enum _GXTevMode { - /* 0x0 */ GX_MODULATE, - /* 0x1 */ GX_DECAL, - /* 0x2 */ GX_BLEND, - /* 0x3 */ GX_REPLACE, - /* 0x4 */ GX_PASSCLR, -} GXTevMode; - -typedef enum _GXBlendMode { - /* 0x0 */ GX_BM_NONE, - /* 0x1 */ GX_BM_BLEND, - /* 0x2 */ GX_BM_LOGIC, - /* 0x3 */ GX_BM_SUBTRACT, - /* 0x4 */ GX_MAX_BLENDMODE, -} GXBlendMode; - -typedef enum _GXBlendFactor { - /* 0x0 */ GX_BL_ZERO, - /* 0x1 */ GX_BL_ONE, - /* 0x2 */ GX_BL_SRC_COLOR, - /* 0x2 */ GX_BL_DST_COLOR = 2, - /* 0x3 */ GX_BL_INV_SRC_COLOR, - /* 0x3 */ GX_BL_INV_DST_COLOR = 3, - /* 0x4 */ GX_BL_SRC_ALPHA, - /* 0x5 */ GX_BL_INV_SRC_ALPHA, - /* 0x6 */ GX_BL_DST_ALPHA, - /* 0x7 */ GX_BL_INV_DST_ALPHA, -} GXBlendFactor; - -typedef enum _GXLogicOp { - /* 0x0 */ GX_LO_CLEAR, - /* 0x1 */ GX_LO_AND, - /* 0x2 */ GX_LO_REV_AND, - /* 0x3 */ GX_LO_COPY, - /* 0x4 */ GX_LO_INV_AND, - /* 0x5 */ GX_LO_NOOP, - /* 0x6 */ GX_LO_XOR, - /* 0x7 */ GX_LO_OR, - /* 0x8 */ GX_LO_NOR, - /* 0x9 */ GX_LO_EQUIV, - /* 0xA */ GX_LO_INV, - /* 0xB */ GX_LO_REV_OR, - /* 0xC */ GX_LO_INV_COPY, - /* 0xD */ GX_LO_INV_OR, - /* 0xE */ GX_LO_NAND, - /* 0xF */ GX_LO_SET, -} GXLogicOp; - -typedef enum _GXVtxFmt { - /* 0x0 */ GX_VTXFMT0, - /* 0x1 */ GX_VTXFMT1, - /* 0x2 */ GX_VTXFMT2, - /* 0x3 */ GX_VTXFMT3, - /* 0x4 */ GX_VTXFMT4, - /* 0x5 */ GX_VTXFMT5, - /* 0x6 */ GX_VTXFMT6, - /* 0x7 */ GX_VTXFMT7, - /* 0x8 */ GX_MAX_VTXFMT, -} GXVtxFmt; - -typedef enum _GXAttr { - /* 0x00 */ GX_VA_PNMTXIDX, - /* 0x01 */ GX_VA_TEX0MTXIDX, - /* 0x02 */ GX_VA_TEX1MTXIDX, - /* 0x03 */ GX_VA_TEX2MTXIDX, - /* 0x04 */ GX_VA_TEX3MTXIDX, - /* 0x05 */ GX_VA_TEX4MTXIDX, - /* 0x06 */ GX_VA_TEX5MTXIDX, - /* 0x07 */ GX_VA_TEX6MTXIDX, - /* 0x08 */ GX_VA_TEX7MTXIDX, - /* 0x09 */ GX_VA_POS, - /* 0x0A */ GX_VA_NRM, - /* 0x0B */ GX_VA_CLR0, - /* 0x0C */ GX_VA_CLR1, - /* 0x0D */ GX_VA_TEX0, - /* 0x0E */ GX_VA_TEX1, - /* 0x0F */ GX_VA_TEX2, - /* 0x10 */ GX_VA_TEX3, - /* 0x11 */ GX_VA_TEX4, - /* 0x12 */ GX_VA_TEX5, - /* 0x13 */ GX_VA_TEX6, - /* 0x14 */ GX_VA_TEX7, - /* 0x15 */ GX_POS_MTX_ARRAY, - /* 0x16 */ GX_NRM_MTX_ARRAY, - /* 0x17 */ GX_TEX_MTX_ARRAY, - /* 0x18 */ GX_LIGHT_ARRAY, - /* 0x19 */ GX_VA_NBT, - /* 0x1A */ GX_VA_MAX_ATTR, - /* 0xFF */ GX_VA_NULL = 255, -} GXAttr; - -typedef enum _GXCompCnt { - /* 0x0 */ GX_POS_XY = 0, - /* 0x1 */ GX_POS_XYZ = 1, - /* 0x0 */ GX_NRM_XYZ = 0, - /* 0x1 */ GX_NRM_NBT = 1, - /* 0x2 */ GX_NRM_NBT3 = 2, - /* 0x0 */ GX_CLR_RGB = 0, - /* 0x1 */ GX_CLR_RGBA = 1, - /* 0x0 */ GX_TEX_S = 0, - /* 0x1 */ GX_TEX_ST = 1, -} GXCompCnt; - -typedef enum _GXCompType { - /* 0x0 */ GX_U8, - /* 0x1 */ GX_S8, - /* 0x2 */ GX_U16, - /* 0x3 */ GX_S16, - /* 0x4 */ GX_F32, - /* 0x0 */ GX_RGB565 = 0, - /* 0x1 */ GX_RGB8, - /* 0x2 */ GX_RGBX8, - /* 0x3 */ GX_RGBA4, - /* 0x4 */ GX_RGBA6, - /* 0x5 */ GX_RGBA8, -} GXCompType; - -typedef enum _GXAttrType { - /* 0x0 */ GX_NONE, - /* 0x1 */ GX_DIRECT, - /* 0x2 */ GX_INDEX8, - /* 0x3 */ GX_INDEX16, -} GXAttrType; - -typedef enum _GXTevOp { - /* 0x0 */ GX_TEV_ADD, - /* 0x1 */ GX_TEV_SUB, - /* 0x8 */ GX_TEV_COMP_R8_GT = 8, - /* 0x9 */ GX_TEV_COMP_R8_EQ, - /* 0xA */ GX_TEV_COMP_GR16_GT, - /* 0xB */ GX_TEV_COMP_GR16_EQ, - /* 0xC */ GX_TEV_COMP_BGR24_GT, - /* 0xD */ GX_TEV_COMP_BGR24_EQ, - /* 0xE */ GX_TEV_COMP_A8_GT, - /* 0xE */ GX_TEV_COMP_RGB8_GT = 14, - /* 0xF */ GX_TEV_COMP_RGB8_EQ, - /* 0xF */ GX_TEV_COMP_A8_EQ = 15, -} GXTevOp; - -typedef enum _GXTevBias { - /* 0x0 */ GX_TB_ZERO, - /* 0x1 */ GX_TB_ADDHALF, - /* 0x2 */ GX_TB_SUBHALF, - /* 0x3 */ GX_MAX_TEVBIAS, -} GXTevBias; - -typedef enum _GXTevColorArg { - /* 0x0 */ GX_CC_CPREV, - /* 0x1 */ GX_CC_APREV, - /* 0x2 */ GX_CC_C0, - /* 0x3 */ GX_CC_A0, - /* 0x4 */ GX_CC_C1, - /* 0x5 */ GX_CC_A1, - /* 0x6 */ GX_CC_C2, - /* 0x7 */ GX_CC_A2, - /* 0x8 */ GX_CC_TEXC, - /* 0x9 */ GX_CC_TEXA, - /* 0xA */ GX_CC_RASC, - /* 0xB */ GX_CC_RASA, - /* 0xC */ GX_CC_ONE, - /* 0xD */ GX_CC_HALF, - /* 0xE */ GX_CC_KONST, - /* 0xF */ GX_CC_ZERO, -} GXTevColorArg; - -typedef enum _GXTevColor { - /* 0x0 */ GX_CH_RED, - /* 0x1 */ GX_CH_GREEN, - /* 0x2 */ GX_CH_BLUE, - /* 0x3 */ GX_CH_ALPHA, -} GXTevColor; - -typedef enum _GXTevScale { - /* 0x0 */ GX_CS_SCALE_1, - /* 0x1 */ GX_CS_SCALE_2, - /* 0x2 */ GX_CS_SCALE_4, - /* 0x3 */ GX_CS_DIVIDE_2, - /* 0x4 */ GX_MAX_TEVSCALE -} GXTevScale; - -typedef enum _GXTevRegID { - /* 0x0 */ GX_TEVPREV, - /* 0x1 */ GX_TEVREG0, - /* 0x2 */ GX_TEVREG1, - /* 0x3 */ GX_TEVREG2, - /* 0x4 */ GX_MAX_TEVREG -} GXTevRegID; - -typedef enum _GXTevAlphaArg { - /* 0x0 */ GX_CA_APREV, - /* 0x1 */ GX_CA_A0, - /* 0x2 */ GX_CA_A1, - /* 0x3 */ GX_CA_A2, - /* 0x4 */ GX_CA_TEXA, - /* 0x5 */ GX_CA_RASA, - /* 0x6 */ GX_CA_KONST, - /* 0x7 */ GX_CA_ZERO, -} GXTevAlphaArg; - -typedef enum _GXTexFmt { - /* 0x0 */ GX_TF_I4, - /* 0x1 */ GX_TF_I8, - /* 0x2 */ GX_TF_IA4, - /* 0x3 */ GX_TF_IA8, - /* 0x4 */ GX_TF_RGB565, - /* 0x5 */ GX_TF_TGB5A3, - /* 0x6 */ GX_TF_RGBA8, - /* 0x7 */ GX_TF_CI4, - /* 0x8 */ GX_TF_CI8, - /* 0x9 */ GX_TF_CI14, - /* 0xE */ GX_TF_CMPR = 14, - /* 0x10 */ _GX_TF_ZTF = 0x10, - /* 0x11 */ GX_TF_Z8 = (0x1 | _GX_TF_ZTF), - /* 0x13 */ GX_TF_Z16 = (0x3 | _GX_TF_ZTF), - /* 0x16 */ GX_TF_Z24X8 = (0x6 | _GX_TF_ZTF), - /* 0x20 */ _GX_TF_CTF = 0x20, - /* 0x30 */ GX_CTF_Z4 = (0x0 | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x39 */ GX_CTF_Z8M = (0x9 | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x3A */ GX_CTF_Z8L = (0xA | _GX_TF_ZTF | _GX_TF_CTF), - /* 0x3C */ GX_CTF_Z16L = (0xC | _GX_TF_ZTF | _GX_TF_CTF), -} GXTexFmt; - -typedef enum _GXGamma { - /* 0x0 */ GX_GM_1_0, - /* 0x0 */ GX_GM_1_7, - /* 0x0 */ GX_GM_2_2, -} GXGamma; - -typedef enum _GXTlutFmt { - /* 0x0 */ GX_TL_IA8, - /* 0x1 */ GX_TL_RGB565, - /* 0x2 */ GX_TL_RGB5A3, -} GXTlutFmt; - -typedef enum _GXTlut { - /* 0x00 */ GX_TLUT0, - /* 0x01 */ GX_TLUT1, - /* 0x02 */ GX_TLUT2, - /* 0x03 */ GX_TLUT3, - /* 0x04 */ GX_TLUT4, - /* 0x05 */ GX_TLUT5, - /* 0x06 */ GX_TLUT6, - /* 0x07 */ GX_TLUT7, - /* 0x08 */ GX_TLUT8, - /* 0x09 */ GX_TLUT9, - /* 0x0A */ GX_TLUT10, - /* 0x0B */ GX_TLUT11, - /* 0x0C */ GX_TLUT12, - /* 0x0D */ GX_TLUT13, - /* 0x0E */ GX_TLUT14, - /* 0x0F */ GX_TLUT15, - /* 0x10 */ GX_BIGTLUT0, - /* 0x11 */ GX_BIGTLUT1, - /* 0x12 */ GX_BIGTLUT2, - /* 0x13 */ GX_BIGTLUT3, -} GXTlut; - -/* 8-bit version of GXTexFmt for use in structures */ -typedef enum _GXTexFmt8 { - /* 0x20 */ GX_CTF_R4 = (0x0 | _GX_TF_CTF), - /* 0x22 */ GX_CTF_RA4 = (0x2 | _GX_TF_CTF), - /* 0x23 */ GX_CTF_RA8 = (0x3 | _GX_TF_CTF), - /* 0x26 */ GX_CTF_YUVA8 = (0x6 | _GX_TF_CTF), - /* 0x27 */ GX_CTF_A8 = (0x7 | _GX_TF_CTF), - /* 0x28 */ GX_CTF_R8 = (0x8 | _GX_TF_CTF), - /* 0x29 */ GX_CTF_G8 = (0x9 | _GX_TF_CTF), - /* 0x2A */ GX_CTF_B8 = (0xA | _GX_TF_CTF), - /* 0x2B */ GX_CTF_RG8 = (0xB | _GX_TF_CTF), - /* 0x2C */ GX_CTF_GB8 = (0xC | _GX_TF_CTF), -} GXTexFmt8; - -typedef enum _GXTexWrapMode { - /* 0x0 */ GX_CLAMP, - /* 0x1 */ GX_REPEAT, - /* 0x2 */ GX_MIRROR, - /* 0x3 */ GX_MAX_TEXWRAP_MODE, -} GXTexWrapMode; - -typedef enum _GXTexFilter { - /* 0x0 */ GX_NEAR, - /* 0x1 */ GX_LINEAR, - /* 0x2 */ GX_NEAR_MIP_NEAR, - /* 0x3 */ GX_LIN_MIP_NEAR, - /* 0x4 */ GX_NEAR_MIP_LIN, - /* 0x5 */ GX_LIN_MIP_LIN, -} GXTexFilter; - -typedef enum _GXAnisotropy { - /* 0x0 */ GX_ANISO_1, - /* 0x1 */ GX_ANISO_2, - /* 0x2 */ GX_ANISO_4, - /* 0x3 */ GX_MAX_ANISOTROPY, -} GXAnisotropy; - -enum GXCITexFmt { - /* 0x8 */ GX_TF_C4 = 8, - /* 0x8 */ GX_TF_C8, - /* 0xA */ GX_TF_C14X2 -}; - -typedef enum _GXTexMtxType { - /* 0x0 */ GX_MTX3x4, - /* 0x1 */ GX_MTX2x4 -} GXTexMtxType; - -typedef enum _GXCompare { - /* 0x0 */ GX_NEVER, - /* 0x1 */ GX_LESS, - /* 0x2 */ GX_EQUAL, - /* 0x3 */ GX_LEQUAL, - /* 0x4 */ GX_GREATER, - /* 0x5 */ GX_NEQUAL, - /* 0x6 */ GX_GEQUAL, - /* 0x7 */ GX_ALWAYS, -} GXCompare; - -typedef enum _GXAlphaOp { - /* 0x0 */ GX_AOP_AND, - /* 0x1 */ GX_AOP_OR, - /* 0x2 */ GX_AOP_XOR, - /* 0x3 */ GX_AOP_XNOR, - /* 0x4 */ GX_MAX_ALPHAOP -} GXAlphaOp; - -typedef enum _GXFogType { - /* 0x0 */ GX_FOG_NONE, - /* 0x2 */ GX_FOG_LIN = 2, - /* 0x2 */ GX_FOG_PERSP_LIN = 2, - /* 0x4 */ GX_FOG_EXP = 4, - /* 0x4 */ GX_FOG_PERSP_EXP = 4, - /* 0x5 */ GX_FOG_EXP2, - /* 0x5 */ GX_FOG_PERSP_EXP2 = 5, - /* 0x6 */ GX_FOG_REVEXP, - /* 0x6 */ GX_FOG_PERSP_REVEXP = 6, - /* 0x7 */ GX_FOG_REVEXP2, - /* 0x7 */ GX_FOG_PERSP_REVEXP2 = 7, - /* 0xA */ GX_FOG_ORTHO_LIN = 10, - /* 0xC */ GX_FOG_ORTHO_EXP = 12, - /* 0xD */ GX_FOG_ORTHO_EXP2, - /* 0xE */ GX_FOG_ORTHO_REVEXP, - /* 0xF */ GX_FOG_ORTHO_REVEXP2, -} GXFogType; - -typedef enum _GXProjectionType { - /* 0x0 */ GX_PERSPECTIVE, - /* 0x1 */ GX_ORTHOGRAPHIC -} GXProjectionType; - -typedef enum _GXTevKAlphaSel { - /* 0x00 */ GX_TEV_KASEL_1, - /* 0x01 */ GX_TEV_KASEL_7_8, - /* 0x02 */ GX_TEV_KASEL_3_4, - /* 0x03 */ GX_TEV_KASEL_5_8, - /* 0x04 */ GX_TEV_KASEL_1_2, - /* 0x05 */ GX_TEV_KASEL_3_8, - /* 0x06 */ GX_TEV_KASEL_1_4, - /* 0x07 */ GX_TEV_KASEL_1_8, - - /* 0x10 */ GX_TEV_KASEL_K0_R = 0x10, - /* 0x11 */ GX_TEV_KASEL_K1_R, - /* 0x12 */ GX_TEV_KASEL_K2_R, - /* 0x13 */ GX_TEV_KASEL_K3_R, - /* 0x14 */ GX_TEV_KASEL_K0_G, - /* 0x15 */ GX_TEV_KASEL_K1_G, - /* 0x16 */ GX_TEV_KASEL_K2_G, - /* 0x17 */ GX_TEV_KASEL_K3_G, - /* 0x18 */ GX_TEV_KASEL_K0_B, - /* 0x19 */ GX_TEV_KASEL_K1_B, - /* 0x1A */ GX_TEV_KASEL_K2_B, - /* 0x1B */ GX_TEV_KASEL_K3_B, - /* 0x1C */ GX_TEV_KASEL_K0_A, - /* 0x1D */ GX_TEV_KASEL_K1_A, - /* 0x1E */ GX_TEV_KASEL_K2_A, - /* 0x1F */ GX_TEV_KASEL_K3_A, -} GXTevKAlphaSel; - -typedef enum _GXTevKColorSel { - /* 0x00 */ GX_TEV_KCSEL_1, - /* 0x01 */ GX_TEV_KCSEL_7_8, - /* 0x02 */ GX_TEV_KCSEL_3_4, - /* 0x03 */ GX_TEV_KCSEL_5_8, - /* 0x04 */ GX_TEV_KCSEL_1_2, - /* 0x05 */ GX_TEV_KCSEL_3_8, - /* 0x06 */ GX_TEV_KCSEL_1_4, - /* 0x07 */ GX_TEV_KCSEL_1_8, - /* 0x0C */ GX_TEV_KCSEL_K0 = 0xC, - /* 0x0D */ GX_TEV_KCSEL_K1, - /* 0x0E */ GX_TEV_KCSEL_K2, - /* 0x0F */ GX_TEV_KCSEL_K3, - /* 0x10 */ GX_TEV_KCSEL_K0_R, - /* 0x11 */ GX_TEV_KCSEL_K1_R, - /* 0x12 */ GX_TEV_KCSEL_K2_R, - /* 0x13 */ GX_TEV_KCSEL_K3_R, - /* 0x14 */ GX_TEV_KCSEL_K0_G, - /* 0x15 */ GX_TEV_KCSEL_K1_G, - /* 0x16 */ GX_TEV_KCSEL_K2_G, - /* 0x17 */ GX_TEV_KCSEL_K3_G, - /* 0x18 */ GX_TEV_KCSEL_K0_B, - /* 0x19 */ GX_TEV_KCSEL_K1_B, - /* 0x1A */ GX_TEV_KCSEL_K2_B, - /* 0x1B */ GX_TEV_KCSEL_K3_B, - /* 0x1C */ GX_TEV_KCSEL_K0_A, - /* 0x1D */ GX_TEV_KCSEL_K1_A, - /* 0x1E */ GX_TEV_KCSEL_K2_A, - /* 0x1F */ GX_TEV_KCSEL_K3_A, -} GXTevKColorSel; - -typedef enum _GXTevSwapSel { - /* 0x0 */ GX_TEV_SWAP0, - /* 0x1 */ GX_TEV_SWAP1, - /* 0x2 */ GX_TEV_SWAP2, - /* 0x3 */ GX_TEV_SWAP3, - /* 0x4 */ GX_MAX_TEVSWAP, -} GXTevSwapSel; - -typedef enum _GXTexGenType { - /* 0x0 */ GX_TG_MTX3x4, - /* 0x1 */ GX_TG_MTX2x4, - /* 0x2 */ GX_TG_BUMP0, - /* 0x3 */ GX_TG_BUMP1, - /* 0x4 */ GX_TG_BUMP2, - /* 0x5 */ GX_TG_BUMP3, - /* 0x6 */ GX_TG_BUMP4, - /* 0x7 */ GX_TG_BUMP5, - /* 0x8 */ GX_TG_BUMP6, - /* 0x9 */ GX_TG_BUMP7, - /* 0xA */ GX_TG_SRTG, -} GXTexGenType; - -typedef enum _GXTexGenSrc { - /* 0x00 */ GX_TG_POS, - /* 0x01 */ GX_TG_NRM, - /* 0x02 */ GX_TG_BINRM, - /* 0x03 */ GX_TG_TANGENT, - /* 0x04 */ GX_TG_TEX0, - /* 0x05 */ GX_TG_TEX1, - /* 0x06 */ GX_TG_TEX2, - /* 0x07 */ GX_TG_TEX3, - /* 0x08 */ GX_TG_TEX4, - /* 0x09 */ GX_TG_TEX5, - /* 0x0A */ GX_TG_TEX6, - /* 0x0B */ GX_TG_TEX7, - /* 0x0C */ GX_TG_TEXCOORD0, - /* 0x0D */ GX_TG_TEXCOORD1, - /* 0x0E */ GX_TG_TEXCOORD2, - /* 0x0F */ GX_TG_TEXCOORD3, - /* 0x10 */ GX_TG_TEXCOORD4, - /* 0x11 */ GX_TG_TEXCOORD5, - /* 0x12 */ GX_TG_TEXCOORD6, -} GXTexGenSrc; - -typedef enum _GXZTexOp { - /* 0x0 */ GX_ZT_DISABLE, - /* 0x1 */ GX_ZT_ADD, - /* 0x2 */ GX_ZT_REPLACE, - /* 0x3 */ GX_MAX_ZTEXOP, -} GXZTexOp; - -typedef enum _GXIndTexStageID { - /* 0x0 */ GX_INDTEXSTAGE0, - /* 0x1 */ GX_INDTEXSTAGE1, - /* 0x2 */ GX_INDTEXSTAGE2, - /* 0x3 */ GX_INDTEXSTAGE3, - /* 0x4 */ GX_MAX_INDTEXSTAGE, -} GXIndTexStageID; - -typedef enum _GXIndTexScale { - /* 0x0 */ GX_ITS_1, - /* 0x1 */ GX_ITS_2, - /* 0x2 */ GX_ITS_4, - /* 0x3 */ GX_ITS_8, - /* 0x4 */ GX_ITS_16, - /* 0x5 */ GX_ITS_32, - /* 0x6 */ GX_ITS_64, - /* 0x7 */ GX_ITS_128, - /* 0x8 */ GX_ITS_256, - /* 0x9 */ GX_MAX_ITSCALE, -} GXIndTexScale; - -typedef enum _GXIndTexMtxID { - /* 0x0 */ GX_ITM_OFF, - /* 0x1 */ GX_ITM_0, - /* 0x2 */ GX_ITM_1, - /* 0x3 */ GX_ITM_2, - /* 0x5 */ GX_ITM_S0 = 5, - /* 0x6 */ GX_ITM_S1, - /* 0x7 */ GX_ITM_S2, - /* 0x9 */ GX_ITM_T0 = 9, - /* 0xA */ GX_ITM_T1, - /* 0xB */ GX_ITM_T2, -} GXIndTexMtxID; - -typedef enum _GXIndTexFormat { - /* 0x0 */ GX_ITF_8, - /* 0x1 */ GX_ITF_5, - /* 0x2 */ GX_ITF_4, - /* 0x3 */ GX_ITF_3, -} GXIndTexFormat; - -typedef enum _GXIndTexBiasSel { - /* 0x0 */ GX_ITB_NONE, - /* 0x1 */ GX_ITB_S, - /* 0x2 */ GX_ITB_T, - /* 0x3 */ GX_ITB_ST, - /* 0x4 */ GX_ITB_U, - /* 0x5 */ GX_ITB_SU, - /* 0x6 */ GX_ITB_TU, - /* 0x7 */ GX_ITB_STU, -} GXIndTexBiasSel; - -typedef enum _GXIndTexAlphaSel { - /* 0x0 */ GX_ITBA_OFF, - /* 0x1 */ GX_ITBA_S, - /* 0x2 */ GX_ITBA_T, - /* 0x3 */ GX_ITBA_U, -} GXIndTexAlphaSel; - -typedef enum _GXIndTexWrap { - /* 0x0 */ GX_ITW_OFF, - /* 0x1 */ GX_ITW_256, - /* 0x2 */ GX_ITW_128, - /* 0x3 */ GX_ITW_64, - /* 0x4 */ GX_ITW_32, - /* 0x5 */ GX_ITW_16, - /* 0x6 */ GX_ITW_0, -} GXIndTexWrap; - -typedef enum _GXTexOffset { - /* 0x0 */ GX_TO_ZERO, - /* 0x1 */ GX_TO_SIXTEENTH, - /* 0x2 */ GX_TO_EIGHTH, - /* 0x3 */ GX_TO_FOURTH, - /* 0x4 */ GX_TO_HALF, - /* 0x5 */ GX_TO_ONE, - /* 0x6 */ GX_MAX_TEXOFFSET, -} GXTexOffset; - -typedef enum _GXTevKColorID { - /* 0x0 */ GX_KCOLOR0, - /* 0x1 */ GX_KCOLOR1, - /* 0x2 */ GX_KCOLOR2, - /* 0x3 */ GX_KCOLOR3, -} GXTevKColorID; - -typedef enum _GXTexCacheSize { - /* 0x0 */ GX_TEXCACHE_32K, - /* 0x1 */ GX_TEXCACHE_128K, - /* 0x2 */ GX_TEXCACHE_512K, - /* 0x3 */ GX_TEXCACHE_NONE, -} GXTexCacheSize; - -typedef enum _GXPosNrmMtx { - GX_PNMTX0 = 3 * 0, - GX_PNMTX1 = 3 * 1, - GX_PNMTX2 = 3 * 2, - GX_PNMTX3 = 3 * 3, - GX_PNMTX4 = 3 * 4, - GX_PNMTX5 = 3 * 5, - GX_PNMTX6 = 3 * 6, - GX_PNMTX7 = 3 * 7, - GX_PNMTX8 = 3 * 8, - GX_PNMTX9 = 3 * 9, -} GXPosNrmMtx; - -typedef enum _GXTexMtx { - GX_TEXMTX0 = 30 + 0 * 3, - GX_TEXMTX1 = 30 + 1 * 3, - GX_TEXMTX2 = 30 + 2 * 3, - GX_TEXMTX3 = 30 + 3 * 3, - GX_TEXMTX4 = 30 + 4 * 3, - GX_TEXMTX5 = 30 + 5 * 3, - GX_TEXMTX6 = 30 + 6 * 3, - GX_TEXMTX7 = 30 + 7 * 3, - GX_TEXMTX8 = 30 + 8 * 3, - GX_TEXMTX9 = 30 + 9 * 3, - GX_IDENTITY = 60, -}; - -typedef enum _GXPTTexMtx { - GX_PTTEXMTX0 = 64 + 0 * 3, - GX_PTTEXMTX1 = 64 + 1 * 3, - GX_PTTEXMTX2 = 64 + 2 * 3, - GX_PTTEXMTX3 = 64 + 3 * 3, - GX_PTTEXMTX4 = 64 + 4 * 3, - GX_PTTEXMTX5 = 64 + 5 * 3, - GX_PTTEXMTX6 = 64 + 6 * 3, - GX_PTTEXMTX7 = 64 + 7 * 3, - GX_PTTEXMTX8 = 64 + 8 * 3, - GX_PTTEXMTX9 = 64 + 9 * 3, - GX_PTTEXMTX10 = 64 + 10 * 3, - GX_PTTEXMTX11 = 64 + 11 * 3, - GX_PTTEXMTX12 = 64 + 12 * 3, - GX_PTTEXMTX13 = 64 + 13 * 3, - GX_PTTEXMTX14 = 64 + 14 * 3, - GX_PTTEXMTX15 = 64 + 15 * 3, - GX_PTTEXMTX16 = 64 + 16 * 3, - GX_PTTEXMTX17 = 64 + 17 * 3, - GX_PTTEXMTX18 = 64 + 18 * 3, - GX_PTTEXMTX19 = 64 + 19 * 3, - GX_PTIDENTITY = 125, -}; +#ifdef __cplusplus +extern "C" { +#endif typedef struct _GXVtxDescList { /* 0x0 */ GXAttr attr; @@ -830,41 +25,94 @@ typedef struct _GXVtxAttrFmtList { /* 0x0C */ u8 mCompShift; } GXVtxAttrFmtList; // Size: 0x10 -typedef enum _GXFBClamp { - /* 0x0 */ GX_CLAMP_NONE, - /* 0x1 */ GX_CLAMP_TOP, - /* 0x2 */ GX_CLAMP_BOTTOM, -} GXFBClamp; +typedef GXTexRegion (*GXTexRegionCallback)(void); +typedef u32 (*GXTlutRegionCallback)(u32); -typedef enum _GXPixelFmt { - /* 0x0 */ GX_PF_RGB8_Z24, - /* 0x1 */ GX_PF_RGBA6_Z24, - /* 0x2 */ GX_PF_RGB565_Z16, - /* 0x3 */ GX_PF_Z24, - /* 0x4 */ GX_PF_Y8, - /* 0x5 */ GX_PF_U8, - /* 0x6 */ GX_PF_V8, - /* 0x7 */ GX_PF_YUV420, -} GXPixelFmt; +typedef struct _GXData { + /* 0x000 */ u16 field_0x0; + /* 0x002 */ u16 field_0x2; + /* 0x004 */ u16 field_0x4; + /* 0x006 */ u16 field_0x6; + /* 0x008 */ u32 field_0x8; + /* 0x00C */ u32 field_0xc; + /* 0x010 */ u32 field_0x10; + /* 0x014 */ GXAttrType field_0x14; + /* 0x018 */ GXAttrType field_0x18; + /* 0x01C */ GXCompCnt field_0x1c[8]; + /* 0x03C */ GXCompCnt field_0x3c[8]; + /* 0x05C */ u32 field_0x5c[8]; + /* 0x07C */ u32 field_0x7c; + /* 0x080 */ u32 field_0x80; + /* 0x084 */ u32 field_0x84; + /* 0x088 */ u8 field_0x88[0xA8 - 0x88]; + /* 0x0A8 */ u32 field_0xa8[2]; + /* 0x0B0 */ u32 field_0xb0[2]; + /* 0x0B8 */ u32 field_0xb8[8]; // GX_MAX_TEXCOORD + /* 0x0D8 */ u32 field_0xd8[8]; // GX_MAX_TEXCOORD + /* 0x0F8 */ u32 field_0xf8; + /* 0x0FC */ u32 field_0xfc; + /* 0x100 */ u32 field_0x100[GX_MAX_TEVSTAGE / 2]; + /* 0x120 */ u32 field_0x120; + /* 0x124 */ u32 field_0x124; + /* 0x128 */ u8 field_0x128[0x130 - 0x128]; + /* 0x130 */ u32 field_0x130[GX_MAX_TEVSTAGE]; + /* 0x170 */ u32 field_0x170[GX_MAX_TEVSTAGE]; + /* 0x1B0 */ u32 field_0x1b0[GX_MAX_TEVSTAGE / 2]; + /* 0x1D0 */ u32 field_0x1d0; + /* 0x1D4 */ u32 field_0x1d4; + /* 0x1D8 */ u32 field_0x1d8; + /* 0x1DC */ u32 field_0x1dc; + /* 0x1E0 */ u32 field_0x1e0; + /* 0x1E4 */ u32 field_0x1e4; + /* 0x1E8 */ u32 field_0x1e8; + /* 0x1EC */ u32 field_0x1ec; + /* 0x1F0 */ u32 field_0x1f0; + /* 0x1F4 */ u32 field_0x1f4; + /* 0x1F8 */ u32 field_0x1f8; + /* 0x1FC */ u32 field_0x1fc; + /* 0x200 */ u8 field_0x200; + /* 0x204 */ u32 field_0x204; + /* 0x208 */ GXTexRegion field_0x208[8]; + /* 0x288 */ GXTexRegion field_0x288[8]; + /* 0x308 */ GXTexRegion field_0x308[8]; + /* 0x388 */ GXTlutRegion field_0x388[16]; + /* 0x488 */ GXTlutRegion field_0x488[4]; + /* 0x4C8 */ GXTexRegionCallback field_0x4c8; + /* 0x4CC */ GXTlutRegionCallback field_0x4cc; + /* 0x4D0 */ GXAttrType field_0x4d0; + /* 0x4D4 */ u8 field_0x4d4; + /* 0x4D5 */ u8 field_0x4d5; + /* 0x4D8 */ GXProjectionType field_0x4d8; + /* 0x4DC */ Mtx field_0x4dc; + /* 0x50C */ f32 field_0x50c; + /* 0x510 */ f32 field_0x510; + /* 0x514 */ u32 field_0x514[8]; + /* 0x534 */ u32 field_0x534[8]; + /* 0x554 */ u32 field_0x554; + /* 0x558 */ u32 field_0x558[8]; + /* 0x578 */ u8 field_0x578[0x594 - 0x578]; + /* 0x594 */ u32 field_0x594; + /* 0x598 */ u32 field_0x598; + /* 0x59C */ u32 field_0x59c; + /* 0x5A0 */ u8 field_0x5a0[4]; + /* 0x5A4 */ u32 field_0x5a4; + /* 0x5A8 */ u8 field_0x5a8; + /* 0x5A9 */ u8 field_0x5a9; + /* 0x5AA */ u8 field_0x5aa; + /* 0x5AB */ u8 field_0x5ab; + /* 0x5AC */ u32 field_0x5ac; +} GXData; // Size: 0x5B0 -typedef enum _GXZFmt16 { - /* 0x0 */ GX_ZC_LINEAR, - /* 0x1 */ GX_ZC_NEAR, - /* 0x2 */ GX_ZC_MID, - /* 0x3 */ GX_ZC_FAR, -} GXZFmt16; +STATIC_ASSERT(sizeof(GXData) == 0x5B0); -typedef enum _GXCommand { - GX_CMD_LOAD_INDX_A = 0x20, - GX_CMD_LOAD_INDX_B = 0x28, - GX_CMD_LOAD_INDX_C = 0x30, - GX_CMD_LOAD_INDX_D = 0x38, +extern GXData* __GXData; - GX_CMD_LOAD_CP_REG = 0x08, - GX_CMD_LOAD_XF_REG = 0x10, -} GXCommand; +extern u32* __piReg; +extern u16* __cpReg; + +#define GX_LOAD_BP_REG 0x61 +#define GX_NOP 0 -extern "C" { f32 GXGetYScaleFactor(u16 efb_height, u16 xfb_height); u16 GXGetNumXfbLines(u32 efb_height, f32 y_scale); @@ -894,7 +142,7 @@ void GXSetBlendMode(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp); void GXSetVtxAttrFmt(GXVtxFmt, GXAttr, GXCompCnt, GXCompType, u32); void GXClearVtxDesc(void); void GXSetVtxDesc(GXAttr, GXAttrType); -void GXSetArray(GXAttr, const void*, u8); +void GXSetArray(GXAttr, void*, u8); typedef void (*GXDrawDoneCallback)(void); void GXSetDrawDoneCallback(GXDrawDoneCallback); void GXDrawDone(void); @@ -934,7 +182,7 @@ void GXSetAlphaCompare(GXCompare, u8, GXAlphaOp, GXCompare, u8); void GXSetAlphaUpdate(GXBool); void GXSetChanAmbColor(GXChannelID, GXColor); void GXSetChanMatColor(GXChannelID, GXColor); -void GXSetClipMode(GXBool); +void GXSetClipMode(GXClipMode); void GXSetCoPlanar(GXBool); void GXSetColorUpdate(GXBool); void GXSetCopyFilter(GXBool, u8[12][2], GXBool, u8[7]); @@ -979,6 +227,9 @@ void GXInitFifoPtrs(GXFifoObj*, void*, void*); void GXSaveCPUFifo(GXFifoObj*); void GXSetMisc(u32 opt, u32 val); void GXInitTexCacheRegion(GXTexRegion* region, GXBool, u32, GXTexCacheSize, u32, GXTexCacheSize); +void GXPeekZ(u16 x, u16 y, u32* dst); +void __GXSetDirtyState(void); +void __GXSendFlushPrim(void); #define GFX_FIFO(T) (*(volatile T*)0xCC008000) @@ -1022,7 +273,7 @@ inline void GXPosition2s8(s8 x, s8 y) { GFX_FIFO(s8) = y; } -inline void GXPosition3s16(s16 x, s16 y, s16 z) { +inline void i_GXPosition3s16(s16 x, s16 y, s16 z) { GFX_FIFO(s16) = x; GFX_FIFO(s16) = y; GFX_FIFO(s16) = z; @@ -1033,7 +284,10 @@ inline void GXTexCoord2s8(s8 x, s8 y) { GFX_FIFO(s8) = y; } -inline void GXEnd() {} +inline void i_GXEnd() {} + +#ifdef __cplusplus }; +#endif #endif diff --git a/include/dolphin/gx/GXDisplayList.h b/include/dolphin/gx/GXDisplayList.h index abc3a045a2c..54845d6a46b 100644 --- a/include/dolphin/gx/GXDisplayList.h +++ b/include/dolphin/gx/GXDisplayList.h @@ -4,9 +4,9 @@ #include "dolphin/types.h" extern "C" { -void GXBeginDisplayList(void* pDL, u32 capacity); +void GXBeginDisplayList(void* list, u32 capacity); void GXEndDisplayList(void); -void GXCallDisplayList(const void* pDL, u32 size); +void GXCallDisplayList(void* list, u32 nbytes); }; #endif /* GXDISPLAYLIST_H */ diff --git a/include/dolphin/gx/GXEnum.h b/include/dolphin/gx/GXEnum.h new file mode 100644 index 00000000000..b8ab1cb40c4 --- /dev/null +++ b/include/dolphin/gx/GXEnum.h @@ -0,0 +1,779 @@ +#ifndef GXENUM_H +#define GXENUM_H + +#include "dolphin/types.h" + +typedef enum _GXPrimitive { + /* 0x80 */ GX_QUADS = 0x80, + /* 0x90 */ GX_TRIANGLES = 0x90, + /* 0x98 */ GX_TRIANGLESTRIP = 0x98, + /* 0xA0 */ GX_TRIANGLEFAN = 0xA0, + /* 0xA8 */ GX_LINES = 0xA8, + /* 0xB0 */ GX_LINESTRIP = 0xB0, + /* 0xB8 */ GX_POINTS = 0xB8, +} GXPrimitive; + +typedef enum _GXCullMode { + /* 0x0 */ GX_CULL_NONE, + /* 0x1 */ GX_CULL_FRONT, + /* 0x2 */ GX_CULL_BACK, + /* 0x3 */ GX_CULL_ALL +} GXCullMode; + +typedef enum _GXBool { + /* 0x0 */ GX_FALSE, + /* 0x1 */ GX_TRUE, + /* 0x0 */ GX_DISABLE = 0, + /* 0x1 */ GX_ENABLE +} GXBool; + +typedef enum _GXTexMapID { + /* 0x000 */ GX_TEXMAP0, + /* 0x001 */ GX_TEXMAP1, + /* 0x002 */ GX_TEXMAP2, + /* 0x003 */ GX_TEXMAP3, + /* 0x004 */ GX_TEXMAP4, + /* 0x005 */ GX_TEXMAP5, + /* 0x006 */ GX_TEXMAP6, + /* 0x007 */ GX_TEXMAP7, + /* 0x008 */ GX_MAX_TEXMAP, + /* 0x0FF */ GX_TEXMAP_NULL = 255, + /* 0x100 */ GX_TEXMAP_DISABLE, +} GXTexMapID; + +typedef enum _GXTevStageID { + /* 0x00 */ GX_TEVSTAGE0, + /* 0x01 */ GX_TEVSTAGE1, + /* 0x02 */ GX_TEVSTAGE2, + /* 0x03 */ GX_TEVSTAGE3, + /* 0x04 */ GX_TEVSTAGE4, + /* 0x05 */ GX_TEVSTAGE5, + /* 0x06 */ GX_TEVSTAGE6, + /* 0x07 */ GX_TEVSTAGE7, + /* 0x08 */ GX_TEVSTAGE8, + /* 0x09 */ GX_TEVSTAGE9, + /* 0x0A */ GX_TEVSTAGE10, + /* 0x0B */ GX_TEVSTAGE11, + /* 0x0C */ GX_TEVSTAGE12, + /* 0x0D */ GX_TEVSTAGE13, + /* 0x0E */ GX_TEVSTAGE14, + /* 0x0F */ GX_TEVSTAGE15, + /* 0x10 */ GX_MAX_TEVSTAGE, +} GXTevStageID; + +typedef enum _GXTexCoordID { + /* 0x00 */ GX_TEXCOORD0, + /* 0x01 */ GX_TEXCOORD1, + /* 0x02 */ GX_TEXCOORD2, + /* 0x03 */ GX_TEXCOORD3, + /* 0x04 */ GX_TEXCOORD4, + /* 0x05 */ GX_TEXCOORD5, + /* 0x06 */ GX_TEXCOORD6, + /* 0x07 */ GX_TEXCOORD7, + /* 0x08 */ GX_MAXCOORD, + /* 0xFF */ GX_TEXCOORD_NULL = 255, +} GXTexCoordID; + +typedef enum _GXChannelID { + /* 0x00 */ GX_COLOR0, + /* 0x01 */ GX_COLOR1, + /* 0x02 */ GX_ALPHA0, + /* 0x03 */ GX_ALPHA1, + /* 0x04 */ GX_COLOR0A0, + /* 0x05 */ GX_COLOR1A1, + /* 0x06 */ GX_COLOR_ZERO, + /* 0x07 */ GX_ALPHA_BUMP, + /* 0x08 */ GX_ALPHA_BUMPN, + /* 0xFF */ GX_COLOR_NULL = 255, +} GXChannelID; + +typedef enum _GXColorSrc { + /* 0x0 */ GX_SRC_REG, + /* 0x1 */ GX_SRC_VTX, +} GXColorSrc; + +typedef enum _GXLightID { + /* 0x000 */ GX_LIGHT_NULL = 0, + /* 0x001 */ GX_LIGHT0 = 1 << 0, + /* 0x002 */ GX_LIGHT1 = 1 << 1, + /* 0x004 */ GX_LIGHT2 = 1 << 2, + /* 0x008 */ GX_LIGHT3 = 1 << 3, + /* 0x010 */ GX_LIGHT4 = 1 << 4, + /* 0x020 */ GX_LIGHT5 = 1 << 5, + /* 0x040 */ GX_LIGHT6 = 1 << 6, + /* 0x080 */ GX_LIGHT7 = 1 << 7, + /* 0x100 */ GX_MAX_LIGHT = 1 << 8, +} GXLightID; + +typedef enum _GXDiffuseFn { + /* 0x0 */ GX_DF_NONE, + /* 0x1 */ GX_DF_SIGN, + /* 0x2 */ GX_DF_CLAMP, +} GXDiffuseFn; + +typedef enum _GXAttnFn { + /* 0x0 */ GX_AF_SPEC, + /* 0x1 */ GX_AF_SPOT, + /* 0x2 */ GX_AF_NONE, +} GXAttnFn; + +typedef enum _GXDistAttnFn { + /* 0x0 */ GX_DA_OFF, + /* 0x1 */ GX_DA_GENTLE, + /* 0x2 */ GX_DA_MEDIUM, + /* 0x3 */ GX_DA_STEEP +} GXDistAttnFn; + +typedef enum _GXSpotFn { + /* 0x0 */ GX_SP_OFF, + /* 0x1 */ GX_SP_FLAT, + /* 0x2 */ GX_SP_COS, + /* 0x3 */ GX_SP_COS2, + /* 0x4 */ GX_SP_SHARP, + /* 0x5 */ GX_SP_RING1, + /* 0x6 */ GX_SP_RING2 +} GXSpotFn; + +typedef enum _GXTevMode { + /* 0x0 */ GX_MODULATE, + /* 0x1 */ GX_DECAL, + /* 0x2 */ GX_BLEND, + /* 0x3 */ GX_REPLACE, + /* 0x4 */ GX_PASSCLR, +} GXTevMode; + +typedef enum _GXBlendMode { + /* 0x0 */ GX_BM_NONE, + /* 0x1 */ GX_BM_BLEND, + /* 0x2 */ GX_BM_LOGIC, + /* 0x3 */ GX_BM_SUBTRACT, + /* 0x4 */ GX_MAX_BLENDMODE, +} GXBlendMode; + +typedef enum _GXBlendFactor { + /* 0x0 */ GX_BL_ZERO, + /* 0x1 */ GX_BL_ONE, + /* 0x2 */ GX_BL_SRC_COLOR, + /* 0x2 */ GX_BL_DST_COLOR = 2, + /* 0x3 */ GX_BL_INV_SRC_COLOR, + /* 0x3 */ GX_BL_INV_DST_COLOR = 3, + /* 0x4 */ GX_BL_SRC_ALPHA, + /* 0x5 */ GX_BL_INV_SRC_ALPHA, + /* 0x6 */ GX_BL_DST_ALPHA, + /* 0x7 */ GX_BL_INV_DST_ALPHA, +} GXBlendFactor; + +typedef enum _GXLogicOp { + /* 0x0 */ GX_LO_CLEAR, + /* 0x1 */ GX_LO_AND, + /* 0x2 */ GX_LO_REV_AND, + /* 0x3 */ GX_LO_COPY, + /* 0x4 */ GX_LO_INV_AND, + /* 0x5 */ GX_LO_NOOP, + /* 0x6 */ GX_LO_XOR, + /* 0x7 */ GX_LO_OR, + /* 0x8 */ GX_LO_NOR, + /* 0x9 */ GX_LO_EQUIV, + /* 0xA */ GX_LO_INV, + /* 0xB */ GX_LO_REV_OR, + /* 0xC */ GX_LO_INV_COPY, + /* 0xD */ GX_LO_INV_OR, + /* 0xE */ GX_LO_NAND, + /* 0xF */ GX_LO_SET, +} GXLogicOp; + +typedef enum _GXVtxFmt { + /* 0x0 */ GX_VTXFMT0, + /* 0x1 */ GX_VTXFMT1, + /* 0x2 */ GX_VTXFMT2, + /* 0x3 */ GX_VTXFMT3, + /* 0x4 */ GX_VTXFMT4, + /* 0x5 */ GX_VTXFMT5, + /* 0x6 */ GX_VTXFMT6, + /* 0x7 */ GX_VTXFMT7, + /* 0x8 */ GX_MAX_VTXFMT, +} GXVtxFmt; + +typedef enum _GXAttr { + /* 0x00 */ GX_VA_PNMTXIDX, + /* 0x01 */ GX_VA_TEX0MTXIDX, + /* 0x02 */ GX_VA_TEX1MTXIDX, + /* 0x03 */ GX_VA_TEX2MTXIDX, + /* 0x04 */ GX_VA_TEX3MTXIDX, + /* 0x05 */ GX_VA_TEX4MTXIDX, + /* 0x06 */ GX_VA_TEX5MTXIDX, + /* 0x07 */ GX_VA_TEX6MTXIDX, + /* 0x08 */ GX_VA_TEX7MTXIDX, + /* 0x09 */ GX_VA_POS, + /* 0x0A */ GX_VA_NRM, + /* 0x0B */ GX_VA_CLR0, + /* 0x0C */ GX_VA_CLR1, + /* 0x0D */ GX_VA_TEX0, + /* 0x0E */ GX_VA_TEX1, + /* 0x0F */ GX_VA_TEX2, + /* 0x10 */ GX_VA_TEX3, + /* 0x11 */ GX_VA_TEX4, + /* 0x12 */ GX_VA_TEX5, + /* 0x13 */ GX_VA_TEX6, + /* 0x14 */ GX_VA_TEX7, + /* 0x15 */ GX_POS_MTX_ARRAY, + /* 0x16 */ GX_NRM_MTX_ARRAY, + /* 0x17 */ GX_TEX_MTX_ARRAY, + /* 0x18 */ GX_LIGHT_ARRAY, + /* 0x19 */ GX_VA_NBT, + /* 0x1A */ GX_VA_MAX_ATTR, + /* 0xFF */ GX_VA_NULL = 255, +} GXAttr; + +typedef enum _GXCompCnt { + /* 0x0 */ GX_POS_XY = 0, + /* 0x1 */ GX_POS_XYZ = 1, + /* 0x0 */ GX_NRM_XYZ = 0, + /* 0x1 */ GX_NRM_NBT = 1, + /* 0x2 */ GX_NRM_NBT3 = 2, + /* 0x0 */ GX_CLR_RGB = 0, + /* 0x1 */ GX_CLR_RGBA = 1, + /* 0x0 */ GX_TEX_S = 0, + /* 0x1 */ GX_TEX_ST = 1, +} GXCompCnt; + +typedef enum _GXCompType { + /* 0x0 */ GX_U8, + /* 0x1 */ GX_S8, + /* 0x2 */ GX_U16, + /* 0x3 */ GX_S16, + /* 0x4 */ GX_F32, + /* 0x0 */ GX_RGB565 = 0, + /* 0x1 */ GX_RGB8, + /* 0x2 */ GX_RGBX8, + /* 0x3 */ GX_RGBA4, + /* 0x4 */ GX_RGBA6, + /* 0x5 */ GX_RGBA8, +} GXCompType; + +typedef enum _GXAttrType { + /* 0x0 */ GX_NONE, + /* 0x1 */ GX_DIRECT, + /* 0x2 */ GX_INDEX8, + /* 0x3 */ GX_INDEX16, +} GXAttrType; + +typedef enum _GXTevOp { + /* 0x0 */ GX_TEV_ADD, + /* 0x1 */ GX_TEV_SUB, + /* 0x8 */ GX_TEV_COMP_R8_GT = 8, + /* 0x9 */ GX_TEV_COMP_R8_EQ, + /* 0xA */ GX_TEV_COMP_GR16_GT, + /* 0xB */ GX_TEV_COMP_GR16_EQ, + /* 0xC */ GX_TEV_COMP_BGR24_GT, + /* 0xD */ GX_TEV_COMP_BGR24_EQ, + /* 0xE */ GX_TEV_COMP_A8_GT, + /* 0xE */ GX_TEV_COMP_RGB8_GT = 14, + /* 0xF */ GX_TEV_COMP_RGB8_EQ, + /* 0xF */ GX_TEV_COMP_A8_EQ = 15, +} GXTevOp; + +typedef enum _GXTevBias { + /* 0x0 */ GX_TB_ZERO, + /* 0x1 */ GX_TB_ADDHALF, + /* 0x2 */ GX_TB_SUBHALF, + /* 0x3 */ GX_MAX_TEVBIAS, +} GXTevBias; + +typedef enum _GXTevColorArg { + /* 0x0 */ GX_CC_CPREV, + /* 0x1 */ GX_CC_APREV, + /* 0x2 */ GX_CC_C0, + /* 0x3 */ GX_CC_A0, + /* 0x4 */ GX_CC_C1, + /* 0x5 */ GX_CC_A1, + /* 0x6 */ GX_CC_C2, + /* 0x7 */ GX_CC_A2, + /* 0x8 */ GX_CC_TEXC, + /* 0x9 */ GX_CC_TEXA, + /* 0xA */ GX_CC_RASC, + /* 0xB */ GX_CC_RASA, + /* 0xC */ GX_CC_ONE, + /* 0xD */ GX_CC_HALF, + /* 0xE */ GX_CC_KONST, + /* 0xF */ GX_CC_ZERO, +} GXTevColorArg; + +typedef enum _GXTevColor { + /* 0x0 */ GX_CH_RED, + /* 0x1 */ GX_CH_GREEN, + /* 0x2 */ GX_CH_BLUE, + /* 0x3 */ GX_CH_ALPHA, +} GXTevColor; + +typedef enum _GXTevScale { + /* 0x0 */ GX_CS_SCALE_1, + /* 0x1 */ GX_CS_SCALE_2, + /* 0x2 */ GX_CS_SCALE_4, + /* 0x3 */ GX_CS_DIVIDE_2, + /* 0x4 */ GX_MAX_TEVSCALE +} GXTevScale; + +typedef enum _GXTevRegID { + /* 0x0 */ GX_TEVPREV, + /* 0x1 */ GX_TEVREG0, + /* 0x2 */ GX_TEVREG1, + /* 0x3 */ GX_TEVREG2, + /* 0x4 */ GX_MAX_TEVREG +} GXTevRegID; + +typedef enum _GXTevAlphaArg { + /* 0x0 */ GX_CA_APREV, + /* 0x1 */ GX_CA_A0, + /* 0x2 */ GX_CA_A1, + /* 0x3 */ GX_CA_A2, + /* 0x4 */ GX_CA_TEXA, + /* 0x5 */ GX_CA_RASA, + /* 0x6 */ GX_CA_KONST, + /* 0x7 */ GX_CA_ZERO, +} GXTevAlphaArg; + +typedef enum _GXTexFmt { + /* 0x0 */ GX_TF_I4, + /* 0x1 */ GX_TF_I8, + /* 0x2 */ GX_TF_IA4, + /* 0x3 */ GX_TF_IA8, + /* 0x4 */ GX_TF_RGB565, + /* 0x5 */ GX_TF_TGB5A3, + /* 0x6 */ GX_TF_RGBA8, + /* 0x7 */ GX_TF_CI4, + /* 0x8 */ GX_TF_CI8, + /* 0x9 */ GX_TF_CI14, + /* 0xE */ GX_TF_CMPR = 14, + /* 0x10 */ _GX_TF_ZTF = 0x10, + /* 0x11 */ GX_TF_Z8 = (0x1 | _GX_TF_ZTF), + /* 0x13 */ GX_TF_Z16 = (0x3 | _GX_TF_ZTF), + /* 0x16 */ GX_TF_Z24X8 = (0x6 | _GX_TF_ZTF), + /* 0x20 */ _GX_TF_CTF = 0x20, + /* 0x28 */ _GX_CTF_R8 = 0x28, + /* 0x30 */ GX_CTF_Z4 = (0x0 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x39 */ GX_CTF_Z8M = (0x9 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3A */ GX_CTF_Z8L = (0xA | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3C */ GX_CTF_Z16L = (0xC | _GX_TF_ZTF | _GX_TF_CTF), +} GXTexFmt; + +typedef enum _GXGamma { + /* 0x0 */ GX_GM_1_0, + /* 0x0 */ GX_GM_1_7, + /* 0x0 */ GX_GM_2_2, +} GXGamma; + +typedef enum _GXTlutFmt { + /* 0x0 */ GX_TL_IA8, + /* 0x1 */ GX_TL_RGB565, + /* 0x2 */ GX_TL_RGB5A3, +} GXTlutFmt; + +typedef enum _GXTlut { + /* 0x00 */ GX_TLUT0, + /* 0x01 */ GX_TLUT1, + /* 0x02 */ GX_TLUT2, + /* 0x03 */ GX_TLUT3, + /* 0x04 */ GX_TLUT4, + /* 0x05 */ GX_TLUT5, + /* 0x06 */ GX_TLUT6, + /* 0x07 */ GX_TLUT7, + /* 0x08 */ GX_TLUT8, + /* 0x09 */ GX_TLUT9, + /* 0x0A */ GX_TLUT10, + /* 0x0B */ GX_TLUT11, + /* 0x0C */ GX_TLUT12, + /* 0x0D */ GX_TLUT13, + /* 0x0E */ GX_TLUT14, + /* 0x0F */ GX_TLUT15, + /* 0x10 */ GX_BIGTLUT0, + /* 0x11 */ GX_BIGTLUT1, + /* 0x12 */ GX_BIGTLUT2, + /* 0x13 */ GX_BIGTLUT3, +} GXTlut; + +/* 8-bit version of GXTexFmt for use in structures */ +typedef enum _GXTexFmt8 { + /* 0x20 */ GX_CTF_R4 = (0x0 | _GX_TF_CTF), + /* 0x22 */ GX_CTF_RA4 = (0x2 | _GX_TF_CTF), + /* 0x23 */ GX_CTF_RA8 = (0x3 | _GX_TF_CTF), + /* 0x26 */ GX_CTF_YUVA8 = (0x6 | _GX_TF_CTF), + /* 0x27 */ GX_CTF_A8 = (0x7 | _GX_TF_CTF), + /* 0x28 */ GX_CTF_R8 = (0x8 | _GX_TF_CTF), + /* 0x29 */ GX_CTF_G8 = (0x9 | _GX_TF_CTF), + /* 0x2A */ GX_CTF_B8 = (0xA | _GX_TF_CTF), + /* 0x2B */ GX_CTF_RG8 = (0xB | _GX_TF_CTF), + /* 0x2C */ GX_CTF_GB8 = (0xC | _GX_TF_CTF), +} GXTexFmt8; + +typedef enum _GXTexWrapMode { + /* 0x0 */ GX_CLAMP, + /* 0x1 */ GX_REPEAT, + /* 0x2 */ GX_MIRROR, + /* 0x3 */ GX_MAX_TEXWRAP_MODE, +} GXTexWrapMode; + +typedef enum _GXTexFilter { + /* 0x0 */ GX_NEAR, + /* 0x1 */ GX_LINEAR, + /* 0x2 */ GX_NEAR_MIP_NEAR, + /* 0x3 */ GX_LIN_MIP_NEAR, + /* 0x4 */ GX_NEAR_MIP_LIN, + /* 0x5 */ GX_LIN_MIP_LIN, +} GXTexFilter; + +typedef enum _GXAnisotropy { + /* 0x0 */ GX_ANISO_1, + /* 0x1 */ GX_ANISO_2, + /* 0x2 */ GX_ANISO_4, + /* 0x3 */ GX_MAX_ANISOTROPY, +} GXAnisotropy; + +enum GXCITexFmt { + /* 0x8 */ GX_TF_C4 = 8, + /* 0x8 */ GX_TF_C8, + /* 0xA */ GX_TF_C14X2 +}; + +typedef enum _GXTexMtxType { + /* 0x0 */ GX_MTX3x4, + /* 0x1 */ GX_MTX2x4 +} GXTexMtxType; + +typedef enum _GXCompare { + /* 0x0 */ GX_NEVER, + /* 0x1 */ GX_LESS, + /* 0x2 */ GX_EQUAL, + /* 0x3 */ GX_LEQUAL, + /* 0x4 */ GX_GREATER, + /* 0x5 */ GX_NEQUAL, + /* 0x6 */ GX_GEQUAL, + /* 0x7 */ GX_ALWAYS, +} GXCompare; + +typedef enum _GXAlphaOp { + /* 0x0 */ GX_AOP_AND, + /* 0x1 */ GX_AOP_OR, + /* 0x2 */ GX_AOP_XOR, + /* 0x3 */ GX_AOP_XNOR, + /* 0x4 */ GX_MAX_ALPHAOP +} GXAlphaOp; + +typedef enum _GXFogType { + /* 0x0 */ GX_FOG_NONE, + /* 0x2 */ GX_FOG_LIN = 2, + /* 0x2 */ GX_FOG_PERSP_LIN = 2, + /* 0x4 */ GX_FOG_EXP = 4, + /* 0x4 */ GX_FOG_PERSP_EXP = 4, + /* 0x5 */ GX_FOG_EXP2, + /* 0x5 */ GX_FOG_PERSP_EXP2 = 5, + /* 0x6 */ GX_FOG_REVEXP, + /* 0x6 */ GX_FOG_PERSP_REVEXP = 6, + /* 0x7 */ GX_FOG_REVEXP2, + /* 0x7 */ GX_FOG_PERSP_REVEXP2 = 7, + /* 0xA */ GX_FOG_ORTHO_LIN = 10, + /* 0xC */ GX_FOG_ORTHO_EXP = 12, + /* 0xD */ GX_FOG_ORTHO_EXP2, + /* 0xE */ GX_FOG_ORTHO_REVEXP, + /* 0xF */ GX_FOG_ORTHO_REVEXP2, +} GXFogType; + +typedef enum _GXProjectionType { + /* 0x0 */ GX_PERSPECTIVE, + /* 0x1 */ GX_ORTHOGRAPHIC +} GXProjectionType; + +typedef enum _GXTevKAlphaSel { + /* 0x00 */ GX_TEV_KASEL_1, + /* 0x01 */ GX_TEV_KASEL_7_8, + /* 0x02 */ GX_TEV_KASEL_3_4, + /* 0x03 */ GX_TEV_KASEL_5_8, + /* 0x04 */ GX_TEV_KASEL_1_2, + /* 0x05 */ GX_TEV_KASEL_3_8, + /* 0x06 */ GX_TEV_KASEL_1_4, + /* 0x07 */ GX_TEV_KASEL_1_8, + + /* 0x10 */ GX_TEV_KASEL_K0_R = 0x10, + /* 0x11 */ GX_TEV_KASEL_K1_R, + /* 0x12 */ GX_TEV_KASEL_K2_R, + /* 0x13 */ GX_TEV_KASEL_K3_R, + /* 0x14 */ GX_TEV_KASEL_K0_G, + /* 0x15 */ GX_TEV_KASEL_K1_G, + /* 0x16 */ GX_TEV_KASEL_K2_G, + /* 0x17 */ GX_TEV_KASEL_K3_G, + /* 0x18 */ GX_TEV_KASEL_K0_B, + /* 0x19 */ GX_TEV_KASEL_K1_B, + /* 0x1A */ GX_TEV_KASEL_K2_B, + /* 0x1B */ GX_TEV_KASEL_K3_B, + /* 0x1C */ GX_TEV_KASEL_K0_A, + /* 0x1D */ GX_TEV_KASEL_K1_A, + /* 0x1E */ GX_TEV_KASEL_K2_A, + /* 0x1F */ GX_TEV_KASEL_K3_A, +} GXTevKAlphaSel; + +typedef enum _GXTevKColorSel { + /* 0x00 */ GX_TEV_KCSEL_1, + /* 0x01 */ GX_TEV_KCSEL_7_8, + /* 0x02 */ GX_TEV_KCSEL_3_4, + /* 0x03 */ GX_TEV_KCSEL_5_8, + /* 0x04 */ GX_TEV_KCSEL_1_2, + /* 0x05 */ GX_TEV_KCSEL_3_8, + /* 0x06 */ GX_TEV_KCSEL_1_4, + /* 0x07 */ GX_TEV_KCSEL_1_8, + /* 0x0C */ GX_TEV_KCSEL_K0 = 0xC, + /* 0x0D */ GX_TEV_KCSEL_K1, + /* 0x0E */ GX_TEV_KCSEL_K2, + /* 0x0F */ GX_TEV_KCSEL_K3, + /* 0x10 */ GX_TEV_KCSEL_K0_R, + /* 0x11 */ GX_TEV_KCSEL_K1_R, + /* 0x12 */ GX_TEV_KCSEL_K2_R, + /* 0x13 */ GX_TEV_KCSEL_K3_R, + /* 0x14 */ GX_TEV_KCSEL_K0_G, + /* 0x15 */ GX_TEV_KCSEL_K1_G, + /* 0x16 */ GX_TEV_KCSEL_K2_G, + /* 0x17 */ GX_TEV_KCSEL_K3_G, + /* 0x18 */ GX_TEV_KCSEL_K0_B, + /* 0x19 */ GX_TEV_KCSEL_K1_B, + /* 0x1A */ GX_TEV_KCSEL_K2_B, + /* 0x1B */ GX_TEV_KCSEL_K3_B, + /* 0x1C */ GX_TEV_KCSEL_K0_A, + /* 0x1D */ GX_TEV_KCSEL_K1_A, + /* 0x1E */ GX_TEV_KCSEL_K2_A, + /* 0x1F */ GX_TEV_KCSEL_K3_A, +} GXTevKColorSel; + +typedef enum _GXTevSwapSel { + /* 0x0 */ GX_TEV_SWAP0, + /* 0x1 */ GX_TEV_SWAP1, + /* 0x2 */ GX_TEV_SWAP2, + /* 0x3 */ GX_TEV_SWAP3, + /* 0x4 */ GX_MAX_TEVSWAP, +} GXTevSwapSel; + +typedef enum _GXTexGenType { + /* 0x0 */ GX_TG_MTX3x4, + /* 0x1 */ GX_TG_MTX2x4, + /* 0x2 */ GX_TG_BUMP0, + /* 0x3 */ GX_TG_BUMP1, + /* 0x4 */ GX_TG_BUMP2, + /* 0x5 */ GX_TG_BUMP3, + /* 0x6 */ GX_TG_BUMP4, + /* 0x7 */ GX_TG_BUMP5, + /* 0x8 */ GX_TG_BUMP6, + /* 0x9 */ GX_TG_BUMP7, + /* 0xA */ GX_TG_SRTG, +} GXTexGenType; + +typedef enum _GXTexGenSrc { + /* 0x00 */ GX_TG_POS, + /* 0x01 */ GX_TG_NRM, + /* 0x02 */ GX_TG_BINRM, + /* 0x03 */ GX_TG_TANGENT, + /* 0x04 */ GX_TG_TEX0, + /* 0x05 */ GX_TG_TEX1, + /* 0x06 */ GX_TG_TEX2, + /* 0x07 */ GX_TG_TEX3, + /* 0x08 */ GX_TG_TEX4, + /* 0x09 */ GX_TG_TEX5, + /* 0x0A */ GX_TG_TEX6, + /* 0x0B */ GX_TG_TEX7, + /* 0x0C */ GX_TG_TEXCOORD0, + /* 0x0D */ GX_TG_TEXCOORD1, + /* 0x0E */ GX_TG_TEXCOORD2, + /* 0x0F */ GX_TG_TEXCOORD3, + /* 0x10 */ GX_TG_TEXCOORD4, + /* 0x11 */ GX_TG_TEXCOORD5, + /* 0x12 */ GX_TG_TEXCOORD6, +} GXTexGenSrc; + +typedef enum _GXZTexOp { + /* 0x0 */ GX_ZT_DISABLE, + /* 0x1 */ GX_ZT_ADD, + /* 0x2 */ GX_ZT_REPLACE, + /* 0x3 */ GX_MAX_ZTEXOP, +} GXZTexOp; + +typedef enum _GXIndTexStageID { + /* 0x0 */ GX_INDTEXSTAGE0, + /* 0x1 */ GX_INDTEXSTAGE1, + /* 0x2 */ GX_INDTEXSTAGE2, + /* 0x3 */ GX_INDTEXSTAGE3, + /* 0x4 */ GX_MAX_INDTEXSTAGE, +} GXIndTexStageID; + +typedef enum _GXIndTexScale { + /* 0x0 */ GX_ITS_1, + /* 0x1 */ GX_ITS_2, + /* 0x2 */ GX_ITS_4, + /* 0x3 */ GX_ITS_8, + /* 0x4 */ GX_ITS_16, + /* 0x5 */ GX_ITS_32, + /* 0x6 */ GX_ITS_64, + /* 0x7 */ GX_ITS_128, + /* 0x8 */ GX_ITS_256, + /* 0x9 */ GX_MAX_ITSCALE, +} GXIndTexScale; + +typedef enum _GXIndTexMtxID { + /* 0x0 */ GX_ITM_OFF, + /* 0x1 */ GX_ITM_0, + /* 0x2 */ GX_ITM_1, + /* 0x3 */ GX_ITM_2, + /* 0x5 */ GX_ITM_S0 = 5, + /* 0x6 */ GX_ITM_S1, + /* 0x7 */ GX_ITM_S2, + /* 0x9 */ GX_ITM_T0 = 9, + /* 0xA */ GX_ITM_T1, + /* 0xB */ GX_ITM_T2, +} GXIndTexMtxID; + +typedef enum _GXIndTexFormat { + /* 0x0 */ GX_ITF_8, + /* 0x1 */ GX_ITF_5, + /* 0x2 */ GX_ITF_4, + /* 0x3 */ GX_ITF_3, +} GXIndTexFormat; + +typedef enum _GXIndTexBiasSel { + /* 0x0 */ GX_ITB_NONE, + /* 0x1 */ GX_ITB_S, + /* 0x2 */ GX_ITB_T, + /* 0x3 */ GX_ITB_ST, + /* 0x4 */ GX_ITB_U, + /* 0x5 */ GX_ITB_SU, + /* 0x6 */ GX_ITB_TU, + /* 0x7 */ GX_ITB_STU, +} GXIndTexBiasSel; + +typedef enum _GXIndTexAlphaSel { + /* 0x0 */ GX_ITBA_OFF, + /* 0x1 */ GX_ITBA_S, + /* 0x2 */ GX_ITBA_T, + /* 0x3 */ GX_ITBA_U, +} GXIndTexAlphaSel; + +typedef enum _GXIndTexWrap { + /* 0x0 */ GX_ITW_OFF, + /* 0x1 */ GX_ITW_256, + /* 0x2 */ GX_ITW_128, + /* 0x3 */ GX_ITW_64, + /* 0x4 */ GX_ITW_32, + /* 0x5 */ GX_ITW_16, + /* 0x6 */ GX_ITW_0, +} GXIndTexWrap; + +typedef enum _GXTexOffset { + /* 0x0 */ GX_TO_ZERO, + /* 0x1 */ GX_TO_SIXTEENTH, + /* 0x2 */ GX_TO_EIGHTH, + /* 0x3 */ GX_TO_FOURTH, + /* 0x4 */ GX_TO_HALF, + /* 0x5 */ GX_TO_ONE, + /* 0x6 */ GX_MAX_TEXOFFSET, +} GXTexOffset; + +typedef enum _GXTevKColorID { + /* 0x0 */ GX_KCOLOR0, + /* 0x1 */ GX_KCOLOR1, + /* 0x2 */ GX_KCOLOR2, + /* 0x3 */ GX_KCOLOR3, +} GXTevKColorID; + +typedef enum _GXTexCacheSize { + /* 0x0 */ GX_TEXCACHE_32K, + /* 0x1 */ GX_TEXCACHE_128K, + /* 0x2 */ GX_TEXCACHE_512K, + /* 0x3 */ GX_TEXCACHE_NONE, +} GXTexCacheSize; + +typedef enum _GXPosNrmMtx { + GX_PNMTX0 = 3 * 0, + GX_PNMTX1 = 3 * 1, + GX_PNMTX2 = 3 * 2, + GX_PNMTX3 = 3 * 3, + GX_PNMTX4 = 3 * 4, + GX_PNMTX5 = 3 * 5, + GX_PNMTX6 = 3 * 6, + GX_PNMTX7 = 3 * 7, + GX_PNMTX8 = 3 * 8, + GX_PNMTX9 = 3 * 9, +} GXPosNrmMtx; + +typedef enum _GXTexMtx { + GX_TEXMTX0 = 30 + 0 * 3, + GX_TEXMTX1 = 30 + 1 * 3, + GX_TEXMTX2 = 30 + 2 * 3, + GX_TEXMTX3 = 30 + 3 * 3, + GX_TEXMTX4 = 30 + 4 * 3, + GX_TEXMTX5 = 30 + 5 * 3, + GX_TEXMTX6 = 30 + 6 * 3, + GX_TEXMTX7 = 30 + 7 * 3, + GX_TEXMTX8 = 30 + 8 * 3, + GX_TEXMTX9 = 30 + 9 * 3, + GX_IDENTITY = 60, +}; + +typedef enum _GXPTTexMtx { + GX_PTTEXMTX0 = 64 + 0 * 3, + GX_PTTEXMTX1 = 64 + 1 * 3, + GX_PTTEXMTX2 = 64 + 2 * 3, + GX_PTTEXMTX3 = 64 + 3 * 3, + GX_PTTEXMTX4 = 64 + 4 * 3, + GX_PTTEXMTX5 = 64 + 5 * 3, + GX_PTTEXMTX6 = 64 + 6 * 3, + GX_PTTEXMTX7 = 64 + 7 * 3, + GX_PTTEXMTX8 = 64 + 8 * 3, + GX_PTTEXMTX9 = 64 + 9 * 3, + GX_PTTEXMTX10 = 64 + 10 * 3, + GX_PTTEXMTX11 = 64 + 11 * 3, + GX_PTTEXMTX12 = 64 + 12 * 3, + GX_PTTEXMTX13 = 64 + 13 * 3, + GX_PTTEXMTX14 = 64 + 14 * 3, + GX_PTTEXMTX15 = 64 + 15 * 3, + GX_PTTEXMTX16 = 64 + 16 * 3, + GX_PTTEXMTX17 = 64 + 17 * 3, + GX_PTTEXMTX18 = 64 + 18 * 3, + GX_PTTEXMTX19 = 64 + 19 * 3, + GX_PTIDENTITY = 125, +}; + +typedef enum _GXFBClamp { + /* 0x0 */ GX_CLAMP_NONE, + /* 0x1 */ GX_CLAMP_TOP, + /* 0x2 */ GX_CLAMP_BOTTOM, +} GXFBClamp; + +typedef enum _GXPixelFmt { + /* 0x0 */ GX_PF_RGB8_Z24, + /* 0x1 */ GX_PF_RGBA6_Z24, + /* 0x2 */ GX_PF_RGB565_Z16, + /* 0x3 */ GX_PF_Z24, + /* 0x4 */ GX_PF_Y8, + /* 0x5 */ GX_PF_U8, + /* 0x6 */ GX_PF_V8, + /* 0x7 */ GX_PF_YUV420, +} GXPixelFmt; + +typedef enum _GXZFmt16 { + /* 0x0 */ GX_ZC_LINEAR, + /* 0x1 */ GX_ZC_NEAR, + /* 0x2 */ GX_ZC_MID, + /* 0x3 */ GX_ZC_FAR, +} GXZFmt16; + +typedef enum _GXCommand { + GX_CMD_LOAD_INDX_A = 0x20, + GX_CMD_LOAD_INDX_B = 0x28, + GX_CMD_LOAD_INDX_C = 0x30, + GX_CMD_LOAD_INDX_D = 0x38, + + GX_CMD_LOAD_CP_REG = 0x08, + GX_CMD_LOAD_XF_REG = 0x10, +} GXCommand; + +typedef enum _GXClipMode { + /* 0x0 */ GX_CLIP_ENABLE, + /* 0x1 */ GX_CLIP_DISABLE, +} GXClipMode; + +#endif /* GXENUM_H */ \ No newline at end of file diff --git a/include/dolphin/gx/GXStruct.h b/include/dolphin/gx/GXStruct.h new file mode 100644 index 00000000000..4d15b6694f8 --- /dev/null +++ b/include/dolphin/gx/GXStruct.h @@ -0,0 +1,89 @@ +#ifndef GXSTRUCT_H +#define GXSTRUCT_H + +#include "dolphin/types.h" +#include "global.h" + +typedef struct _GXColor { + /* 0x0 */ u8 r; + /* 0x1 */ u8 g; + /* 0x2 */ u8 b; + /* 0x3 */ u8 a; +} GXColor; + +typedef struct _GXColorS10 { + /* 0x0 */ s16 r; + /* 0x2 */ s16 g; + /* 0x4 */ s16 b; + /* 0x6 */ s16 a; +} GXColorS10; + +typedef struct _GXRenderModeObj { + /* 0x00 */ s32 vi_tv_mode; + /* 0x04 */ u16 fb_width; + /* 0x06 */ u16 efb_height; + /* 0x08 */ u16 xfb_height; + /* 0x0A */ u16 vi_x_origin; + /* 0x0C */ u16 vi_y_origin; + /* 0x0E */ u16 vi_width; + /* 0x10 */ u16 vi_height; + /* 0x14 */ s32 xfb_mode; + /* 0x18 */ u8 field_rendering; + /* 0x19 */ u8 antialiasing; + /* 0x1A */ u8 sample_pattern[12][2]; + /* 0x32 */ u8 vfilter[7]; +} GXRenderModeObj; + +STATIC_ASSERT(sizeof(_GXRenderModeObj) == 60); + +typedef struct _GXTexObj { + /* 0x00 */ u32 texture_filter; + /* 0x04 */ u32 texture_lod; + /* 0x08 */ u32 texture_size; + /* 0x0C */ u32 texture_address; + /* 0x10 */ u32 user_data; + /* 0x14 */ u32 texture_format; + /* 0x18 */ u32 tlut_name; + /* 0x1C */ u16 texture_time_count; + /* 0x1E */ u8 texture_tile_type; + /* 0x1F */ u8 texture_flags; +} GXTexObj; + +typedef struct _GXTlutObj { + /* 0x0 */ u32 format; + /* 0x4 */ u32 address; + /* 0x8 */ u32 numEntries; +} GXTlutObj; + +typedef struct _GXLightObj { + /* 0x0 */ u32 data[16]; +} GXLightObj; + +typedef struct _GXFogAdjTable { + /* 0x0 */ u16 r[10]; +} GXFogAdjTable; + +typedef struct _GXFifoObj { + /* 0x00 */ void* base; + /* 0x04 */ u32 end; + /* 0x08 */ u32 size; + /* 0x0C */ u32 high_wtrmark; + /* 0x10 */ u32 low_wtrmark; + /* 0x14 */ void* read_ptr; + /* 0x18 */ void* write_ptr; + /* 0x1C */ void* rw_dst; + /* 0x20 */ u8 fifo_wrap; + /* 0x21 */ u8 cpu_fifo_ready; + /* 0x22 */ u8 gp_fifo_ready; + /* 0x23 */ u8 field_0x23[93]; +} GXFifoObj; // Size: 0x80 + +typedef struct _GXTexRegion { + /* 0x00 */ u8 dummy[0x10]; +} GXTexRegion; // Size: 0x10 + +typedef struct _GXTlutRegion { + /* 0x00 */ u8 dummy[0x10]; +} GXTlutRegion; // Size: 0x10 + +#endif /* GXSTRUCT_H */ diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 50f6bfbebdc..84c3e635221 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -1,236 +1,81 @@ -// at some point: we should split this up into various OS/... headers. but not -// yet, since barely any files include this atm. - #ifndef OS_H_ #define OS_H_ #include "Runtime.PPCEABI.H/__va_arg.h" -#include "dolphin/types.h" - -#include "Runtime.PPCEABI.H/__va_arg.h" +#include "dolphin/os/OSAlarm.h" +#include "dolphin/os/OSAlloc.h" +#include "dolphin/os/OSArena.h" +#include "dolphin/os/OSAudioSystem.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/os/OSContext.h" #include "dolphin/os/OSError.h" +#include "dolphin/os/OSExec.h" +#include "dolphin/os/OSFont.h" +#include "dolphin/os/OSInterrupt.h" #include "dolphin/os/OSLink.h" +#include "dolphin/os/OSMemory.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" +#include "dolphin/os/OSReboot.h" +#include "dolphin/os/OSReset.h" +#include "dolphin/os/OSResetSW.h" +#include "dolphin/os/OSRtc.h" +#include "dolphin/os/OSSync.h" +#include "dolphin/os/OSThread.h" +#include "dolphin/os/OSTime.h" + +#ifdef __cplusplus +extern "C" { +#endif #define OS_BUS_CLOCK (*(u32*)0x800000F8) #define OS_CORE_CLOCK (*(u32*)0x800000FC) #define OS_TIMER_CLOCK (OS_BUS_CLOCK / 4) -/* TODO: more structs, and get rid of the ones that are faked! */ - #define OS_MESSAGE_NON_BLOCKING 0 #define OS_MESSAGE_BLOCKING 1 -struct OSThread; -struct OSMutex { - u8 unk[24]; -}; - -struct OSMutexLink { - struct OSMutex* prev; - struct OSMutex* next; -}; - -struct OSMutexQueue { - struct OSMutex* prev; - struct OSMutex* next; -}; - -struct OSContext { - u32 gpr[32]; - u32 cr; - u32 lr; - u32 ctr; - u32 xer; - double fpr[32]; - u32 padding_1; - u32 fpscr; - u32 srr0; - u32 srr1; - u16 mode; - u16 state; - u32 gqr[8]; - u32 padding_2; - double ps[32]; -}; - -typedef void (*OSSwitchThreadCallback)(OSThread* from, OSThread* to); - -struct OSThreadLink { - struct OSThread* prev; - struct OSThread* next; -}; - -struct OSThreadQueue { - struct OSThread* head; - struct OSThread* tail; -}; - -struct OSCond { - struct OSThreadQueue queue; -}; - -typedef void* OSMessage; - -struct OSMessageQueue { - struct OSThreadQueue sending_queue; - struct OSThreadQueue receiving_queue; - void** message_array; - s32 num_messages; - s32 first_index; - s32 num_used; -}; - -typedef u32 OSTick; - -typedef s64 OSTime; - -struct OSCalendarTime { - s32 seconds; - s32 minutes; - s32 hours; - s32 day_of_month; - s32 month; - s32 year; - s32 week_day; - s32 year_day; - s32 milliseconds; - s32 microseconds; -}; - -typedef s32 OSHeapHandle; - -typedef enum OSSoundMode { - SOUND_MODE_MONO = 0, - SOUND_MODE_STEREO = 1, -} OSSoundMode; - -typedef u16 OSThreadState; -#define OS_THREAD_STATE_UNINITIALIZED 0 -#define OS_THREAD_STATE_READY 1 -#define OS_THREAD_STATE_RUNNING 2 -#define OS_THREAD_STATE_WAITING 4 -#define OS_THREAD_STATE_DEAD 8 - -struct OSThread { - OSContext context; - OSThreadState state; - u16 attributes; - s32 suspend_count; - u32 effective_priority; - u32 base_priority; - void* exit_value; - OSThreadQueue* queue; - OSThreadLink link; - OSThreadQueue join_queue; - OSMutex* mutex; - OSMutexQueue owned_mutexes; - OSThreadLink active_threads_link; - u8* stack_base; - u8* stack_end; - u8* error_code; - void* data[2]; -}; - -struct OSAlarm; -struct OSAlarmLink { - /* 0x0 */ OSAlarm* prev; - /* 0x4 */ OSAlarm* next; -}; - -typedef void (*OSAlarmHandler)(OSAlarm* alarm, OSContext* context); - -struct OSAlarm { - /* 0x00 */ OSAlarmHandler handler; - /* 0x04 */ u32 tag; - /* 0x08 */ OSTime fire_time; - /* 0x10 */ OSAlarmLink link; - /* 0x18 */ OSTime period_time; - /* 0x20 */ OSTime start_time; -}; // Size: 0x28 - -extern "C" { -s32 OSEnableScheduler(void); -s32 OSDisableScheduler(void); -s32 OSCheckActiveThreads(void); -OSThread* OSGetCurrentThread(void); - -s32 OSSuspendThread(OSThread* thread); -s32 OSSetThreadPriority(OSThread* thread, u32 pri); -s32 OSGetThreadPriority(OSThread* thread); -BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stack, u32 stackSize, - int priority, int attr); -void OSCancelThread(OSThread* thread); -void OSDetachThread(OSThread* thread); -s32 OSResumeThread(OSThread* thread); -void OSExitThread(void* exit_val); BOOL OSIsThreadSuspended(OSThread* thread); -BOOL OSIsThreadTerminated(OSThread* thread); -OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback callback); -void OSInitMessageQueue(OSMessageQueue* queue, OSMessage* messages, int message_count); -BOOL OSReceiveMessage(OSMessageQueue* queue, OSMessage* message, int flags); -BOOL OSSendMessage(OSMessageQueue* queue, OSMessage message, int flags); -BOOL OSJamMessage(OSMessageQueue* queue, OSMessage message, int flags); +u32 OSGetConsoleType(void); -s32 OSGetConsoleType(void); -u32 OSGetResetCode(void); - -u32 OSGetSoundMode(void); -void OSSetSoundMode(OSSoundMode mode); - -void OSAttention(const char* msg, ...); -void OSPanic(const char* file, s32 line, const char* fmt, ...); -void OSReport(const char* fmt, ...); -void OSReport_Error(const char* fmt, ...); -void OSReport_FatalError(const char* fmt, ...); -void OSReport_System(const char* fmt, ...); -void OSReport_Warning(const char* fmt, ...); +void OSAttention(char* msg, ...); +void OSPanic(char* file, s32 line, char* fmt, ...); +void OSReport(char* fmt, ...); +void OSReport_Error(char* fmt, ...); +void OSReport_FatalError(char* fmt, ...); +void OSReport_System(char* fmt, ...); +void OSReport_Warning(char* fmt, ...); void OSReportDisable(void); void OSReportEnable(void); void OSReportForceEnableOff(void); void OSReportForceEnableOn(void); -void OSVReport(const char* format, va_list list); - -void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* out_time); -OSTime OSGetTime(void); -OSTick OSGetTick(void); - -u32 OSGetArenaLo(); -u32 OSGetArenaHi(); -u32 OSInitAlloc(u32 low, u32 high, int maxHeaps); -void OSSetArenaLo(u32 newLo); -void OSSetArenaHi(u32 newHi); -void* OSAllocFromArenaLo(u32 size, int alignment); - -void OSInitMutex(OSMutex* mutex); -void OSLockMutex(OSMutex* mutex); -BOOL OSTryLockMutex(OSMutex* mutex); -void OSUnlockMutex(OSMutex* mutex); - -BOOL OSDisableInterrupts(); -BOOL OSEnableInterrupts(); -BOOL OSRestoreInterrupts(s32 level); - -void OSResetSystem(s32 param_1, u32 param_2, s32 param_3); - -void OSSetSaveRegion(void* start, void* end); - -void LCDisable(void); +void OSVReport(char* format, va_list list); +void OSVAttention(char* fmt, va_list args); +void OSReportInit(void); void OSReportInit__Fv(void); // needed for inline asm u8* OSGetStackPointer(void); +void __OSFPRInit(void); +static void InquiryCallback(u32 param_0, void* param_1); +void OSInit(void); +static void OSExceptionInit(void); +void __OSDBIntegrator(void); +void __OSDBJump(void); -void OSCreateAlarm(OSAlarm* alarm); -void OSCancelAlarm(OSAlarm* alarm); -void OSSetAlarm(OSAlarm* alarm, OSTime time, OSAlarmHandler handler); -void OSSetPeriodicAlarm(OSAlarm*, OSTime, OSTime, OSAlarmHandler); - -void OSInitCond(OSCond* cond); -void OSWaitCond(OSCond* cond, OSMutex* mutex); -void OSSignalCond(OSCond* cond); - -void DCStoreRangeNoSync(void*, u32); +typedef void (*OSExceptionHandler)(OSException, OSContext*); +OSExceptionHandler __OSSetExceptionHandler(OSException exception, OSExceptionHandler handler); +OSExceptionHandler __OSGetExceptionHandler(OSException exception); +static void OSExceptionVector(void); +void __DBVECTOR(); +void __OSEVSetNumber(); +void __OSEVEnd(); +static void OSDefaultExceptionHandler(OSException exception, OSContext* context); +void __OSPSInit(void); +void __OSGetDIConfig(void); +void OSRegisterVersion(char* version); +void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); inline s16 __OSf32tos16(register f32 inF) { register s16 out; @@ -268,7 +113,7 @@ inline void OSf32tou8(f32* f, u8* out) { *out = __OSf32tou8(*f); } -inline void OSInitFastCast(void) { +inline void i_OSInitFastCast(void) { // clang-format off asm { li r3, 4 @@ -287,14 +132,6 @@ inline void OSInitFastCast(void) { // clang-format on } -}; // extern "C" - -void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); - -void OSVAttention(const char* fmt, va_list args); - -void OSReportInit(void); - #include "dolphin/dvd/dvd.h" struct GLOBAL_MEMORY { @@ -386,4 +223,8 @@ inline void* OSPhysicalToCached(u32 offset) { return (void*)(offset + 0x80000000); } +#ifdef __cplusplus +}; +#endif + #endif diff --git a/include/dolphin/os/OSAlarm.h b/include/dolphin/os/OSAlarm.h index af8e856aa35..536931baa85 100644 --- a/include/dolphin/os/OSAlarm.h +++ b/include/dolphin/os/OSAlarm.h @@ -2,5 +2,41 @@ #define OSALARM_H #include "dolphin/types.h" +#include "dolphin/os/OSTime.h" +#include "dolphin/os/OSError.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSAlarmLink { + /* 0x0 */ struct OSAlarm* prev; + /* 0x4 */ struct OSAlarm* next; +} OSAlarmLink; + +typedef void (*OSAlarmHandler)(struct OSAlarm* alarm, struct OSContext* context); + +typedef struct OSAlarm { + /* 0x00 */ OSAlarmHandler handler; + /* 0x04 */ u32 tag; + /* 0x08 */ OSTime fire_time; + /* 0x10 */ OSAlarmLink link; + /* 0x18 */ OSTime period_time; + /* 0x20 */ OSTime start_time; +} OSAlarm; // Size: 0x28 + +void OSInitAlarm(void); +void OSCreateAlarm(OSAlarm* alarm); +static void InsertAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler* handler); +void OSSetAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler* handler); +void OSSetPeriodicAlarm(OSAlarm* alarm, s64 start, s64 period, OSAlarmHandler* handler); +void OSCancelAlarm(OSAlarm* alarm); +static void DecrementerExceptionCallback(OSException* exception, struct OSContext* context); +static void DecrementerExceptionHandler(OSException* exception, struct OSContext* context); +static s32 OnReset(s32 param_0); + +#ifdef __cplusplus +}; +#endif #endif /* OSALARM_H */ diff --git a/include/dolphin/os/OSAlloc.h b/include/dolphin/os/OSAlloc.h index a95c972b86d..b5af8dbf2a2 100644 --- a/include/dolphin/os/OSAlloc.h +++ b/include/dolphin/os/OSAlloc.h @@ -3,4 +3,20 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef u32 OSHeapHandle; + +static void* DLInsert(void* param_0, void* param_1); +void OSFreeToHeap(OSHeapHandle heap, void* ptr); +void OSSetCurrentHeap(OSHeapHandle heap); +void* OSInitAlloc(void* lo, void* hi, s32 maxHeaps); +OSHeapHandle OSCreateHeap(void* start, void* end); + +#ifdef __cplusplus +}; +#endif + #endif /* OSALLOC_H */ diff --git a/include/dolphin/os/OSArena.h b/include/dolphin/os/OSArena.h index 48e2f67217f..4e5a76c2940 100644 --- a/include/dolphin/os/OSArena.h +++ b/include/dolphin/os/OSArena.h @@ -3,4 +3,18 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +void* OSGetArenaHi(void); +void* OSGetArenaLo(void); +void OSSetArenaHi(void* hi); +void OSSetArenaLo(void* lo); +void* OSAllocFromArenaLo(u32 size, s32 alignment); + +#ifdef __cplusplus +}; +#endif + #endif /* OSARENA_H */ diff --git a/include/dolphin/os/OSAudioSystem.h b/include/dolphin/os/OSAudioSystem.h index cf406f4bcd1..4df4931d48e 100644 --- a/include/dolphin/os/OSAudioSystem.h +++ b/include/dolphin/os/OSAudioSystem.h @@ -3,4 +3,15 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +void __OSInitAudioSystem(void); +void __OSStopAudioSystem(void); + +#ifdef __cplusplus +}; +#endif + #endif /* OSAUDIOSYSTEM_H */ diff --git a/include/dolphin/os/OSCache.h b/include/dolphin/os/OSCache.h index 5d21ae7ecb8..e0a1939e79f 100644 --- a/include/dolphin/os/OSCache.h +++ b/include/dolphin/os/OSCache.h @@ -3,10 +3,32 @@ #include "dolphin/types.h" +#ifdef __cplusplus extern "C" { -void DCInvalidateRange(void*, u32); -void DCStoreRange(void*, u32); -void DCStoreRangeNoSync(void*, u32); -} +#endif + +static void DCEnable(void); +void DCInvalidateRange(void* start, u32 nBytes); +void DCFlushRange(void* start, u32 nBytes); +void DCStoreRange(void* start, u32 nBytes); +void DCFlushRangeNoSync(void* start, u32 nBytes); +void DCStoreRangeNoSync(void* start, u32 nBytes); +void DCZeroRange(void* start, u32 nBytes); +void ICInvalidateRange(void* start, u32 nBytes); +void ICFlashInvalidate(void); +static void ICEnable(void); +void __LCEnable(void); +void LCEnable(void); +void LCDisable(void); +static void LCStoreBlocks(void* destAddr, void* srcAddr, u32 blockNum); +u32 LCStoreData(void* destAddr, void* srcAddr, u32 nBytes); +void LCQueueWait(u32 len); +static void L2GlobalInvalidate(void); +static void DMAErrorHandler(s32 error, struct OSContext* context); +void __OSCacheInit(void); + +#ifdef __cplusplus +}; +#endif #endif /* OSCACHE_H */ diff --git a/include/dolphin/os/OSContext.h b/include/dolphin/os/OSContext.h index b6eaf40383c..0de4725bde5 100644 --- a/include/dolphin/os/OSContext.h +++ b/include/dolphin/os/OSContext.h @@ -3,4 +3,45 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*OSSwitchThreadCallback)(struct OSThread* from, struct OSThread* to); + +typedef struct OSContext { + /* 0x000 */ u32 gpr[32]; + /* 0x080 */ u32 cr; + /* 0x084 */ u32 lr; + /* 0x088 */ u32 ctr; + /* 0x08C */ u32 xer; + /* 0x090 */ f64 fpr[32]; + /* 0x190 */ u32 padding_1; + /* 0x194 */ u32 fpscr; + /* 0x198 */ u32 srr0; + /* 0x19C */ u32 srr1; + /* 0x1A0 */ u16 mode; + /* 0x1A2 */ u16 state; + /* 0x1A4 */ u32 gqr[8]; + /* 0x1C4 */ f64 ps[32]; +} OSContext; + +void __OSLoadFPUContext(void); +void __OSSaveFPUContext(OSContext* context); +void OSSaveFPUContext(OSContext* context); +void OSSetCurrentContext(OSContext* context); +OSContext* OSGetCurrentContext(void); +void OSSaveContext(OSContext* context); +void OSLoadContext(OSContext* context); +void OSClearContext(OSContext* context); +void OSInitContext(OSContext* context, u32 pc, u32 lr); +void OSDumpContext(OSContext* context); +static void OSSwitchFPUContext(OSContext* context); +void __OSContextInit(void); +void OSFillFPUContext(OSContext* context); + +#ifdef __cplusplus +}; +#endif + #endif /* OSCONTEXT_H */ diff --git a/include/dolphin/os/OSError.h b/include/dolphin/os/OSError.h index 7dc8e04267c..7333e207a4e 100644 --- a/include/dolphin/os/OSError.h +++ b/include/dolphin/os/OSError.h @@ -3,31 +3,60 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + struct OSContext; extern u32 __OSFpscrEnableBits; typedef u16 OSError; -typedef void (*OSErrorHandler)(OSError, OSContext*, u32, u32); +typedef void (*OSErrorHandler)(OSError error, OSContext* context, u32, u32); -#define OS_ERROR_SYSTEM_RESET 0x0 -#define OS_ERROR_MACHINE_CHECK 0x1 -#define OS_ERROR_DSI 0x2 -#define OS_ERROR_ISI 0x3 -#define OS_ERROR_INTERRUPT 0x4 -#define OS_ERROR_ALIGNMENT 0x5 -#define OS_ERROR_PROGRAM 0x6 -#define OS_ERROR_FLOATING_POINT 0x7 -#define OS_ERROR_DECREMENTER 0x8 -#define OS_ERROR_SYSTEM_CALL 0x9 -#define OS_ERROR_TRACE 0xa -#define OS_ERROR_PERFORMANCE_MONITOR 0xb -#define OS_ERROR_BREAKPOINT 0xc -#define OS_ERROR_RESERVED 0xd -#define OS_ERROR_THERMAL_INTERRUPT 0xe -#define OS_ERROR_MEMORY_PROTECTION 0xf -#define OS_ERROR_FLOATING_POINT_EXCEPTION 0x10 +#define OS_ERROR_SYSTEM_RESET 0 +#define OS_ERROR_MACHINE_CHECK 1 +#define OS_ERROR_DSI 2 +#define OS_ERROR_ISI 3 +#define OS_ERROR_INTERRUPT 4 +#define OS_ERROR_ALIGNMENT 5 +#define OS_ERROR_PROGRAM 6 +#define OS_ERROR_FLOATING_POINT 7 +#define OS_ERROR_DECREMENTER 8 +#define OS_ERROR_SYSTEM_CALL 9 +#define OS_ERROR_TRACE 10 +#define OS_ERROR_PERFORMANCE_MONITOR 11 +#define OS_ERROR_BREAKPOINT 12 +#define OS_ERROR_RESERVED 13 +#define OS_ERROR_THERMAL_INTERRUPT 14 +#define OS_ERROR_MEMORY_PROTECTION 15 +#define OS_ERROR_FLOATING_POINT_EXCEPTION 16 -extern "C" void OSSetErrorHandler(OSError, OSErrorHandler); +typedef enum OSException { + EXCEPTION_SYSTEM_RESET, + EXCEPTION_MACHINE_CHECK, + EXCEPTION_DSI, + EXCEPTION_ISI, + EXCEPTION_EXTERNAL_INTERRUPT, + EXCEPTION_ALIGNMENT, + EXCEPTION_PROGRAM, + EXCEPTION_FLOATING_POINT, + EXCEPTION_DECREMENTER, + EXCEPTION_SYSTEM_CALL, + EXCEPTION_TRACE , + EXCEPTION_PERFORMANCE_MONITOR, + EXCEPTION_BREAKPOINT, + EXCEPTION_RESERVED, + EXCEPTION_THERMAL_INTERRUPT, + EXCEPTION_MEMORY_PROTECTION, + EXCEPTION_FLOATING_POINT_EXCEPTION, +} OSException; + +OSErrorHandler OSSetErrorHandler(OSError error, OSErrorHandler handler); +void __OSUnhandledException(OSException exception, OSContext* context, u32 dsisr, u32 dar); + +#ifdef __cplusplus +}; +#endif #endif /* OSERROR_H */ diff --git a/include/dolphin/os/OSExec.h b/include/dolphin/os/OSExec.h index 040e5b89eea..cb6a2a9d6a9 100644 --- a/include/dolphin/os/OSExec.h +++ b/include/dolphin/os/OSExec.h @@ -3,4 +3,21 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +static s32 PackArgs(void* param_0, u32 param_1, void* param_2); +static void Run(void); +static void ReadDisc(void* param_0, s32 param_1, s32 param_2); +static void Callback(void); +void __OSGetExecParams(void* param_0); +static void GetApploaderPosition(void); +void __OSBootDolSimple(u32 param_0, u32 param_1, void* param_2, void* param_3, s32 param_4, u32 param_5, void* param_6); +void __OSBootDol(s32 param_0, u32 param_1, s32 param_2); + +#ifdef __cplusplus +}; +#endif + #endif /* OSEXEC_H */ diff --git a/include/dolphin/os/OSFont.h b/include/dolphin/os/OSFont.h index 8ec4ef5b392..cc29b5039f9 100644 --- a/include/dolphin/os/OSFont.h +++ b/include/dolphin/os/OSFont.h @@ -3,4 +3,16 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +static u32 GetFontCode(s16 param_0, u32 param_1); +u16 OSGetFontEncode(void); +static char* ParseStringS(s16 param_0, char* param_1, void* param_2, u32* param_3, u32 param_4, void* param_5); + +#ifdef __cplusplus +}; +#endif + #endif /* OSFONT_H */ diff --git a/include/dolphin/os/OSInterrupt.h b/include/dolphin/os/OSInterrupt.h index d9074ba30f2..130ed6255d4 100644 --- a/include/dolphin/os/OSInterrupt.h +++ b/include/dolphin/os/OSInterrupt.h @@ -3,4 +3,29 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef s16 OSInterrupt; +typedef u32 OSInterruptMask; +typedef void (*OSInterruptHandler)(OSInterrupt interrupt, struct OSContext* context); + +BOOL OSDisableInterrupts(void); +void __RAS_OSDisableInterrupts_end(void); +BOOL OSEnableInterrupts(void); +BOOL OSRestoreInterrupts(BOOL enable); +OSInterruptHandler __OSSetInterruptHandler(OSInterrupt interrupt, OSInterruptHandler handler); +OSInterruptHandler __OSGetInterruptHandler(s16 index); +void __OSInterruptInit(void); +static OSInterruptMask SetInterruptMask(OSInterruptMask param_0, OSInterruptMask param_1); +OSInterruptMask __OSMaskInterrupts(OSInterruptMask mask); +OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask); +void __OSDispatchInterrupt(OSInterrupt interrupt, struct OSContext* context); +static void ExternalInterruptHandler(OSInterrupt interrupt, struct OSContext* context); + +#ifdef __cplusplus +}; +#endif + #endif /* OSINTERRUPT_H */ diff --git a/include/dolphin/os/OSLink.h b/include/dolphin/os/OSLink.h index 5244e16c108..454e6d04f81 100644 --- a/include/dolphin/os/OSLink.h +++ b/include/dolphin/os/OSLink.h @@ -3,12 +3,16 @@ #include "dolphin/types.h" -struct OSSectionInfo { +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSSectionInfo { u32 mOffset; u32 mSize; -}; +} OSSectionInfo; -struct OSModuleInfo { +typedef struct OSModuleInfo { u32 mId; u32 mNext; u32 mPrev; @@ -33,10 +37,21 @@ struct OSModuleInfo { u32 mModuleAlignment; u32 mBssAlignment; u32 fixSize; -}; +} OSModuleInfo; -extern "C" BOOL OSLink(OSModuleInfo*); -extern "C" BOOL OSLinkFixed(OSModuleInfo*, u32); -extern "C" BOOL OSUnlink(OSModuleInfo*); +BOOL OSLink(OSModuleInfo* module); +BOOL OSLinkFixed(OSModuleInfo* module, u32 param_1); +BOOL OSUnlink(OSModuleInfo* module); +static void OSNotifyLink(void); +static void OSNotifyUnlink(void); +void OSSetStringTable(void* string_table); +static BOOL Relocate(OSModuleInfo* param_0, OSModuleInfo* param_1); +static BOOL Link(OSModuleInfo* module, u32 param_1); +static BOOL Undo(OSModuleInfo* param_0, OSModuleInfo* param_1); +void __OSModuleInit(void); + +#ifdef __cplusplus +}; +#endif #endif /* OSLINK_H */ diff --git a/include/dolphin/os/OSMemory.h b/include/dolphin/os/OSMemory.h index fa2ec826a04..e91de889485 100644 --- a/include/dolphin/os/OSMemory.h +++ b/include/dolphin/os/OSMemory.h @@ -2,5 +2,22 @@ #define OSMEMORY_H #include "dolphin/types.h" +#include "dolphin/os/OSInterrupt.h" + +#ifdef __cplusplus +extern "C" { +#endif + +static s32 OnReset(s32 param_0); +static void MEMIntrruptHandler(OSInterrupt interrupt, struct OSContext* context); +void OSProtectRange(u32 channel, void* address, u32 nBytes, u32 control); +static void Config24MB(void); +static void Config48MB(void); +static void RealMode(void); +void __OSInitMemoryProtection(void); + +#ifdef __cplusplus +}; +#endif #endif /* OSMEMORY_H */ diff --git a/include/dolphin/os/OSMessage.h b/include/dolphin/os/OSMessage.h index 8988917f1ca..d8a42deedad 100644 --- a/include/dolphin/os/OSMessage.h +++ b/include/dolphin/os/OSMessage.h @@ -2,5 +2,30 @@ #define OSMESSAGE_H #include "dolphin/types.h" +#include "dolphin/os/OSThread.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void* OSMessage; + +typedef struct OSMessageQueue { + /* 0x00 */ OSThreadQueue sending_queue; + /* 0x08 */ OSThreadQueue receiving_queue; + /* 0x10 */ OSMessage* message_array; + /* 0x14 */ s32 num_messages; + /* 0x18 */ s32 first_index; + /* 0x1C */ s32 num_used; +} OSMessageQueue; + +void OSInitMessageQueue(OSMessageQueue* queue, OSMessage* msgArray, s32 msgCount); +BOOL OSSendMessage(OSMessageQueue* queue, OSMessage msg, s32 flags); +BOOL OSReceiveMessage(OSMessageQueue* queue, OSMessage* msg, s32 flags); +BOOL OSJamMessage(OSMessageQueue* queue, OSMessage msg, s32 flags); + +#ifdef __cplusplus +}; +#endif #endif /* OSMESSAGE_H */ diff --git a/include/dolphin/os/OSMutex.h b/include/dolphin/os/OSMutex.h index 9ae43c868c5..81d2c754351 100644 --- a/include/dolphin/os/OSMutex.h +++ b/include/dolphin/os/OSMutex.h @@ -2,5 +2,26 @@ #define OSMUTEX_H #include "dolphin/types.h" +#include "dolphin/os/OSThread.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void OSInitMutex(struct OSMutex* mutex); +void OSLockMutex(struct OSMutex* mutex); +void OSUnlockMutex(struct OSMutex* mutex); +void __OSUnlockAllMutex(struct OSThread* thread); +s32 OSTryLockMutex(struct OSMutex* mutex); +void OSInitCond(struct OSCond* cond); +void OSWaitCond(struct OSCond* cond, struct OSMutex* mutex); +void OSSignalCond(struct OSCond* cond); +s32 __OSCheckMutex(struct OSThread* thread); +BOOL __OSCheckDeadLock(struct OSThread* thread); +BOOL __OSCheckMutexes(struct OSThread* thread); + +#ifdef __cplusplus +}; +#endif #endif /* OSMUTEX_H */ diff --git a/include/dolphin/os/OSReboot.h b/include/dolphin/os/OSReboot.h index dcd879450c2..4b9438a1acf 100644 --- a/include/dolphin/os/OSReboot.h +++ b/include/dolphin/os/OSReboot.h @@ -3,4 +3,16 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +void __OSReboot(u32 param_0, u32 param_1); +void OSSetSaveRegion(void* start, void* end); +void OSGetSaveRegion(void* start, void* end); + +#ifdef __cplusplus +}; +#endif + #endif /* OSREBOOT_H */ diff --git a/include/dolphin/os/OSReset.h b/include/dolphin/os/OSReset.h index 6b5649851d7..49281240521 100644 --- a/include/dolphin/os/OSReset.h +++ b/include/dolphin/os/OSReset.h @@ -3,4 +3,29 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef s32 (*OSResetFunction)(s32); + +typedef struct OSResetFunctionInfo { + /* 0x0 */ OSResetFunction func; + /* 0x4 */ u32 priority; + /* 0x8 */ struct OSResetFunctionInfo* next; + /* 0xC */ struct OSResetFunctionInfo* prev; +} OSResetFunctionInfo; + +void OSRegisterResetFunction(OSResetFunctionInfo* info); +BOOL __OSCallResetFunctions(s32 param_0); +static void Reset(s32 param_0); +static void KillThreads(void); +void __OSDoHotReset(s32 param_0); +void OSResetSystem(s32 reset, u32 resetCode, BOOL forceMenu); +u32 OSGetResetCode(void); + +#ifdef __cplusplus +}; +#endif + #endif /* OSRESET_H */ diff --git a/include/dolphin/os/OSResetSW.h b/include/dolphin/os/OSResetSW.h index 460b93e3db9..9cacab0c8f7 100644 --- a/include/dolphin/os/OSResetSW.h +++ b/include/dolphin/os/OSResetSW.h @@ -3,4 +3,16 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +void __OSResetSWInterruptHandler(void); +static BOOL OSGetResetButtonState(void); +BOOL OSGetResetSwitchState(void); + +#ifdef __cplusplus +}; +#endif + #endif /* OSRESETSW_H */ diff --git a/include/dolphin/os/OSRtc.h b/include/dolphin/os/OSRtc.h index b2e62a9f683..a3c04a1ac37 100644 --- a/include/dolphin/os/OSRtc.h +++ b/include/dolphin/os/OSRtc.h @@ -3,4 +3,35 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum OSSoundMode { + /* 0x0 */ SOUND_MODE_MONO, + /* 0x1 */ SOUND_MODE_STEREO, +} OSSoundMode; + +static void WriteSramCallback(void); +static u8 WriteSram(u8* param_0, u32 param_1, u32 param_2); +void __OSInitSram(void); +u16* __OSLockSram(void); +u16* __OSLockSramEx(void); +static u32 UnlockSram(s32 param_0, u32 param_1); +u32 __OSUnlockSram(s32 param_0); +u32 __OSUnlockSramEx(s32 param_0); +u32 __OSSyncSram(void); +u32 OSGetSoundMode(void); +void OSSetSoundMode(OSSoundMode mode); +u32 OSGetProgressiveMode(void); +void OSSetProgressiveMode(u32 mode); +u16 OSGetWirelessID(s32 index); +void OSSetWirelessID(s32 index, u16 id); +static u16 OSGetGbsMode(void); +static void OSSetGbsMode(u16 mode); + +#ifdef __cplusplus +}; +#endif + #endif /* OSRTC_H */ diff --git a/include/dolphin/os/OSSync.h b/include/dolphin/os/OSSync.h index 827ee70b8e5..d7fcc930f50 100644 --- a/include/dolphin/os/OSSync.h +++ b/include/dolphin/os/OSSync.h @@ -3,4 +3,15 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +static void SystemCallVector(void); +void __OSInitSystemCall(void); + +#ifdef __cplusplus +}; +#endif + #endif /* OSSYNC_H */ diff --git a/include/dolphin/os/OSThread.h b/include/dolphin/os/OSThread.h index f2264155712..0776ded1c1a 100644 --- a/include/dolphin/os/OSThread.h +++ b/include/dolphin/os/OSThread.h @@ -2,5 +2,107 @@ #define OSTHREAD_H #include "dolphin/types.h" +#include "dolphin/os/OSMutex.h" +#include "dolphin/os/OSContext.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef u16 OSThreadState; +#define OS_THREAD_STATE_UNINITIALIZED 0 +#define OS_THREAD_STATE_READY 1 +#define OS_THREAD_STATE_RUNNING 2 +#define OS_THREAD_STATE_WAITING 4 +#define OS_THREAD_STATE_DEAD 8 + +typedef struct OSMutexLink { + struct OSMutex* prev; + struct OSMutex* next; +} OSMutexLink; + +typedef struct OSMutexQueue { + struct OSMutex* prev; + struct OSMutex* next; +} OSMutexQueue; + +typedef struct OSMutex { + /* 0x00 */ //OSThreadQueue queue; + /* 0x08 */ //OSThread* thread; + /* 0x0C */ //s32 count; + /* 0x10 */ //OSMutexLink link; + u8 unk[24]; +} OSMutex; // Size: 0x18 + +typedef struct OSThreadLink { + struct OSThread* prev; + struct OSThread* next; +} OSThreadLink; + +typedef struct OSThreadQueue { + /* 0x0 */ struct OSThread* head; + /* 0x4 */ struct OSThread* tail; +} OSThreadQueue; + +typedef struct OSCond { + struct OSThreadQueue queue; +} OSCond; + +typedef void (*OSSwitchThreadCallback)(struct OSThread* from, struct OSThread* to); + +typedef struct OSThread { + struct OSContext context; + OSThreadState state; + u16 attributes; + s32 suspend_count; + u32 effective_priority; + u32 base_priority; + void* exit_value; + struct OSThreadQueue* queue; + struct OSThreadLink link; + struct OSThreadQueue join_queue; + struct OSMutex* mutex; + OSMutexQueue owned_mutexes; + struct OSThreadLink active_threads_link; + u8* stack_base; + u8* stack_end; + u8* error_code; + void* data[2]; +} OSThread; + +static void DefaultSwitchThreadCallback(OSThread* from, OSThread* to); +OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback func); +void __OSThreadInit(void); +void OSInitThreadQueue(OSThreadQueue* queue); +OSThread* OSGetCurrentThread(void); +BOOL OSIsThreadTerminated(OSThread* thread); +s32 OSDisableScheduler(void); +s32 OSEnableScheduler(void); +static void UnsetRun(OSThread* thread); +s32 __OSGetEffectivePriority(OSThread* thread); +static void SetEffectivePriority(OSThread* thread, s32 priority); +void __OSPromoteThread(OSThread* thread, s32 priority); +static void SelectThread(OSThread* thread); +void __OSReschedule(void); +void OSYieldThread(void); +BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stackBase, + u32 stackSize, s32 priority, u16 attribute); +void OSExitThread(void* exitValue); +void OSCancelThread(OSThread* thread); +void OSDetachThread(OSThread* thread); +s32 OSResumeThread(OSThread* thread); +s32 OSSuspendThread(OSThread* thread); +void OSSleepThread(OSThreadQueue* queue); +void OSWakeupThread(OSThreadQueue* queue); +s32 OSSetThreadPriority(OSThread* thread, s32 priority); +s32 OSGetThreadPriority(OSThread* thread); +static s32 CheckThreadQueue(OSThread* thread); +s32 OSCheckActiveThreads(void); +static void OSClearStack(u32 value); +extern u8 data_804516D0[8]; + +#ifdef __cplusplus +}; +#endif #endif /* OSTHREAD_H */ diff --git a/include/dolphin/os/OSTime.h b/include/dolphin/os/OSTime.h index 70f86d2473e..ea432f587f8 100644 --- a/include/dolphin/os/OSTime.h +++ b/include/dolphin/os/OSTime.h @@ -3,4 +3,35 @@ #include "dolphin/types.h" +#ifdef __cplusplus +extern "C" { +#endif + +typedef s64 OSTime; +typedef u32 OSTick; + +typedef struct OSCalendarTime { + /* 0x00 */ s32 seconds; + /* 0x04 */ s32 minutes; + /* 0x08 */ s32 hours; + /* 0x0C */ s32 day_of_month; + /* 0x10 */ s32 month; + /* 0x14 */ s32 year; + /* 0x18 */ s32 week_day; + /* 0x1C */ s32 year_day; + /* 0x20 */ s32 milliseconds; + /* 0x24 */ s32 microseconds; +} OSCalendarTime; + +OSTime OSGetTime(void); +OSTick OSGetTick(void); +OSTime __OSGetSystemTime(void); +OSTime __OSTimeToSystemTime(OSTime time); +void GetDates(OSTime ticks, OSCalendarTime* ct); +void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* ct); + +#ifdef __cplusplus +}; +#endif + #endif /* OSTIME_H */ diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 44d06dd0968..d0c679161c4 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -112,15 +112,15 @@ public: /* 0x514 */ f32 mRadius; } mSphere; } mCull; - /* 0x520 */ float mCullSizeFar; - /* 0x524 */ void* field_0x524; // possibly J3DModel* + /* 0x520 */ f32 mCullSizeFar; + /* 0x524 */ J3DModel* field_0x524; /* 0x528 */ dJntCol_c* mJntCol; /* 0x52C */ f32 mSpeedF; /* 0x530 */ f32 mGravity; /* 0x534 */ f32 mMaxFallSpeed; /* 0x538 */ cXyz mEyePos; /* 0x544 */ actor_attention_types mAttentionInfo; - /* 0x560 */ u8 field_0x560[0x2]; + /* 0x560 */ s16 field_0x560; /* 0x562 */ s16 field_0x562; /* 0x564 */ u8 field_0x564[0x4]; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index e928cad6472..26b5f79c271 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -285,7 +285,6 @@ inline void fopAcM_onItem(const fopAc_ac_c* item, int bitNo) { dComIfGs_onItem(bitNo, fopAcM_GetHomeRoomNo(item)); } - inline bool dComIfGs_isItem(int bitNo, int roomNo); inline bool fopAcM_isItem(const fopAc_ac_c* item, int bitNo) { return dComIfGs_isItem(bitNo, fopAcM_GetHomeRoomNo(item)); @@ -335,8 +334,8 @@ s32 fopAcM_create(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo, co const cXyz* p_scale, s8 subType); void* fopAcM_fastCreate(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo, - const csXyz* p_angle, const cXyz* p_scale, s8 subType, createFunc p_createFunc, - void* p_createFuncData); + const csXyz* p_angle, const cXyz* p_scale, s8 subType, + createFunc p_createFunc, void* p_createFuncData); void* fopAcM_fastCreate(const char* p_actorName, u32 parameter, const cXyz* pActorPos, int roomNo, const csXyz* p_angle, const cXyz* p_scale, createFunc p_createFunc, @@ -403,7 +402,8 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16); s32 fopAcM_orderOtherEvent(fopAc_ac_c*, const char*, u16, u16, u16); s32 fopAcM_orderOtherEvent(fopAc_ac_c*, fopAc_ac_c*, const char*, u16, u16, u16); s32 fopAcM_orderChangeEventId(fopAc_ac_c*, s16, u16, u16); -s32 fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); +s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, + u16 priority, u16 flag); s32 fopAcM_orderMapToolEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16); @@ -414,20 +414,20 @@ void* fopAcM_getItemEventPartner(const fopAc_ac_c*); void* fopAcM_getEventPartner(const fopAc_ac_c*); s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo, - int i_roomNo, csXyz const* p_angle, cXyz const* p_scale); + int i_roomNo, csXyz const* p_angle, cXyz const* p_scale); s32 fopAcM_createItemForTrBoxDemo(cXyz const* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, cXyz const* p_scale); + csXyz const* p_angle, cXyz const* p_scale); u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo); s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* p_pos, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, cXyz const* p_scale, f32* speedF, - f32* speedY); + csXyz const* p_angle, cXyz const* p_scale, f32* speedF, + f32* speedY); s32 fopAcM_createItemFromTable(cXyz const* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo, - csXyz const* p_angle, int param_5, cXyz const* p_scale, - f32* speedF, f32* speedY, bool createDirect); + csXyz const* p_angle, int param_5, cXyz const* p_scale, f32* speedF, + f32* speedY, bool createDirect); s32 fopAcM_createDemoItem(const cXyz* p_pos, int itemNo, int itemBitNo, const csXyz* p_angle, int roomNo, const cXyz* scale, u8 param_7); @@ -438,18 +438,20 @@ s32 fopAcM_createItemForBoss(const cXyz* p_pos, int param_2, int roomNo, const c s32 fopAcM_createItemForMidBoss(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, const cXyz* p_scale, int param_6, int param_7); -void* fopAcM_createItemForDirectGet(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, - const cXyz* p_scale, f32 speedF, f32 speedY); +void* fopAcM_createItemForDirectGet(const cXyz* p_pos, int i_itemNo, int i_roomNo, + const csXyz* p_angle, const cXyz* p_scale, f32 speedF, + f32 speedY); -void* fopAcM_createItemForSimpleDemo(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, - const cXyz* p_scale, f32 speedF, f32 speedY); +void* fopAcM_createItemForSimpleDemo(const cXyz* p_pos, int i_itemNo, int i_roomNo, + const csXyz* p_angle, const cXyz* p_scale, f32 speedF, + f32 speedY); s32 fopAcM_createItem(const cXyz* p_pos, int itemNo, int param_3, int roomNo, const csXyz* p_angle, const cXyz* p_scale, int param_7); void* fopAcM_fastCreateItem2(const cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5, const csXyz* p_angle, const cXyz* p_scale); - + void* fopAcM_fastCreateItem(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle, const cXyz* p_scale, f32* p_speedF, f32* p_speedY, int param_8, int param_9, createFunc p_createFunc); @@ -490,7 +492,6 @@ s32 fopAcM_getWaterStream(const cXyz*, const cBgS_PolyInfo&, cXyz*, int*, int); s16 fopAcM_getPolygonAngle(const cBgS_PolyInfo&, s16); s16 fopAcM_getPolygonAngle(cM3dGPla const* param_0, s16 param_1); - inline void make_prm_warp_hole(u32* actorParams, u8 p1, u8 p2, u8 p3) { u32 pp1 = (p3 << 0x8); u32 pp2 = (p2 << 0x10); @@ -504,7 +505,6 @@ inline void make_prm_bokkuri(u32* pActorParams, csXyz* p_angle, u8 param_2, u8 p p_angle->z = (param_6 << 0xD) | (param_2 << 0x1) | param_5; } - inline void* dComIfGp_getPlayer(int); inline s16 fopAcM_searchPlayerAngleY(const fopAc_ac_c* actor) { @@ -523,6 +523,13 @@ inline f32 fopAcM_searchPlayerDistance(const fopAc_ac_c* actor) { return fopAcM_searchActorDistance(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0)); } +s8 dComIfGp_getReverb(int roomNo); + +inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + mDoAud_seStart(sfxID, &actor->mCurrent.mPosition, param_2, dComIfGp_getReverb(roomNo)); +} + extern "C" { void fopAcM_initManager__Fv(void); void fopAcM_CreateAppend__Fv(void); diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 5d01d10a2f1..c8ff7d7f81e 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -316,6 +316,8 @@ public: /* 8000F848 */ void initOldFrameMorf(f32, u16, u16); /* 8000F8CC */ void decOldFrameMorfCounter(); + f32 getOldFrameRate() { return mOldFrameRate; } + private: /* 0x00 */ bool mOldFrameFlg; /* 0x04 */ f32 mOldFrameMorfCounter; diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h index 41d18161bee..4fc35f86c70 100644 --- a/include/m_Do/m_Do_lib.h +++ b/include/m_Do/m_Do_lib.h @@ -3,6 +3,7 @@ #include "JSystem/J3DU/J3DUClipper.h" #include "dolphin/types.h" +#include "JSystem/JUtility/JUTTexture.h" struct mDoLib_clipper { /* 8001528C */ void setup(f32, f32, f32, f32); @@ -13,5 +14,7 @@ struct mDoLib_clipper { }; void mDoLib_project(Vec* param_0, Vec* param_1); +bool mDoLib_setResTimgObj(ResTIMG const* res, GXTexObj* o_texObj, u32 param_2, + GXTlutObj* o_tlutObj); #endif /* M_DO_M_DO_LIB_H */ diff --git a/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h b/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h index c7d129efb27..c270f6bf033 100644 --- a/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h +++ b/include/rel/d/a/b/d_a_b_zant/d_a_b_zant.h @@ -1,6 +1,190 @@ #ifndef D_A_B_ZANT_H #define D_A_B_ZANT_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +class daB_ZANT_c : public fopAc_ac_c { +public: + /* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*); + /* 8063E264 */ void JointCallBack(J3DJoint*, int); + /* 8063E2B0 */ void draw(); + /* 8063E5C4 */ void setBck(int, u8, f32, f32); + /* 8063E668 */ void checkBck(int); + /* 8063E6C4 */ void setActionMode(int, int); + /* 8063E6F8 */ void checkBigDamage(); + /* 8063E79C */ void checkDamageType(); + /* 8063E810 */ void setDamageSe(dCcD_Sph*, int); + /* 8063E938 */ void damage_check(); + /* 8063F524 */ void ice_damage_check(); + /* 8063F84C */ void setNextDamageMode(int); + /* 8063FAB4 */ void checkAvoidWeapon(int); + /* 8063FF6C */ void setTgHitBit(int); + /* 8063FFAC */ void setCoHitBit(int); + /* 8063FFEC */ void setTgShield(int); + /* 806400BC */ void setTgType(u32); + /* 806400C8 */ void setZantMessage(int); + /* 80640104 */ void doZantMessage(); + /* 80640180 */ void setIceLandingEffect(int); + /* 80640310 */ void setWaterBubble(); + /* 806403D4 */ void setMonkeyFallEffect(); + /* 80640478 */ void setLastRollEffect(); + /* 80640654 */ void getMagicSpeed(); + /* 80640664 */ void getMagicWaterSpeed(); + /* 80640674 */ void executeSmallAttack(); + /* 80640C20 */ void calcScale(int); + /* 80640D14 */ void executeWarp(); + /* 806412A8 */ void executeDamage(); + /* 806414E4 */ void executeConfuse(); + /* 80641640 */ void executeOpening(); + /* 806427EC */ void executeFly(); + /* 80642EC8 */ void executeFlyGround(); + /* 806430E0 */ void checkSwimLinkNearMouth(); + /* 806432F8 */ void checkSwimLinkNear(); + /* 8064350C */ void executeHook(); + /* 80643690 */ void executeWater(); + /* 80644074 */ void executeSwim(); + /* 80644A3C */ void executeSimaJump(); + /* 80645014 */ void executeIceDemo(); + /* 8064524C */ void executeIceJump(); + /* 80645DA4 */ void executeIceStep(); + /* 8064687C */ void executeIceDamage(); + /* 806471CC */ void setFarPillarPos(); + /* 806473E4 */ void setNearPillarPos(); + /* 80647468 */ void setNextPillarInfo(int); + /* 806474F4 */ void setNextPillarPos(); + /* 80647A34 */ void checkPillarSwing(); + /* 80647AC8 */ void executeMonkey(); + /* 806481F4 */ void executeMonkeyFall(); + /* 80648544 */ void executeMonkeyDamage(); + /* 80648778 */ void setLastWarp(int, int); + /* 80648F64 */ void executeLastStartDemo(); + /* 806494A8 */ void executeLastAttack(); + /* 8064A58C */ void executeLastTired(); + /* 8064A688 */ void executeLastDamage(); + /* 8064AC8C */ void executeLastEndDemo(); + /* 8064B270 */ void calcMahojinAnime(); + /* 8064B49C */ void calcRoomChangeCamera(int); + /* 8064B69C */ void initNextRoom(); + /* 8064B868 */ void executeRoomChange(); + /* 8064C1C0 */ void setBaseActionMode(int); + /* 8064C5A8 */ void action(); + /* 8064CB1C */ void mtx_set(); + /* 8064CD0C */ void cc_set(); + /* 8064CFA8 */ void cc_ice_set(); + /* 8064DA48 */ void execute(); + /* 8064DB70 */ void _delete(); + /* 8064DC04 */ void CreateHeap(); + /* 8064E190 */ void create(); + +private: + /* 0x0568 */ u8 field_0x568[0x58e - 0x568]; + /* 0x058E */ u16 field_0x58e; + /* 0x0590 */ u8 field_0x590[0x5ac - 0x590]; + /* 0x05AC */ request_of_phase_process_class mPhase; + /* 0x05B4 */ mDoExt_McaMorfSO* mpMorfSO; + /* 0x05B8 */ J3DModel* field_0x5b8; + /* 0x05BC */ J3DModel* field_0x5bc; + /* 0x05C0 */ J3DModel* field_0x5c0; + /* 0x05C4 */ J3DModel* field_0x5c4; + /* 0x05C8 */ mDoExt_brkAnm* field_0x5c8; + /* 0x05CC */ mDoExt_btkAnm* field_0x5cc; + /* 0x05D0 */ mDoExt_btkAnm* field_0x5d0; + /* 0x05D4 */ mDoExt_brkAnm* field_0x5d4; + /* 0x05D8 */ mDoExt_btkAnm* field_0x5d8; + /* 0x05DC */ u8 field_0x5dc[0x5e8 - 0x5dc]; + /* 0x05E8 */ u8 field_0x5e8; + /* 0x05E9 */ u8 field_0x5e9; + /* 0x05EC */ f32 field_0x5ec; + /* 0x05F0 */ Z2CreatureEnemy mZ2Enemy; + /* 0x0680 */ u8 field_0x680[0x6a0 - 0x680]; + /* 0x06A0 */ cXyz mFlyWarpPos; + /* 0x06AC */ cXyz field_0x6ac; + /* 0x06B8 */ s16 field_0x6b8; + /* 0x06BA */ s16 field_0x6ba; + /* 0x06BC */ f32 field_0x6bc; + /* 0x06C0 */ f32 field_0x6c0; + /* 0x06C4 */ f32 field_0x6c4; + /* 0x06C8 */ f32 field_0x6c8; + /* 0x06CC */ f32 field_0x6cc; + /* 0x06D0 */ f32 field_0x6d0; + /* 0x06D4 */ int mActionID; + /* 0x06D8 */ int mLastActionID; + /* 0x06DC */ int mActionMode; + /* 0x06E0 */ u32 field_0x6e0; + /* 0x06E4 */ u16 field_0x6e4; + /* 0x06E8 */ int field_0x6e8; + /* 0x06EC */ int field_0x6ec; + /* 0x06F0 */ int field_0x6f0; + /* 0x06F4 */ int field_0x6f4; + /* 0x06F8 */ s16 field_0x6f8; + /* 0x06FA */ u8 field_0x6fa; + /* 0x06FB */ u8 mFightPhase; + /* 0x06FC */ u8 field_0x6fc; + /* 0x06FD */ u8 field_0x6fd; + /* 0x06FE */ u8 mFlyWarpPosID; + /* 0x06FF */ u8 field_0x6ff; + /* 0x0700 */ u8 field_0x700; + /* 0x0701 */ u8 field_0x701; + /* 0x0702 */ u8 field_0x702; + /* 0x0703 */ u8 field_0x703; + /* 0x0704 */ u8 field_0x704; + /* 0x0705 */ u8 field_0x705; + /* 0x0706 */ u8 field_0x706; + /* 0x0707 */ u8 field_0x707; + /* 0x0708 */ u8 field_0x708; + /* 0x0709 */ u8 field_0x709; + /* 0x070A */ u8 field_0x70a; + /* 0x070B */ u8 field_0x70b; + /* 0x070C */ u8 field_0x70c; + /* 0x070D */ u8 field_0x70d; + /* 0x070E */ u8 field_0x70e; + /* 0x070F */ u8 field_0x70f; + /* 0x0710 */ u8 field_0x710; + /* 0x0711 */ u8 field_0x711; + /* 0x0712 */ u8 field_0x712; + /* 0x0713 */ u8 field_0x713; + /* 0x0714 */ u8 field_0x714; + /* 0x0715 */ u8 field_0x715; + /* 0x0716 */ u8 field_0x716; + /* 0x0717 */ u8 field_0x717; + /* 0x0718 */ u8 field_0x718; + /* 0x0719 */ bool mTakenBigDmg; + /* 0x071A */ u8 mFightCycle; + /* 0x071B */ u8 field_0x71b; + /* 0x071C */ u8 field_0x71c; + /* 0x071D */ u8 field_0x71d; + /* 0x071E */ s16 field_0x71e; + /* 0x0720 */ s16 field_0x720; + /* 0x0722 */ s16 field_0x722; + /* 0x0724 */ u32 field_0x724; + /* 0x0728 */ u8 field_0x728; + /* 0x072C */ u32 field_0x72c[4]; + /* 0x073C */ u32 field_0x73c[9]; + /* 0x0760 */ cXyz field_0x760; + /* 0x076C */ cXyz field_0x76c; + /* 0x0778 */ f32 field_0x778; + /* 0x077C */ f32 field_0x77c; + /* 0x0780 */ int mMsgNo; + /* 0x0784 */ int mMsgID; + /* 0x0788 */ msg_class* mpMsg; + /* 0x078C */ dBgS_AcchCir mAcchCir; + /* 0x07CC */ dBgS_Acch mAcch; + /* 0x09A4 */ dCcD_Stts mStts; + /* 0x09E0 */ dCcD_Sph field_0x9e0[2]; + /* 0x0C50 */ dCcU_AtInfo mAtInfo; + /* 0x0C74 */ dCcD_Stts field_0xc74; + /* 0x0CB0 */ dCcD_Sph field_0xcb0[11]; + /* 0x1A18 */ dCcD_Sph field_0x1a18[11]; + /* 0x2780 */ dCcD_Sph field_0x2780[11]; + /* 0x34E8 */ dCcD_Cyl field_0x34e8; + /* 0x3624 */ dCcD_Sph field_0x3624[2]; + /* 0x3894 */ u32 field_0x3894; + /* 0x3898 */ u32 field_0x3898; + /* 0x389C */ u32 field_0x389c; + /* 0x38A0 */ u8 field_0x38a0[0x38ac - 0x38a0]; + /* 0x38AC */ u32 field_0x38ac[2]; + /* 0x38B4 */ u32 field_0x38b4; + /* 0x38B8 */ u8 field_0x38b8; +}; #endif /* D_A_B_ZANT_H */ diff --git a/include/rel/d/a/d_a_movie_player/d_a_movie_player.h b/include/rel/d/a/d_a_movie_player/d_a_movie_player.h index e5143062150..848f6787a1a 100644 --- a/include/rel/d/a/d_a_movie_player/d_a_movie_player.h +++ b/include/rel/d/a/d_a_movie_player/d_a_movie_player.h @@ -2,5 +2,37 @@ #define D_A_MOVIE_PLAYER_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" + +typedef void (*daMP_Func)(); + +class daMP_c : public fopAc_ac_c { +public: + /* 80031AD0 */ static void daMP_c_THPPlayerPlay(); + /* 80031B24 */ void daMP_c_THPPlayerPause(); + /* 80031A78 */ void daMP_c_Get_MovieRestFrame(); + /* 80031AA4 */ void daMP_c_Set_PercentMovieVolume(f32); + /* 80878BB8 */ void daMP_c_Get_arg_demoNo(); + /* 80878C04 */ void daMP_c_Get_arg_movieNo(); + /* 80878C28 */ void daMP_c_Init(); + /* 80878D64 */ void daMP_c_Finish(); + /* 80878D94 */ void daMP_c_Main(); + /* 80878DD8 */ void daMP_c_Draw(); + /* 80878E60 */ void daMP_c_Callback_Init(fopAc_ac_c*); + /* 80878ED4 */ daMP_c(); + /* 80878F18 */ void daMP_c_Callback_Finish(daMP_c*); + /* 80878F38 */ void daMP_c_Callback_Main(daMP_c*); + /* 80878F70 */ void daMP_c_Callback_Draw(daMP_c*); + + static u8 m_myObj[4]; + +private: + /* 0x568 */ daMP_Func mpGetMovieRestFrame; + /* 0x56C */ daMP_Func mpSetPercentMovieVol; + /* 0x570 */ daMP_Func mpTHPGetTotalFrame; + /* 0x574 */ daMP_Func mpTHPPlay; + /* 0x578 */ daMP_Func mpTHPStop; + /* 0x57C */ daMP_Func mpTHPPause; +}; // Size: 0x580 #endif /* D_A_MOVIE_PLAYER_H */ diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h index 3b43d124c20..3d70f93a1b2 100644 --- a/include/rel/d/a/d_a_spinner/d_a_spinner.h +++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h @@ -1,6 +1,102 @@ #ifndef D_A_SPINNER_H #define D_A_SPINNER_H +#include "d/com/d_com_inf_game.h" #include "dolphin/types.h" +class daSpinner_c : public fopAc_ac_c { +public: + /* 804D198C */ void createHeap(); + /* 804D1A70 */ void create(); + /* 804D1FD0 */ ~daSpinner_c(); + /* 804D21E0 */ void setRoomInfo(); + /* 804D2278 */ void setMatrix(); + /* 804D2320 */ void setEffect(); + /* 804D25F4 */ void posMove(); + /* 804D3090 */ void setReflectAngle(); + /* 804D3174 */ void setWallHit(s16, u32); + /* 804D34B0 */ void setAnm(); + /* 804D3618 */ void setNextPathNum(); + /* 804D3694 */ void getPathNextPos(); + /* 804D36F4 */ void checkLineWallHit(cXyz*, cXyz*); + /* 804D3774 */ void checkPathMove(); + /* 804D3D60 */ void setSpreadEffect(); + /* 804D3F14 */ void clearSpreadEffect(); + /* 804D3F8C */ void execute(); + /* 804D4BB4 */ void draw(); + + void onPathForceRemove() { mPathForceRemove = true; } + + void* checkPathMoveNow() { return mpPathMove; } + + static u32 getWaitArg() { return 0; } + + int getDeleteFlg() const { return mDeleteFlg; } + + bool checkSpinnerTagEnd() const { return mSpinnerTag == 5; } + bool checkSpinnerTagIntoIncRot() const { return mSpinnerTag == 4; } + bool checkSpinnerTagInto() const { return mSpinnerTag == 3; } + + u8 getButtonJump() const { return mButtonJump; } + u8 getJumpFlg() const { return mJumpFlg; } + + void setMove(f32 speedF, s16 param_1) { + fopAcM_SetParam(this, 1); + mSpeedF = speedF; + field_0xa7a = param_1; + mCyl.OnAtSetBit(); + } + + bool reflectAccept() { + bool accept = false; + if (!mBck.isStop() && mSpinnerTag == 0) { + accept = true; + } + + return accept; + } + + MtxP getModelMtx() { return mpModel->getBaseTRMtx(); } + +private: + /* 0x568 */ J3DModel* mpModel; + /* 0x56C */ mDoExt_bckAnm mBck; + /* 0x588 */ J3DAnmTransform* field_0x588; + /* 0x58C */ dBgS_AcchCir mAcchCir[3]; + /* 0x64C */ dBgS_Acch mAcch; + /* 0x824 */ dBgS_LinkLinChk mLinChk; + /* 0x894 */ dPaPo_c field_0x894; + /* 0x8CC */ Z2SoundObjSimple field_0x8cc; + /* 0x8EC */ dCcD_Stts mStts; + /* 0x928 */ dCcD_Cyl mCyl; + /* 0xA64 */ void* mpPathMove; + /* 0xA68 */ void* field_0xa68; + /* 0xA6C */ u8 field_0xa6c; + /* 0xA6D */ u8 mJumpFlg; + /* 0xA6E */ u8 field_0xa6e; + /* 0xA6F */ u8 mSpinnerTag; + /* 0xA70 */ u8 mButtonJump; + /* 0xA71 */ u8 mDeleteFlg; + /* 0xA72 */ u8 field_0xa72; + /* 0xA73 */ u8 field_0xa73; + /* 0xA74 */ u8 field_0xa74; + /* 0xA75 */ u8 field_0xa75; + /* 0xA76 */ u8 field_0xa76; + /* 0xA77 */ u8 mPathForceRemove; + /* 0xA78 */ u8 field_0xa78; + /* 0xA79 */ u8 field_0xa79; + /* 0xA7A */ s16 field_0xa7a; + /* 0xA7C */ s16 field_0xa7c; + /* 0xA7E */ s16 field_0xa7e; + /* 0xA80 */ s16 field_0xa80; + /* 0xA82 */ s16 field_0xa82; + /* 0xA84 */ f32 field_0xa84; + /* 0xA88 */ f32 field_0xa88; + /* 0xA8C */ u32 field_0xa8c[2]; + /* 0xA94 */ u32 field_0xa94; + /* 0xA98 */ cXyz field_0xa98; + /* 0xAA4 */ cXyz field_0xaa4; + /* 0xAB0 */ cXyz field_0xab0; +}; + #endif /* D_A_SPINNER_H */ diff --git a/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h b/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h index 6c29b4e0bc4..8c1a845b5e2 100644 --- a/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h +++ b/include/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h @@ -2,16 +2,38 @@ #define D_A_TAG_MHINT_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "d/msg/d_msg_flow.h" -struct daTagMhint_c { +class daTagMhint_c : public fopAc_ac_c { +public: /* 805A56B8 */ void create(); /* 805A58E8 */ ~daTagMhint_c(); /* 805A5974 */ void eventOrder(); /* 805A5AE4 */ void execute(); - bool checkNoAttention() const { return _0x56d == 0xFF; } + bool checkNoAttention() const { return field_0x56d == 0xFF; } - u8 _0[0x56d]; - u8 _0x56d; +private: + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 mSwitch; + /* 0x56A */ u8 field_0x56a; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ u8 mToolEventID; + /* 0x56D */ u8 field_0x56d; + /* 0x56E */ u8 field_0x56e; + /* 0x56F */ u8 field_0x56f; + /* 0x570 */ u8 field_0x570; + /* 0x571 */ u8 field_0x571; + /* 0x572 */ u8 field_0x572; + /* 0x574 */ u16 field_0x574; + /* 0x576 */ s16 mEventID; + /* 0x578 */ u16 field_0x578; + /* 0x57A */ u16 field_0x57a; + /* 0x57C */ u16 field_0x57c; + /* 0x57E */ u16 field_0x57e; + /* 0x580 */ dMsgFlow_c mMsgFlow; + /* 0x5CC */ f32 field_0x5cc; + /* 0x5D0 */ f32 field_0x5d0; }; #endif /* D_A_TAG_MHINT_H */ diff --git a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h index fec2a88d470..5438f673a52 100644 --- a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h +++ b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h @@ -2,16 +2,31 @@ #define D_A_TAG_MSTOP_H #include "dolphin/types.h" +#include "f_op/f_op_actor.h" +#include "d/msg/d_msg_flow.h" -struct daTagMstop_c { +class daTagMstop_c : public fopAc_ac_c { +public: /* 805A6138 */ void create(); /* 805A6338 */ ~daTagMstop_c(); /* 805A63C4 */ void eventOrder(); /* 805A63F8 */ void execute(); - bool checkNoAttention() const { return _0x56b == 0xFF; } + bool checkNoAttention() const { return field_0x56b == 0xFF; } - u8 _0[0x56b]; - u8 _0x56b; +private: + /* 0x568 */ u8 field_0x568; + /* 0x569 */ u8 mSwitch; + /* 0x56A */ u8 field_0x56a; + /* 0x56B */ u8 field_0x56b; + /* 0x56C */ u8 field_0x56c; + /* 0x56D */ u8 field_0x56d; + /* 0x56E */ u16 field_0x56e; + /* 0x570 */ u16 field_0x570; + /* 0x572 */ u16 field_0x572; + /* 0x574 */ dMsgFlow_c mMsgFlow; + /* 0x5C0 */ f32 field_0x5cc; + /* 0x5C4 */ f32 field_0x5d0; + /* 0x5C8 */ cXyz field_0x5c8; }; #endif /* D_A_TAG_MSTOP_H */ diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp index e79ac87c46f..700c149b613 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp @@ -18,73 +18,74 @@ /* 80308A6C-80309290 3033AC 0824+00 0/0 26/26 2/2 .text load__20J2DAnmLoaderDataBaseFPCv */ -void* J2DAnmLoaderDataBase::load(void const* param_0) { - const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)param_0; +void* J2DAnmLoaderDataBase::load(void const* p_data) { + const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data; + if (hdr == NULL) { return NULL; } else if (hdr->mMagic == 'J3D1') { switch (hdr->mType) { case 'bck1': { J2DAnmKeyLoader_v15 loader; - loader._4 = new J2DAnmTransformKey(); - return loader.load(param_0); + loader.mpResource = new J2DAnmTransformKey(); + return loader.load(p_data); break; } case 'bpk1': { J2DAnmKeyLoader_v15 loader; - loader._4 = new J2DAnmColorKey(); - return loader.load(param_0); + loader.mpResource = new J2DAnmColorKey(); + return loader.load(p_data); break; } case 'blk1': return NULL; case 'btk1': { J2DAnmKeyLoader_v15 loader; - loader._4 = new J2DAnmTextureSRTKey(); - return loader.load(param_0); + loader.mpResource = new J2DAnmTextureSRTKey(); + return loader.load(p_data); break; } case 'brk1': { J2DAnmKeyLoader_v15 loader; - loader._4 = new J2DAnmTevRegKey(); - return loader.load(param_0); + loader.mpResource = new J2DAnmTevRegKey(); + return loader.load(p_data); break; } case 'bxk1': { J2DAnmKeyLoader_v15 loader; - loader._4 = new J2DAnmVtxColorKey(); - return loader.load(param_0); + loader.mpResource = new J2DAnmVtxColorKey(); + return loader.load(p_data); break; } case 'bca1': { J2DAnmFullLoader_v15 loader; - loader._4 = new J2DAnmTransformFull(); - return loader.load(param_0); + loader.mpResource = new J2DAnmTransformFull(); + return loader.load(p_data); break; } case 'bpa1': { J2DAnmFullLoader_v15 loader; - loader._4 = new J2DAnmColorFull(); - return loader.load(param_0); + loader.mpResource = new J2DAnmColorFull(); + return loader.load(p_data); break; } case 'btp1': { J2DAnmFullLoader_v15 loader; - loader._4 = new J2DAnmTexPattern(); - return loader.load(param_0); + loader.mpResource = new J2DAnmTexPattern(); + return loader.load(p_data); } case 'bva1': { J2DAnmFullLoader_v15 loader; - loader._4 = new J2DAnmVisibilityFull(); - return loader.load(param_0); + loader.mpResource = new J2DAnmVisibilityFull(); + return loader.load(p_data); break; } case 'bla1': return NULL; case 'bxa1': { J2DAnmFullLoader_v15 loader; - loader._4 = new J2DAnmVtxColorFull(); - return loader.load(param_0); + loader.mpResource = new J2DAnmVtxColorFull(); + return loader.load(p_data); } } return NULL; @@ -100,63 +101,66 @@ J2DAnmKeyLoader_v15::J2DAnmKeyLoader_v15() {} J2DAnmKeyLoader_v15::~J2DAnmKeyLoader_v15() {} /* 80309308-80309414 303C48 010C+00 2/1 0/0 0/0 .text load__19J2DAnmKeyLoader_v15FPCv */ -void* J2DAnmKeyLoader_v15::load(void const* param_0) { - const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)param_0; +void* J2DAnmKeyLoader_v15::load(void const* p_data) { + const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data; const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst; + for (s32 i = 0; i < hdr->mCount; i++) { switch (dataPtr->mType) { case 'ANK1': - this->readAnmTransform((J3DAnmTransformKeyData*)dataPtr); + readAnmTransform((J3DAnmTransformKeyData*)dataPtr); break; case 'PAK1': - this->readAnmColor((J3DAnmColorKeyData*)dataPtr); + readAnmColor((J3DAnmColorKeyData*)dataPtr); break; case 'TTK1': - this->readAnmTextureSRT((J3DAnmTextureSRTKeyData*)dataPtr); + readAnmTextureSRT((J3DAnmTextureSRTKeyData*)dataPtr); break; case 'VCK1': - this->readAnmVtxColor((J3DAnmVtxColorKeyData*)dataPtr); + readAnmVtxColor((J3DAnmVtxColorKeyData*)dataPtr); break; case 'TRK1': - this->readAnmTevReg((J3DAnmTevRegKeyData*)dataPtr); + readAnmTevReg((J3DAnmTevRegKeyData*)dataPtr); break; } dataPtr = (J3DAnmDataBlockHeader*)((s32)dataPtr + dataPtr->mNextOffset); } - return _4; + + return mpResource; } /* 80309414-80309570 303D54 015C+00 1/0 0/0 0/0 .text * setResource__19J2DAnmKeyLoader_v15FP10J2DAnmBasePCv */ -void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* pAnm, void const* param_1) { - const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)param_1; +void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) { + const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data; const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst; + for (s32 i = 0; i < hdr->mCount; i++) { switch (dataPtr->mType) { case 'ANK1': - if (pAnm->getKind() == KIND_TRANSFORM) { - this->setAnmTransform((J2DAnmTransformKey*)pAnm, (J3DAnmTransformKeyData*)dataPtr); + if (p_anm->getKind() == KIND_TRANSFORM) { + setAnmTransform((J2DAnmTransformKey*)p_anm, (J3DAnmTransformKeyData*)dataPtr); } break; case 'PAK1': - if (pAnm->getKind() == KIND_COLOR) { - this->setAnmColor((J2DAnmColorKey*)pAnm, (J3DAnmColorKeyData*)dataPtr); + if (p_anm->getKind() == KIND_COLOR) { + setAnmColor((J2DAnmColorKey*)p_anm, (J3DAnmColorKeyData*)dataPtr); } break; case 'TTK1': - if (pAnm->getKind() == KIND_TEXTURE_SRT) { - this->setAnmTextureSRT((J2DAnmTextureSRTKey*)pAnm, + if (p_anm->getKind() == KIND_TEXTURE_SRT) { + setAnmTextureSRT((J2DAnmTextureSRTKey*)p_anm, (J3DAnmTextureSRTKeyData*)dataPtr); } break; case 'TRK1': - if (pAnm->getKind() == KIND_TEV_REG) { - this->setAnmTevReg((J2DAnmTevRegKey*)pAnm, (J3DAnmTevRegKeyData*)dataPtr); + if (p_anm->getKind() == KIND_TEV_REG) { + setAnmTevReg((J2DAnmTevRegKey*)p_anm, (J3DAnmTevRegKeyData*)dataPtr); } break; case 'VCK1': - if (pAnm->getKind() == KIND_VTX_COLOR) { - this->setAnmVtxColor((J2DAnmVtxColorKey*)pAnm, (J3DAnmVtxColorKeyData*)dataPtr); + if (p_anm->getKind() == KIND_VTX_COLOR) { + setAnmVtxColor((J2DAnmVtxColorKey*)p_anm, (J3DAnmVtxColorKeyData*)dataPtr); } break; } @@ -166,202 +170,204 @@ void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* pAnm, void const* param_1) { /* 80309570-80309598 303EB0 0028+00 1/1 0/0 0/0 .text * readAnmTransform__19J2DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData */ -void J2DAnmKeyLoader_v15::readAnmTransform(J3DAnmTransformKeyData const* pData) { - this->setAnmTransform((J2DAnmTransformKey*)_4, pData); +void J2DAnmKeyLoader_v15::readAnmTransform(J3DAnmTransformKeyData const* p_data) { + setAnmTransform((J2DAnmTransformKey*)mpResource, p_data); } /* 80309598-80309634 303ED8 009C+00 2/2 0/0 0/0 .text * setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData */ -void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* param_0, - J3DAnmTransformKeyData const* param_1) { - param_0->field_0x22 = param_1->_C; - param_0->mFrameMax = param_1->mFrameMax; - param_0->field_0x4 = param_1->_8; - param_0->field_0x24 = param_1->_9; - param_0->mFrame = 0; - param_0->mInfoTable = - JSUConvertOffsetToPtr(param_1, (void*)param_1->mTableOffset); - param_0->mScaleValues = JSUConvertOffsetToPtr(param_1, (void*)param_1->mScaleOffset); - param_0->mRotationValues = JSUConvertOffsetToPtr(param_1, (void*)param_1->mRotationOffset); - param_0->mTranslateValues = - JSUConvertOffsetToPtr(param_1, (void*)param_1->mTranslateOffset); +void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* p_anm, + J3DAnmTransformKeyData const* p_data) { + p_anm->field_0x22 = p_data->_C; + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->_8; + p_anm->field_0x24 = p_data->_9; + p_anm->mFrame = 0; + p_anm->mInfoTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mScaleValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mScaleOffset); + p_anm->mRotationValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRotationOffset); + p_anm->mTranslateValues = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTranslateOffset); } /* 80309634-8030965C 303F74 0028+00 1/1 0/0 0/0 .text * readAnmTextureSRT__19J2DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData */ -void J2DAnmKeyLoader_v15::readAnmTextureSRT(J3DAnmTextureSRTKeyData const* param_0) { - this->setAnmTextureSRT((J2DAnmTextureSRTKey*)_4, param_0); +void J2DAnmKeyLoader_v15::readAnmTextureSRT(J3DAnmTextureSRTKeyData const* p_data) { + setAnmTextureSRT((J2DAnmTextureSRTKey*)mpResource, p_data); } /* 8030965C-80309848 303F9C 01EC+00 2/2 0/0 0/0 .text * setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData */ -void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* pAnm, - J3DAnmTextureSRTKeyData const* pData) { - pAnm->mUpdateMaterialNum = pData->field_0xc; - pAnm->mFrameMax = pData->field_0xa; - pAnm->field_0x4 = pData->field_0x8; - pAnm->field_0x10 = pData->field_0x9; - pAnm->mFrame = 0; - pAnm->mUpdateMaterialNum = pData->field_0xc; - pAnm->field_0x1a = pData->field_0xe; - pAnm->field_0x1c = pData->field_0x10; - pAnm->field_0x1e = pData->field_0x12; - pAnm->mInfoTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mUpdateMaterialID = JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateMatIDOffset); - pAnm->field_0x34.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mNameTab1Offset)); - pAnm->mUpdateTexMtxID = JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateTexMtxIDOffset); - pAnm->field_0x44 = JSUConvertOffsetToPtr(pData, (void*)pData->unkOffset); - pAnm->mScaleValues = JSUConvertOffsetToPtr(pData, (void*)pData->mScaleValOffset); - pAnm->mRotationValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRotValOffset); - pAnm->mTranslationValues = JSUConvertOffsetToPtr(pData, (void*)pData->mTransValOffset); - if (pData->mNameTab2Offset != 0) { - pAnm->field_0x68.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mNameTab2Offset)); +void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* p_anm, + J3DAnmTextureSRTKeyData const* p_data) { + p_anm->mUpdateMaterialNum = p_data->field_0xc; + p_anm->mFrameMax = p_data->field_0xa; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->field_0x10 = p_data->field_0x9; + p_anm->mFrame = 0; + p_anm->mUpdateMaterialNum = p_data->field_0xc; + p_anm->field_0x1a = p_data->field_0xe; + p_anm->field_0x1c = p_data->field_0x10; + p_anm->field_0x1e = p_data->field_0x12; + p_anm->mInfoTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mUpdateMaterialID = JSUConvertOffsetToPtr(p_data, (void*)p_data->mUpdateMatIDOffset); + p_anm->field_0x34.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mNameTab1Offset)); + p_anm->mUpdateTexMtxID = JSUConvertOffsetToPtr(p_data, (void*)p_data->mUpdateTexMtxIDOffset); + p_anm->field_0x44 = JSUConvertOffsetToPtr(p_data, (void*)p_data->unkOffset); + p_anm->mScaleValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mScaleValOffset); + p_anm->mRotationValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRotValOffset); + p_anm->mTranslationValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mTransValOffset); + if (p_data->mNameTab2Offset != 0) { + p_anm->field_0x68.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mNameTab2Offset)); } - pAnm->field_0x4e = pData->field_0x34; - pAnm->field_0x48 = pData->field_0x36; - pAnm->field_0x4a = pData->field_0x38; - pAnm->field_0x4c = pData->field_0x3a; - pAnm->field_0x5c = - JSUConvertOffsetToPtr(pData, (void*)pData->mInfoTable2Offset); - pAnm->field_0x64 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x40); - pAnm->field_0x60 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x48); - pAnm->field_0x78 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x48); - pAnm->field_0x50 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x50); - pAnm->field_0x54 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x54); - pAnm->field_0x58 = JSUConvertOffsetToPtr(pData, (void*)pData->field_0x58); - switch (pData->field_0x5c) { + p_anm->field_0x4e = p_data->field_0x34; + p_anm->field_0x48 = p_data->field_0x36; + p_anm->field_0x4a = p_data->field_0x38; + p_anm->field_0x4c = p_data->field_0x3a; + p_anm->field_0x5c = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mInfoTable2Offset); + p_anm->field_0x64 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x40); + p_anm->field_0x60 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x48); + p_anm->field_0x78 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x48); + p_anm->field_0x50 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x50); + p_anm->field_0x54 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x54); + p_anm->field_0x58 = JSUConvertOffsetToPtr(p_data, (void*)p_data->field_0x58); + switch (p_data->field_0x5c) { case 0: - pAnm->field_0x7c = 0; + p_anm->field_0x7c = 0; break; case 1: - pAnm->field_0x7c = 1; + p_anm->field_0x7c = 1; break; default: - pAnm->field_0x7c = 0; + p_anm->field_0x7c = 0; break; } } /* 80309848-80309870 304188 0028+00 1/1 0/0 0/0 .text * readAnmColor__19J2DAnmKeyLoader_v15FPC18J3DAnmColorKeyData */ -void J2DAnmKeyLoader_v15::readAnmColor(J3DAnmColorKeyData const* pData) { - this->setAnmColor((J2DAnmColorKey*)_4, pData); +void J2DAnmKeyLoader_v15::readAnmColor(J3DAnmColorKeyData const* p_data) { + setAnmColor((J2DAnmColorKey*)mpResource, p_data); } /* 80309870-8030995C 3041B0 00EC+00 2/2 0/0 0/0 .text * setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData */ -void J2DAnmKeyLoader_v15::setAnmColor(J2DAnmColorKey* pAnm, J3DAnmColorKeyData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mUpdateMaterialNum = pData->mUpdateMaterialNum; - pAnm->field_0x10 = pData->field_0x10; - pAnm->field_0x12 = pData->field_0x12; - pAnm->field_0x14 = pData->field_0x14; - pAnm->field_0x16 = pData->field_0x16; - pAnm->mInfoTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRValOffset); - pAnm->mGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mGValOffset); - pAnm->mBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mBValOffset); - pAnm->mAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mAValOffset); - pAnm->mUpdateMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateMaterialIDOffset); - pAnm->field_0x20.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mNameTabOffset)); +void J2DAnmKeyLoader_v15::setAnmColor(J2DAnmColorKey* p_anm, J3DAnmColorKeyData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mUpdateMaterialNum = p_data->mUpdateMaterialNum; + p_anm->field_0x10 = p_data->field_0x10; + p_anm->field_0x12 = p_data->field_0x12; + p_anm->field_0x14 = p_data->field_0x14; + p_anm->field_0x16 = p_data->field_0x16; + p_anm->mInfoTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRValOffset); + p_anm->mGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mGValOffset); + p_anm->mBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mBValOffset); + p_anm->mAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mAValOffset); + p_anm->mUpdateMaterialID = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mUpdateMaterialIDOffset); + p_anm->field_0x20.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mNameTabOffset)); } /* 8030995C-80309984 30429C 0028+00 1/1 0/0 0/0 .text * readAnmVtxColor__19J2DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */ -void J2DAnmKeyLoader_v15::readAnmVtxColor(J3DAnmVtxColorKeyData const* pData) { - this->setAnmVtxColor((J2DAnmVtxColorKey*)_4, pData); +void J2DAnmKeyLoader_v15::readAnmVtxColor(J3DAnmVtxColorKeyData const* p_data) { + setAnmVtxColor((J2DAnmVtxColorKey*)mpResource, p_data); } /* 80309984-80309A80 3042C4 00FC+00 2/2 0/0 0/0 .text * setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData */ -void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* pAnm, - J3DAnmVtxColorKeyData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mAnmTableNum[0] = pData->mAnmTableNum[0]; - pAnm->mAnmTableNum[1] = pData->mAnmTableNum[1]; - pAnm->mInfoTable[0] = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffsets[0]); - pAnm->mInfoTable[1] = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffsets[1]); - pAnm->mVtxColorIndexData[0] = JSUConvertOffsetToPtr( - pData, (void*)pData->mVtxColoIndexDataOffset[0]); - pAnm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr( - pData, (void*)pData->mVtxColoIndexDataOffset[1]); - pAnm->mVtxColorIndexPointer[0] = - JSUConvertOffsetToPtr(pData, (void*)pData->mVtxColoIndexPointerOffset[0]); - pAnm->mVtxColorIndexPointer[1] = - JSUConvertOffsetToPtr(pData, (void*)pData->mVtxColoIndexPointerOffset[1]); - pAnm->mRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRValOffset); - pAnm->mGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mGValOffset); - pAnm->mBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mBValOffset); - pAnm->mAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mAValOffset); +void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* p_anm, + J3DAnmVtxColorKeyData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mAnmTableNum[0] = p_data->mAnmTableNum[0]; + p_anm->mAnmTableNum[1] = p_data->mAnmTableNum[1]; + p_anm->mInfoTable[0] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffsets[0]); + p_anm->mInfoTable[1] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffsets[1]); + p_anm->mVtxColorIndexData[0] = JSUConvertOffsetToPtr( + p_data, (void*)p_data->mVtxColoIndexDataOffset[0]); + p_anm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr( + p_data, (void*)p_data->mVtxColoIndexDataOffset[1]); + p_anm->mVtxColorIndexPointer[0] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mVtxColoIndexPointerOffset[0]); + p_anm->mVtxColorIndexPointer[1] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mVtxColoIndexPointerOffset[1]); + p_anm->mRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRValOffset); + p_anm->mGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mGValOffset); + p_anm->mBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mBValOffset); + p_anm->mAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mAValOffset); } /* 80309A80-80309B8C 3043C0 010C+00 2/1 0/0 0/0 .text load__20J2DAnmFullLoader_v15FPCv */ -void* J2DAnmFullLoader_v15::load(void const* param_0) { - const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)param_0; +void* J2DAnmFullLoader_v15::load(void const* p_data) { + const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data; const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst; + for (s32 i = 0; i < hdr->mCount; i++) { switch (dataPtr->mType) { case 'ANF1': - this->readAnmTransform((J3DAnmTransformFullData*)dataPtr); + readAnmTransform((J3DAnmTransformFullData*)dataPtr); break; case 'PAF1': - this->readAnmColor((J3DAnmColorFullData*)dataPtr); + readAnmColor((J3DAnmColorFullData*)dataPtr); break; case 'TPT1': - this->readAnmTexPattern((J3DAnmTexPatternFullData*)dataPtr); + readAnmTexPattern((J3DAnmTexPatternFullData*)dataPtr); break; case 'VAF1': - this->readAnmVisibility((J3DAnmVisibilityFullData*)dataPtr); + readAnmVisibility((J3DAnmVisibilityFullData*)dataPtr); break; case 'VCF1': - this->readAnmVtxColor((J3DAnmVtxColorFullData*)dataPtr); + readAnmVtxColor((J3DAnmVtxColorFullData*)dataPtr); break; } dataPtr = (J3DAnmDataBlockHeader*)((s32)dataPtr + dataPtr->mNextOffset); } - return _4; + return mpResource; } /* 80309B8C-80309CE8 3044CC 015C+00 1/0 0/0 0/0 .text * setResource__20J2DAnmFullLoader_v15FP10J2DAnmBasePCv */ -void J2DAnmFullLoader_v15::setResource(J2DAnmBase* pAnm, void const* pData) { - const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)pData; +void J2DAnmFullLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) { + const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data; const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst; + for (s32 i = 0; i < hdr->mCount; i++) { switch (dataPtr->mType) { case 'ANF1': - if (pAnm->getKind() == KIND_TRANSFORM) - this->setAnmTransform((J2DAnmTransformFull*)pAnm, + if (p_anm->getKind() == KIND_TRANSFORM) + setAnmTransform((J2DAnmTransformFull*)p_anm, (J3DAnmTransformFullData*)dataPtr); break; case 'PAF1': - if (pAnm->getKind() == KIND_COLOR) - this->setAnmColor((J2DAnmColorFull*)pAnm, (J3DAnmColorFullData*)dataPtr); + if (p_anm->getKind() == KIND_COLOR) + setAnmColor((J2DAnmColorFull*)p_anm, (J3DAnmColorFullData*)dataPtr); break; case 'TPT1': - if (pAnm->getKind() == KIND_TEX_PATTERN) - this->setAnmTexPattern((J2DAnmTexPattern*)pAnm, (J3DAnmTexPatternFullData*)dataPtr); + if (p_anm->getKind() == KIND_TEX_PATTERN) + setAnmTexPattern((J2DAnmTexPattern*)p_anm, (J3DAnmTexPatternFullData*)dataPtr); break; case 'VAF1': - if (pAnm->getKind() == KIND_VISIBILITY) - this->setAnmVisibility((J2DAnmVisibilityFull*)pAnm, + if (p_anm->getKind() == KIND_VISIBILITY) + setAnmVisibility((J2DAnmVisibilityFull*)p_anm, (J3DAnmVisibilityFullData*)dataPtr); break; case 'VCF1': - if (pAnm->getKind() == KIND_VTX_COLOR) - this->setAnmVtxColor((J2DAnmVtxColorFull*)pAnm, (J3DAnmVtxColorFullData*)dataPtr); + if (p_anm->getKind() == KIND_VTX_COLOR) + setAnmVtxColor((J2DAnmVtxColorFull*)p_anm, (J3DAnmVtxColorFullData*)dataPtr); break; } dataPtr = (J3DAnmDataBlockHeader*)((s32)dataPtr + dataPtr->mNextOffset); @@ -376,169 +382,169 @@ J2DAnmFullLoader_v15::~J2DAnmFullLoader_v15() {} /* 80309D60-80309D88 3046A0 0028+00 1/1 0/0 0/0 .text * readAnmTransform__20J2DAnmFullLoader_v15FPC23J3DAnmTransformFullData */ -void J2DAnmFullLoader_v15::readAnmTransform(J3DAnmTransformFullData const* pData) { - this->setAnmTransform((J2DAnmTransformFull*)_4, pData); +void J2DAnmFullLoader_v15::readAnmTransform(J3DAnmTransformFullData const* p_data) { + setAnmTransform((J2DAnmTransformFull*)mpResource, p_data); } /* 80309D88-80309E1C 3046C8 0094+00 2/2 0/0 0/0 .text * setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData */ -void J2DAnmFullLoader_v15::setAnmTransform(J2DAnmTransformFull* pAnm, - J3DAnmTransformFullData const* pData) { - pAnm->field_0x22 = pData->field_0xc; - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mTableInfo = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mScaleValues = JSUConvertOffsetToPtr(pData, (void*)pData->mScaleValOffset); - pAnm->mRotationValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRotValOffset); - pAnm->mTranslateValues = JSUConvertOffsetToPtr(pData, (void*)pData->mTransValOffset); +void J2DAnmFullLoader_v15::setAnmTransform(J2DAnmTransformFull* p_anm, + J3DAnmTransformFullData const* p_data) { + p_anm->field_0x22 = p_data->field_0xc; + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mTableInfo = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mScaleValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mScaleValOffset); + p_anm->mRotationValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRotValOffset); + p_anm->mTranslateValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mTransValOffset); } /* 80309E1C-80309E44 30475C 0028+00 1/1 0/0 0/0 .text * readAnmColor__20J2DAnmFullLoader_v15FPC19J3DAnmColorFullData */ -void J2DAnmFullLoader_v15::readAnmColor(J3DAnmColorFullData const* pData) { - this->setAnmColor((J2DAnmColorFull*)_4, pData); +void J2DAnmFullLoader_v15::readAnmColor(J3DAnmColorFullData const* p_data) { + setAnmColor((J2DAnmColorFull*)mpResource, p_data); } /* 80309E44-80309F10 304784 00CC+00 2/2 0/0 0/0 .text * setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData */ -void J2DAnmFullLoader_v15::setAnmColor(J2DAnmColorFull* pAnm, J3DAnmColorFullData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mUpdateMaterialNum = pData->mUpdateMaterialNum; - pAnm->mInfoTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRValuesOffset); - pAnm->mGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mGValuesOffset); - pAnm->mBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mBValuesOffset); - pAnm->mAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mAValuesOffset); - pAnm->mUpdateMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateMaterialIDOffset); - pAnm->field_0x20.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mNameTabOffset)); +void J2DAnmFullLoader_v15::setAnmColor(J2DAnmColorFull* p_anm, J3DAnmColorFullData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mUpdateMaterialNum = p_data->mUpdateMaterialNum; + p_anm->mInfoTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRValuesOffset); + p_anm->mGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mGValuesOffset); + p_anm->mBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mBValuesOffset); + p_anm->mAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mAValuesOffset); + p_anm->mUpdateMaterialID = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mUpdateMaterialIDOffset); + p_anm->field_0x20.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mNameTabOffset)); } /* 80309F10-80309F38 304850 0028+00 1/1 0/0 0/0 .text * readAnmTexPattern__20J2DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData */ -void J2DAnmFullLoader_v15::readAnmTexPattern(J3DAnmTexPatternFullData const* pData) { - this->setAnmTexPattern((J2DAnmTexPattern*)_4, pData); +void J2DAnmFullLoader_v15::readAnmTexPattern(J3DAnmTexPatternFullData const* p_data) { + setAnmTexPattern((J2DAnmTexPattern*)mpResource, p_data); } /* 80309F38-80309FDC 304878 00A4+00 2/2 0/0 0/0 .text * setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData */ -void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* pAnm, - J3DAnmTexPatternFullData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mUpdateMaterialNum = pData->field_0xc; - pAnm->field_0x18 = pData->field_0xe; - pAnm->mAnmTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mValues = JSUConvertOffsetToPtr(pData, (void*)pData->mValuesOffset); - pAnm->mUpdateMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mUpdateMaterialIDOffset); - pAnm->field_0x20.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mNameTabOffset)); +void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* p_anm, + J3DAnmTexPatternFullData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mUpdateMaterialNum = p_data->field_0xc; + p_anm->field_0x18 = p_data->field_0xe; + p_anm->mAnmTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mValuesOffset); + p_anm->mUpdateMaterialID = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mUpdateMaterialIDOffset); + p_anm->field_0x20.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mNameTabOffset)); } /* 80309FDC-8030A004 30491C 0028+00 1/1 0/0 0/0 .text * readAnmTevReg__19J2DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData */ -void J2DAnmKeyLoader_v15::readAnmTevReg(J3DAnmTevRegKeyData const* pData) { - this->setAnmTevReg((J2DAnmTevRegKey*)_4, pData); +void J2DAnmKeyLoader_v15::readAnmTevReg(J3DAnmTevRegKeyData const* p_data) { + setAnmTevReg((J2DAnmTevRegKey*)mpResource, p_data); } /* 8030A004-8030A190 304944 018C+00 2/2 0/0 0/0 .text * setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData */ -void J2DAnmKeyLoader_v15::setAnmTevReg(J2DAnmTevRegKey* pAnm, J3DAnmTevRegKeyData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mCRegUpdateMaterialNum = pData->mCRegUpdateMaterialNum; - pAnm->mAnmCRegKeyTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mCRegTableOffset); - pAnm->mCRegUpdateMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mCRegUpdateMaterialIDOffset); - pAnm->mCRegNameTab.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mCRegNameTabOffset)); - pAnm->mKRegUpdateMaterialNum = pData->mKRegUpdateMaterialNum; - pAnm->mAnmKRegKeyTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mKRegTableOffset); - pAnm->mKRegUpdateMaterialID = - JSUConvertOffsetToPtr(pData, (void*)pData->mKRegUpdateMaterialIDOffset); - pAnm->mKRegNameTab.setResource( - JSUConvertOffsetToPtr(pData, (void*)pData->mKRegNameTabOffset)); - pAnm->field_0x14 = pData->field_0x10; - pAnm->field_0x16 = pData->field_0x12; - pAnm->field_0x18 = pData->field_0x14; - pAnm->field_0x1a = pData->field_0x16; - pAnm->mCRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mCRValuesOffset); - pAnm->mCGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mCGValuesOffset); - pAnm->mCBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mCBValuesOffset); - pAnm->mCAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mCAValuesOffset); - pAnm->field_0x1c = pData->field_0x18; - pAnm->field_0x1e = pData->field_0x1a; - pAnm->field_0x20 = pData->field_0x1c; - pAnm->field_0x22 = pData->field_0x1e; - pAnm->mKRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mKRValuesOffset); - pAnm->mKGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mKGValuesOffset); - pAnm->mKBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mKBValuesOffset); - pAnm->mKAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mKAValuesOffset); +void J2DAnmKeyLoader_v15::setAnmTevReg(J2DAnmTevRegKey* p_anm, J3DAnmTevRegKeyData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mCRegUpdateMaterialNum = p_data->mCRegUpdateMaterialNum; + p_anm->mAnmCRegKeyTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mCRegTableOffset); + p_anm->mCRegUpdateMaterialID = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mCRegUpdateMaterialIDOffset); + p_anm->mCRegNameTab.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mCRegNameTabOffset)); + p_anm->mKRegUpdateMaterialNum = p_data->mKRegUpdateMaterialNum; + p_anm->mAnmKRegKeyTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mKRegTableOffset); + p_anm->mKRegUpdateMaterialID = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mKRegUpdateMaterialIDOffset); + p_anm->mKRegNameTab.setResource( + JSUConvertOffsetToPtr(p_data, (void*)p_data->mKRegNameTabOffset)); + p_anm->field_0x14 = p_data->field_0x10; + p_anm->field_0x16 = p_data->field_0x12; + p_anm->field_0x18 = p_data->field_0x14; + p_anm->field_0x1a = p_data->field_0x16; + p_anm->mCRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mCRValuesOffset); + p_anm->mCGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mCGValuesOffset); + p_anm->mCBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mCBValuesOffset); + p_anm->mCAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mCAValuesOffset); + p_anm->field_0x1c = p_data->field_0x18; + p_anm->field_0x1e = p_data->field_0x1a; + p_anm->field_0x20 = p_data->field_0x1c; + p_anm->field_0x22 = p_data->field_0x1e; + p_anm->mKRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mKRValuesOffset); + p_anm->mKGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mKGValuesOffset); + p_anm->mKBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mKBValuesOffset); + p_anm->mKAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mKAValuesOffset); } /* 8030A190-8030A1B8 304AD0 0028+00 1/1 0/0 0/0 .text * readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData */ -void J2DAnmFullLoader_v15::readAnmVisibility(J3DAnmVisibilityFullData const* pData) { - this->setAnmVisibility((J2DAnmVisibilityFull*)_4, pData); +void J2DAnmFullLoader_v15::readAnmVisibility(J3DAnmVisibilityFullData const* p_data) { + setAnmVisibility((J2DAnmVisibilityFull*)mpResource, p_data); } /* 8030A1B8-8030A234 304AF8 007C+00 2/2 0/0 0/0 .text * setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData */ -void J2DAnmFullLoader_v15::setAnmVisibility(J2DAnmVisibilityFull* pAnm, - J3DAnmVisibilityFullData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->field_0x10 = pData->field_0xc; - pAnm->field_0x12 = pData->field_0xe; - pAnm->mTable = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffset); - pAnm->mValues = JSUConvertOffsetToPtr(pData, (void*)pData->mValuesOffset); +void J2DAnmFullLoader_v15::setAnmVisibility(J2DAnmVisibilityFull* p_anm, + J3DAnmVisibilityFullData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->field_0x10 = p_data->field_0xc; + p_anm->field_0x12 = p_data->field_0xe; + p_anm->mTable = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffset); + p_anm->mValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mValuesOffset); } /* 8030A234-8030A25C 304B74 0028+00 1/1 0/0 0/0 .text * readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData */ -void J2DAnmFullLoader_v15::readAnmVtxColor(J3DAnmVtxColorFullData const* pData) { - this->setAnmVtxColor((J2DAnmVtxColorFull*)_4, pData); +void J2DAnmFullLoader_v15::readAnmVtxColor(J3DAnmVtxColorFullData const* p_data) { + setAnmVtxColor((J2DAnmVtxColorFull*)mpResource, p_data); } /* 8030A25C-8030A358 304B9C 00FC+00 2/2 0/0 0/0 .text * setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData */ -void J2DAnmFullLoader_v15::setAnmVtxColor(J2DAnmVtxColorFull* pAnm, - J3DAnmVtxColorFullData const* pData) { - pAnm->mFrameMax = pData->mFrameMax; - pAnm->field_0x4 = pData->field_0x8; - pAnm->mFrame = 0; - pAnm->mAnmTableNum[0] = pData->mAnmTableNum[0]; - pAnm->mAnmTableNum[1] = pData->mAnmTableNum[1]; - pAnm->mInfoTable[0] = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffsets[0]); - pAnm->mInfoTable[1] = - JSUConvertOffsetToPtr(pData, (void*)pData->mTableOffsets[1]); - pAnm->mVtxColorIndexData[0] = JSUConvertOffsetToPtr( - pData, (void*)pData->mVtxColorIndexDataOffsets[0]); - pAnm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr( - pData, (void*)pData->mVtxColorIndexDataOffsets[1]); - pAnm->mVtxColorIndexPointer[0] = - JSUConvertOffsetToPtr(pData, (void*)pData->mVtxColorIndexPointerOffsets[0]); - pAnm->mVtxColorIndexPointer[1] = - JSUConvertOffsetToPtr(pData, (void*)pData->mVtxColorIndexPointerOffsets[1]); - pAnm->mRValues = JSUConvertOffsetToPtr(pData, (void*)pData->mRValuesOffset); - pAnm->mGValues = JSUConvertOffsetToPtr(pData, (void*)pData->mGValuesOffset); - pAnm->mBValues = JSUConvertOffsetToPtr(pData, (void*)pData->mBValuesOffset); - pAnm->mAValues = JSUConvertOffsetToPtr(pData, (void*)pData->mAValuesOffset); +void J2DAnmFullLoader_v15::setAnmVtxColor(J2DAnmVtxColorFull* p_anm, + J3DAnmVtxColorFullData const* p_data) { + p_anm->mFrameMax = p_data->mFrameMax; + p_anm->field_0x4 = p_data->field_0x8; + p_anm->mFrame = 0; + p_anm->mAnmTableNum[0] = p_data->mAnmTableNum[0]; + p_anm->mAnmTableNum[1] = p_data->mAnmTableNum[1]; + p_anm->mInfoTable[0] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffsets[0]); + p_anm->mInfoTable[1] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mTableOffsets[1]); + p_anm->mVtxColorIndexData[0] = JSUConvertOffsetToPtr( + p_data, (void*)p_data->mVtxColorIndexDataOffsets[0]); + p_anm->mVtxColorIndexData[1] = JSUConvertOffsetToPtr( + p_data, (void*)p_data->mVtxColorIndexDataOffsets[1]); + p_anm->mVtxColorIndexPointer[0] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mVtxColorIndexPointerOffsets[0]); + p_anm->mVtxColorIndexPointer[1] = + JSUConvertOffsetToPtr(p_data, (void*)p_data->mVtxColorIndexPointerOffsets[1]); + p_anm->mRValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mRValuesOffset); + p_anm->mGValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mGValuesOffset); + p_anm->mBValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mBValuesOffset); + p_anm->mAValues = JSUConvertOffsetToPtr(p_data, (void*)p_data->mAValuesOffset); } /* 8030A358-8030A3B4 304C98 005C+00 1/0 0/0 0/0 .text __dt__14J2DAnmVtxColorFv */ diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index 5fa4f5200b6..7e95632fe36 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -171,7 +171,7 @@ void J2DGrafContext::fillBox(JGeometry::TBox2 const& box) { GXColor1u32(mColorBL); GXPosition3f32(box.i.x, box.f.y, 0); GXColor1u32(mColorBR); - GXEnd(); + i_GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } @@ -193,7 +193,7 @@ void J2DGrafContext::drawFrame(JGeometry::TBox2 const& box) { GXColor1u32(mColorBR); GXPosition3f32(box.i.x, box.i.y, 0); GXColor1u32(mColorTL); - GXEnd(); + i_GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } @@ -209,7 +209,7 @@ void J2DGrafContext::line(JGeometry::TVec2 start, JGeometry::TVec2 end GXColor1u32(mColorTL); GXPosition3f32(end.x, end.y, 0); GXColor1u32(mColorBR); - GXEnd(); + i_GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0); } diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp index dd6b2a3889b..bf7f07717aa 100644 --- a/libs/JSystem/J2DGraph/J2DManage.cpp +++ b/libs/JSystem/J2DGraph/J2DManage.cpp @@ -26,6 +26,7 @@ void* J2DDataManage::get(char const* name) { void* J2DDataManage::get(JSUInputStream* inputStream) { inputStream->skip(1); u8 nameLen = inputStream->readU8(); + if (nameLen == 0) { return NULL; } else { @@ -45,18 +46,18 @@ s8* J2DResReference::getResReference(u16 idx) const { } } -/* ############################################################################################## */ -/* 804349C0-80434AC8 0616E0 0101+07 1/1 0/0 0/0 .bss p_name$494 */ -static char p_name[257]; - /* 8030CF44-8030D098 307884 0154+00 0/0 2/2 0/0 .text getName__15J2DResReferenceCFUs */ char* J2DResReference::getName(u16 idx) const { + static char p_name[257]; + s8* resRef = this->getResReference(idx); + if (resRef == NULL) { p_name[0] = 0; return p_name; } else { s8 first = resRef[0]; + switch (first) { case 2: case 3: @@ -72,6 +73,7 @@ char* J2DResReference::getName(u16 idx) const { break; } } + s32 i = 0; pos++; for (; pos < resRef[1] + 2; i++, pos++) { diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 03d2a228b50..1b7f72b98aa 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -349,7 +349,7 @@ extern "C" void _restgpr_29(); extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; extern "C" extern u8 const j2dDefaultTevStageInfo[20]; -extern "C" extern u8 const j2dDefaultIndTevStageInfo[12]; +extern "C" extern J2DIndTevStageInfo const j2dDefaultIndTevStageInfo; extern "C" extern void* __vt__11J2DIndBlock[14]; extern "C" extern u32 j2dDefaultColInfo; extern "C" extern u32 j2dDefaultTevOrderInfoNull; @@ -689,75 +689,14 @@ SECTION_DATA extern void* __vt__12J2DTevBlock1[47] = { (void*)__dt__12J2DTevBlock1Fv, }; -/* 803CCE74-803CCF30 029F94 00BC+00 10/10 1/1 0/0 .data __vt__11J2DTevBlock */ -SECTION_DATA extern void* __vt__11J2DTevBlock[47] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)initialize__11J2DTevBlockFv, - (void*)setGX__11J2DTevBlockFv, - (void*)loadTexture__11J2DTevBlockF11_GXTexMapIDUl, - (void*)NULL, - (void*)NULL, - (void*)setTexNo__11J2DTevBlockFUlUs, - (void*)getTexNo__11J2DTevBlockCFUl, - (void*)setFontNo__11J2DTevBlockFUs, - (void*)getFontNo__11J2DTevBlockCFv, - (void*)setTevOrder__11J2DTevBlockFUl11J2DTevOrder, - (void*)getTevOrder__11J2DTevBlockFUl, - (void*)setTevColor__11J2DTevBlockFUl13J2DGXColorS10, - (void*)getTevColor__11J2DTevBlockFUl, - (void*)setTevKColor__11J2DTevBlockFUlQ28JUtility6TColor, - (void*)getTevKColor__11J2DTevBlockFUl, - (void*)setTevKColorSel__11J2DTevBlockFUlUc, - (void*)getTevKColorSel__11J2DTevBlockFUl, - (void*)setTevKAlphaSel__11J2DTevBlockFUlUc, - (void*)getTevKAlphaSel__11J2DTevBlockFUl, - (void*)setTevStageNum__11J2DTevBlockFUc, - (void*)getTevStageNum__11J2DTevBlockCFv, - (void*)setTevStage__11J2DTevBlockFUl11J2DTevStage, - (void*)getTevStage__11J2DTevBlockFUl, - (void*)setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo, - (void*)setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable, - (void*)getTevSwapModeTable__11J2DTevBlockFUl, - (void*)setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage, - (void*)getIndTevStage__11J2DTevBlockFUl, - (void*)insertTexture__11J2DTevBlockFUlPC7ResTIMG, - (void*)insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette, - (void*)insertTexture__11J2DTevBlockFUlP10JUTTexture, - (void*)setTexture__11J2DTevBlockFUlPC7ResTIMG, - (void*)setTexture__11J2DTevBlockFUlP10JUTTexture, - (void*)removeTexture__11J2DTevBlockFUl, - (void*)setFont__11J2DTevBlockFP7ResFONT, - (void*)setFont__11J2DTevBlockFP7JUTFont, - (void*)setPalette__11J2DTevBlockFUlPC7ResTLUT, - (void*)prepareTexture__11J2DTevBlockFUc, - (void*)getTexture__11J2DTevBlockFUl, - (void*)getPalette__11J2DTevBlockFUl, - (void*)getFont__11J2DTevBlockFv, - (void*)shiftDeleteFlag__11J2DTevBlockFUcb, - (void*)setUndeleteFlag__11J2DTevBlockFUc, - (void*)setFontUndeleteFlag__11J2DTevBlockFv, - (void*)__dt__11J2DTevBlockFv, -}; - -/* 803CCF30-803CCF40 02A050 000C+04 1/1 1/1 0/0 .data __vt__14J2DTexGenBlock */ -SECTION_DATA extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14J2DTexGenBlockFv, - /* padding */ - NULL, -}; - /* 802EB620-802EB6A4 2E5F60 0084+00 1/0 1/1 0/0 .text __dt__14J2DTexGenBlockFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTexGenBlock::~J2DTexGenBlock() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__14J2DTexGenBlockFv.s" +J2DTexGenBlock::~J2DTexGenBlock() { + for (int i = 0; i < 8; i++) { + if (mTexMtx[i] != NULL) { + delete mTexMtx[i]; + } + } } -#pragma pop /* 802EB6A4-802EB7E0 2E5FE4 013C+00 0/0 3/3 0/0 .text setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx */ #pragma push @@ -780,34 +719,34 @@ asm void J2DTexGenBlock::getTexMtx(u32 param_0, J2DTexMtx& param_1) { #pragma pop /* 802EB87C-802EB884 2E61BC 0008+00 1/0 0/0 0/0 .text getTexture__11J2DTevBlockFUl */ -bool J2DTevBlock::getTexture(u32 param_0) { - return false; +JUTTexture* J2DTevBlock::getTexture(u32) { + return NULL; } /* 802EB884-802EB88C 2E61C4 0008+00 1/0 0/0 0/0 .text getPalette__11J2DTevBlockFUl */ -bool J2DTevBlock::getPalette(u32 param_0) { - return false; +JUTPalette* J2DTevBlock::getPalette(u32) { + return NULL; } /* 802EB88C-802EB998 2E61CC 010C+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock1::J2DTevBlock1() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock1Fv.s" +J2DTevBlock1::J2DTevBlock1() { + mTexture[0] = NULL; + mUndeleteFlag = 0; + initialize(); } -#pragma pop /* 802EB998-802EBA50 2E62D8 00B8+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock1::~J2DTevBlock1() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock1Fv.s" +J2DTevBlock1::~J2DTevBlock1() { + if (mUndeleteFlag & 1) { + delete mTexture[0]; + } + + delete mPalette[0]; + + if (mUndeleteFlag & 0x80) { + delete mFont; + } } -#pragma pop /* 802EBA50-802EBC0C 2E6390 01BC+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock1Fv */ #pragma push @@ -822,112 +761,253 @@ extern "C" asm void initialize__12J2DTevBlock1Fv() { /* 802EBC0C-802EBCC0 2E654C 00B4+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock1FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s" +bool J2DTevBlock1::prepareTexture(u8 param_0) { + if (param_0 == 0) { + return true; + } + + if (mTexture[0] == NULL) { + mTexture[0] = new JUTTexture(); + + if (mTexture[0] == NULL) { + return false; + } + mUndeleteFlag = (mUndeleteFlag & 0x80) | 1; + } + + return param_0 <= 1; } -#pragma pop /* 802EBCC0-802EBDE4 2E6600 0124+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s" +bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) { + if (param_0 != 0 || p_timg == NULL) { + return false; + } + + if (mTexture[0] != NULL && mTexture[0]->getTexInfo() != NULL) { + return false; + } + + if (mTexture[0] == NULL) { + mTexture[0] = new JUTTexture(p_timg, 0); + + if (mTexture[0] == NULL) { + return false; + } + + if (p_tlut != NULL) { + mTexture[0]->storeTIMG(p_timg, p_tlut); + } + } else if (p_tlut == NULL) { + mTexture[0]->storeTIMG(p_timg, (u8)0); + } else { + mTexture[0]->storeTIMG(p_timg, p_tlut); + } + + mUndeleteFlag = (mUndeleteFlag & 0x80) | 1; + mPalette[0] = NULL; + mTexNo[0] = -1; + return true; } -#pragma pop /* 802EBDE4-802EBE8C 2E6724 00A8+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock1FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s" +bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) { + if (mTexture[0] != NULL && mTexture[0]->getTexInfo() != NULL) { + return false; + } + + if (param_0 != 0 || p_tex == NULL) { + return false; + } + + if (mUndeleteFlag & 1) { + delete mTexture[0]; + } + + mTexture[0] = p_tex; + mUndeleteFlag &= 0x80; + mPalette[0] = NULL; + mTexNo[0] = -1; + return true; } -#pragma pop /* 802EBE8C-802EC01C 2E67CC 0190+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock1FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s" +bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) { + if (param_0 != 0) { + return false; + } + + if (mTexture[0] == NULL) { + if (p_timg != NULL) { + mTexture[0] = new JUTTexture(p_timg, 0); + + if (mTexture[0] == NULL) { + return false; + } + + mUndeleteFlag = (mUndeleteFlag & 0x80) | 1; + } else { + mUndeleteFlag &= 0x80; + } + } else if (mUndeleteFlag & 1) { + if (p_timg != NULL) { + mTexture[0]->storeTIMG(p_timg, (u8)0); + } else { + delete mTexture[0]; + mTexture[0] = NULL; + mUndeleteFlag &= 0x80; + } + } else { + mTexture[0] = NULL; + + if (p_timg != NULL) { + mTexture[0] = new JUTTexture(p_timg, 0); + + if (mTexture[0] == NULL) { + return false; + } + + mUndeleteFlag = (mUndeleteFlag & 0x80) | 1; + } + } + + delete mPalette[0]; + mPalette[0] = NULL; + mTexNo[0] = -1; + return true; } -#pragma pop /* 802EC01C-802EC0A8 2E695C 008C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock1FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s" +bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 != 0) { + return false; + } + + if (mUndeleteFlag & 1) { + delete mTexture[0]; + } + + mTexture[0] = p_tex; + mUndeleteFlag &= 0x80; + delete mPalette[0]; + mPalette[0] = NULL; + mTexNo[0] = -1; + return true; } -#pragma pop /* 802EC0A8-802EC124 2E69E8 007C+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::removeTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s" +bool J2DTevBlock1::removeTexture(u32 param_0) { + if (param_0 >= 1) { + return false; + } + + if (mUndeleteFlag & 1) { + delete mTexture[0]; + } + + mTexture[0] = NULL; + mUndeleteFlag &= 0x80; + delete mPalette[0]; + mTexNo[0] = -1; + return true; } -#pragma pop /* 802EC124-802EC1D8 2E6A64 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock1FP7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::setFont(ResFONT* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s" +bool J2DTevBlock1::setFont(ResFONT* p_font) { + if (p_font == NULL) { + return false; + } + + JUTResFont* resFont = new JUTResFont(p_font, NULL); + if (resFont == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = resFont; + mUndeleteFlag = (mUndeleteFlag & 0x7F) | 0x80; + return true; } -#pragma pop /* 802EC1D8-802EC258 2E6B18 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock1FP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s" +bool J2DTevBlock1::setFont(JUTFont* p_font) { + if (p_font == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = (JUTResFont*)p_font; + mUndeleteFlag = mUndeleteFlag & 0x7F; + return true; } -#pragma pop /* 802EC258-802EC318 2E6B98 00C0+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock1FUlPC7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s" +bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) { + if (param_0 != 0) { + return false; + } + + if (p_tlut != NULL) { + if (mPalette[0] == NULL) { + mPalette[0] = new JUTPalette(GX_TLUT0, (ResTLUT*)p_tlut); + + if (mPalette[0] == NULL) { + return false; + } + } else { + mPalette[0]->storeTLUT(GX_TLUT0, (ResTLUT*)p_tlut); + } + + if (mTexture[0] != NULL) { + mTexture[0]->attachPalette(mPalette[0]); + } + } else { + delete mPalette[0]; + mPalette[0] = NULL; + } + + return true; } -#pragma pop /* 802EC318-802EC328 2E6C58 0010+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock1FUcb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::shiftDeleteFlag(u8 param_0, bool param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock1FUcb.s" +void J2DTevBlock1::shiftDeleteFlag(u8, bool) { + mUndeleteFlag &= 0x80; } -#pragma pop /* 802EC328-802EC570 2E6C68 0248+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock1Fv */ +#ifdef NONMATCHING +void J2DTevBlock1::setGX() { + loadTexture(GX_TEXMAP0, 0); + GXSetTevOrder(GX_TEVSTAGE0, mTevOrder[0].getTexCoord(), mTevOrder[0].getTexMap(), mTevOrder[0].getColor()); + + for (int i = 0; i < 4; i++) { + GXColorS10 color = mTevColor[i]; + + GXTevRegID id; + if (i == 3) { + id = 0; + } else { + id = i + 1; + } + GXSetTevColorS10(id, color); + } + + GXSetNumTevStages(1); + GXSetTevColorIn(GX_TEVSTAGE0, ) +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -936,37 +1016,41 @@ asm void J2DTevBlock1::setGX() { #include "asm/JSystem/J2DGraph/J2DMatBlock/setGX__12J2DTevBlock1Fv.s" } #pragma pop +#endif /* 802EC570-802EC5B8 2E6EB0 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock1F11_GXTexMapIDUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::loadTexture(_GXTexMapID param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock1F11_GXTexMapIDUl.s" +void J2DTevBlock1::loadTexture(GXTexMapID texmapID, u32 texIndex) { + if (texIndex == 0 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) { + mTexture[texIndex]->load(texmapID); + } } -#pragma pop /* 802EC5B8-802EC6C8 2E6EF8 0110+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock2::J2DTevBlock2() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock2Fv.s" +J2DTevBlock2::J2DTevBlock2() { + mTexture[0] = NULL; + mTexture[1] = NULL; + mUndeleteFlag = 0; + initialize(); } -#pragma pop /* 802EC6C8-802EC7A0 2E7008 00D8+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock2::~J2DTevBlock2() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock2Fv.s" +J2DTevBlock2::~J2DTevBlock2() { + if (mUndeleteFlag & 1) { + delete mTexture[0]; + } + + if (mUndeleteFlag & 2) { + delete mTexture[1]; + } + + delete mPalette[0]; + delete mPalette[1]; + + if (mUndeleteFlag & 0x80) { + delete mFont; + } } -#pragma pop /* 802EC7A0-802ECA18 2E70E0 0278+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock2Fv */ #pragma push @@ -981,17 +1065,114 @@ extern "C" asm void initialize__12J2DTevBlock2Fv() { /* 802ECA18-802ECAE8 2E7358 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock2FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s" +bool J2DTevBlock2::prepareTexture(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (i >= 2) { + return false; + } + + if (mTexture[i] == NULL) { + mTexture[i] = new JUTTexture(); + + if (mTexture[i] == NULL) { + return false; + } + mUndeleteFlag |= (1 << i); + } + } + + return true; } -#pragma pop /* 802ECAE8-802ECDE8 2E7428 0300+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette */ +#ifdef NONMATCHING +bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) { + if (param_0 >= 2 || p_timg == NULL) { + return false; + } + + u8 texNo = 0; + for (; texNo < 2; texNo++) { + if (mTexture[texNo] == NULL || mTexture[texNo]->getTexInfo() == NULL) { + break; + } + } + + if (texNo < param_0) { + return false; + } + + if (texNo == 2) { + return false; + } + + u8 tlutid = 0; + if (p_timg->palettesEnabled && p_tlut == NULL) { + JUTTexture* tex = mTexture[0]; + if (tex != NULL && tex->getTexInfo() != NULL && tex->getTexInfo()->palettesEnabled) { + int tlutname = tex->getTlutName(); + if (tlutname == GX_TLUT0 || tlutname == GX_BIGTLUT0) { + tlutid = 1; + } + } + } + + JUTTexture* tex = mTexture[texNo]; + if (tex == NULL) { + JUTTexture* newtex = new JUTTexture(p_timg, tlutid); + + if (newtex == NULL) { + return false; + } + + if (p_tlut != NULL) { + newtex->storeTIMG(p_timg, p_tlut); + } + + if (param_0 == 0) { + mTexture[1] = mTexture[0]; + mPalette[1] = mPalette[0]; + mTexNo[1] = mTexNo[0]; + } + mTexture[param_0] = newtex; + shiftDeleteFlag(param_0, true); + mUndeleteFlag |= (1 << param_0); + } else { + if (p_tlut == NULL) { + tex->storeTIMG(p_timg, tlutid); + } else { + tex->storeTIMG(p_timg, p_tlut); + } + + bool local_28[2]; + for (u8 i = 0; i < 2; i++) { + local_28[i] = mUndeleteFlag & (1 << i); + } + + if (param_0 == 0 && texNo == 1) { + mTexture[1] = mTexture[0]; + mPalette[1] = mPalette[0]; + mTexNo[1] = mTexNo[0]; + local_28[1] = local_28[0]; + } + mTexture[param_0] = tex; + mUndeleteFlag &= 0x80; + + for (u8 i = 0; i < 2; i++) { + if (local_28[i]) { + mUndeleteFlag |= (1 << i); + } + } + + mUndeleteFlag |= (1 << param_0); + } + + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1000,19 +1181,118 @@ asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal #include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette.s" } #pragma pop +#endif /* 802ECDE8-802ECF48 2E7728 0160+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock2FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s" +bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 2 || p_tex == NULL) { + return false; + } + + u8 texNo = 0; + for (; texNo < 2; texNo++) { + if (mTexture[texNo] == NULL || mTexture[texNo]->getTexInfo() == NULL) { + break; + } + } + + if (texNo < param_0) { + return false; + } + + if (texNo == 2) { + return false; + } + + if (mTexture[1] != NULL && mTexture[1]->getTexInfo() == NULL) { + if (mUndeleteFlag & 2) { + delete mTexture[1]; + } + + mUndeleteFlag &= ~2; + } + + if (param_0 == 0) { + mTexture[1] = mTexture[0]; + mPalette[1] = mPalette[0]; + mTexNo[1] = mTexNo[0]; + } + + mTexture[param_0] = p_tex; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + shiftDeleteFlag(param_0, true); + mUndeleteFlag &= ~(1 << param_0); + return true; } -#pragma pop /* 802ECF48-802ED16C 2E7888 0224+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock2FUlPC7ResTIMG */ +#ifdef NONMATCHING +bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) { + if (param_0 >= 2) { + return false; + } + + u8 tlutid = 0; + if (p_timg != NULL && p_timg->palettesEnabled) { + if (mTexture[param_0 == 0] != NULL) { + const ResTIMG* timg = mTexture[param_0 == 0]->getTexInfo(); + if (timg != NULL && timg->palettesEnabled) { + int tlutname = mTexture[param_0 == 0]->getTlutName(); + u8 var_r0 = 0; + + if (tlutname >= 16) { + var_r0 = 16; + } + + if (tlutname - var_r0 == 0) { + tlutid = 1; + } + } + } + } + + if (mTexture[param_0] == NULL) { + if (p_timg != NULL) { + mTexture[param_0] = new JUTTexture(p_timg, tlutid); + + if (mTexture[param_0] == NULL) { + return false; + } + + mUndeleteFlag |= (1 << param_0); + } else { + mUndeleteFlag &= ~(1 << param_0); + } + } else if (mUndeleteFlag & (1 << param_0)) { + if (p_timg != NULL) { + mTexture[param_0]->storeTIMG(p_timg, tlutid); + } else { + delete mTexture[param_0]; + mTexture[param_0] = NULL; + mUndeleteFlag &= ~(1 << param_0); + } + } else { + mTexture[param_0] = NULL; + + if (p_timg != NULL) { + mTexture[param_0] = new JUTTexture(p_timg, 0); + + if (mTexture[param_0] == NULL) { + return false; + } + + mUndeleteFlag |= (1 << param_0); + } + } + + delete mPalette[param_0]; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1021,62 +1301,133 @@ asm bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) { #include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlPC7ResTIMG.s" } #pragma pop +#endif /* 802ED16C-802ED21C 2E7AAC 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock2FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s" +bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 2) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + + mTexture[param_0] = p_tex; + mUndeleteFlag &= ~(1 << param_0); + delete mPalette[param_0]; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; } -#pragma pop /* 802ED21C-802ED2F0 2E7B5C 00D4+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::removeTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s" +bool J2DTevBlock2::removeTexture(u32 param_0) { + if (param_0 >= 2) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + delete mPalette[param_0]; + + if (param_0 == 0) { + mTexture[0] = mTexture[1]; + mPalette[0] = mPalette[1]; + mTexNo[0] = mTexNo[1]; + } + + mTexture[1] = NULL; + mPalette[1] = NULL; + mTexNo[1] = -1; + shiftDeleteFlag(param_0, false); + return true; } -#pragma pop /* 802ED2F0-802ED3A4 2E7C30 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock2FP7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::setFont(ResFONT* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s" +bool J2DTevBlock2::setFont(ResFONT* p_font) { + if (p_font == NULL) { + return false; + } + + JUTResFont* resFont = new JUTResFont(p_font, NULL); + if (resFont == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = resFont; + mUndeleteFlag = (mUndeleteFlag & 0x7F) | 0x80; + return true; } -#pragma pop /* 802ED3A4-802ED424 2E7CE4 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock2FP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s" +bool J2DTevBlock2::setFont(JUTFont* p_font) { + if (p_font == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = (JUTResFont*)p_font; + mUndeleteFlag = mUndeleteFlag & 0x7F; + return true; } -#pragma pop /* 802ED424-802ED4FC 2E7D64 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock2FUlPC7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s" +bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) { + if (param_0 >= 2) { + return false; + } + + if (p_tlut != NULL) { + if (mPalette[param_0] == NULL) { + mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + + if (mPalette[param_0] == NULL) { + return false; + } + } else { + mPalette[param_0]->storeTLUT(GX_TLUT0, (ResTLUT*)p_tlut); + } + + if (mTexture[param_0] != NULL) { + mTexture[param_0]->attachPalette(mPalette[param_0]); + } + } else { + delete mPalette[param_0]; + mPalette[param_0] = NULL; + } + + return true; } -#pragma pop /* 802ED4FC-802ED584 2E7E3C 0088+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock2FUcb */ +#ifdef NONMATCHING +void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) { + u8 tmpFlags = mUndeleteFlag; + mUndeleteFlag = (u8)(tmpFlags & 0x7F); + + if (param_1) { + int temp_r0_2 = (1 << param_0) - 1; + mUndeleteFlag = (mUndeleteFlag & temp_r0_2) | ((mUndeleteFlag & ~temp_r0_2) * 2); + } else { + mUndeleteFlag = (mUndeleteFlag & ((1 << param_0) - 1)) | (mUndeleteFlag & ~((1 << (param_0 + 1)) - 1)); + } + + mUndeleteFlag |= (tmpFlags & 0x80); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1085,6 +1436,7 @@ asm void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) { #include "asm/JSystem/J2DGraph/J2DMatBlock/shiftDeleteFlag__12J2DTevBlock2FUcb.s" } #pragma pop +#endif /* 802ED584-802ED874 2E7EC4 02F0+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock2Fv */ #pragma push @@ -1098,34 +1450,35 @@ asm void J2DTevBlock2::setGX() { /* 802ED874-802ED8BC 2E81B4 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock2F11_GXTexMapIDUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::loadTexture(_GXTexMapID param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock2F11_GXTexMapIDUl.s" +void J2DTevBlock2::loadTexture(GXTexMapID texmapID, u32 texIndex) { + if (texIndex < 2 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) { + mTexture[texIndex]->load(texmapID); + } } -#pragma pop /* 802ED8BC-802ED9E4 2E81FC 0128+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock4::J2DTevBlock4() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock4Fv.s" +J2DTevBlock4::J2DTevBlock4() { + for (int i = 0; i < 4; i++) { + mTexture[i] = NULL; + } + + mUndeleteFlag = 0; + initialize(); } -#pragma pop /* 802ED9E4-802EDAC4 2E8324 00E0+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock4::~J2DTevBlock4() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock4Fv.s" +J2DTevBlock4::~J2DTevBlock4() { + for (int i = 0; i < 4; i++) { + if (mUndeleteFlag & (1 << i)) { + delete mTexture[i]; + } + delete mPalette[i]; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } } -#pragma pop /* 802EDAC4-802EDD34 2E8404 0270+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock4Fv */ #pragma push @@ -1140,14 +1493,24 @@ extern "C" asm void initialize__12J2DTevBlock4Fv() { /* 802EDD34-802EDE04 2E8674 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock4FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s" +bool J2DTevBlock4::prepareTexture(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (i >= 4) { + return 0; + } + + if (mTexture[i] == NULL) { + mTexture[i] = new JUTTexture(); + + if (mTexture[i] == NULL) { + return false; + } + mUndeleteFlag |= (1 << i); + } + } + + return true; } -#pragma pop /* 802EDE04-802EE1D4 2E8744 03D0+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock4FUlPC7ResTIMGP10JUTPalette */ @@ -1162,14 +1525,47 @@ asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal /* 802EE1D4-802EE364 2E8B14 0190+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock4FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s" +bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 4 || p_tex == NULL) { + return false; + } + + u8 texNo = 0; + for (; texNo < 4; texNo++) { + if (mTexture[texNo] == NULL || mTexture[texNo]->getTexInfo() == NULL) { + break; + } + } + + if (texNo < param_0) { + return false; + } + + if (texNo == 4) { + return false; + } + + if (mTexture[3] != NULL && mTexture[3]->getTexInfo() == NULL) { + if (mUndeleteFlag & 8) { + delete mTexture[3]; + } + + mUndeleteFlag &= ~8; + } + + for (u8 i = 3; i > param_0; i--) { + mTexture[i] = mTexture[i - 1]; + mPalette[i] = mPalette[i - 1]; + mTexNo[i] = mTexNo[i - 1]; + } + + mTexture[param_0] = p_tex; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + shiftDeleteFlag(param_0, true); + mUndeleteFlag &= ~(1 << param_0); + return true; } -#pragma pop /* 802EE364-802EE5F0 2E8CA4 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlPC7ResTIMG */ #pragma push @@ -1183,56 +1579,111 @@ asm bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) { /* 802EE5F0-802EE6A0 2E8F30 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s" +bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 4) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + + mTexture[param_0] = p_tex; + mUndeleteFlag &= ~(1 << param_0); + delete mPalette[param_0]; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; } -#pragma pop /* 802EE6A0-802EE798 2E8FE0 00F8+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::removeTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s" +bool J2DTevBlock4::removeTexture(u32 param_0) { + if (param_0 >= 4) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + delete mPalette[param_0]; + + for (u32 i = param_0; i < 3; i++) { + mTexture[i] = mTexture[i + 1]; + mPalette[i] = mPalette[i + 1]; + mTexNo[i] = mTexNo[i + 1]; + } + + mTexture[3] = NULL; + mPalette[3] = NULL; + mTexNo[3] = -1; + shiftDeleteFlag(param_0, false); + return true; } -#pragma pop /* 802EE798-802EE84C 2E90D8 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock4FP7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::setFont(ResFONT* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s" +bool J2DTevBlock4::setFont(ResFONT* p_font) { + if (p_font == NULL) { + return false; + } + + JUTResFont* resFont = new JUTResFont(p_font, NULL); + if (resFont == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = resFont; + mUndeleteFlag = (mUndeleteFlag & 0x7F) | 0x80; + return true; } -#pragma pop /* 802EE84C-802EE8CC 2E918C 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock4FP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s" +bool J2DTevBlock4::setFont(JUTFont* p_font) { + if (p_font == NULL) { + return false; + } + + if (mUndeleteFlag & 0x80) { + delete mFont; + } + + mFont = (JUTResFont*)p_font; + mUndeleteFlag = mUndeleteFlag & 0x7F; + return true; } -#pragma pop /* 802EE8CC-802EE9A4 2E920C 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock4FUlPC7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s" +bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) { + if (param_0 >= 4) { + return false; + } + + if (p_tlut != NULL) { + if (mPalette[param_0] == NULL) { + mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + + if (mPalette[param_0] == NULL) { + return false; + } + } else { + mPalette[param_0]->storeTLUT(GX_TLUT0, (ResTLUT*)p_tlut); + } + + if (mTexture[param_0] != NULL) { + mTexture[param_0]->attachPalette(mPalette[param_0]); + } + } else { + delete mPalette[param_0]; + mPalette[param_0] = NULL; + } + + return true; } -#pragma pop /* 802EE9A4-802EEA2C 2E92E4 0088+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock4FUcb */ @@ -1257,34 +1708,35 @@ asm void J2DTevBlock4::setGX() { /* 802EED1C-802EED64 2E965C 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock4F11_GXTexMapIDUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::loadTexture(_GXTexMapID param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock4F11_GXTexMapIDUl.s" +void J2DTevBlock4::loadTexture(GXTexMapID texmapID, u32 texIndex) { + if (texIndex < 4 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) { + mTexture[texIndex]->load(texmapID); + } } -#pragma pop /* 802EED64-802EEE8C 2E96A4 0128+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock8Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock8::J2DTevBlock8() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__ct__12J2DTevBlock8Fv.s" +J2DTevBlock8::J2DTevBlock8() { + for (int i = 0; i < 8; i++) { + mTexture[i] = NULL; + } + + mUndeleteFlag = 0; + initialize(); } -#pragma pop /* 802EEE8C-802EEF6C 2E97CC 00E0+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock8Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock8::~J2DTevBlock8() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__12J2DTevBlock8Fv.s" +J2DTevBlock8::~J2DTevBlock8() { + for (int i = 0; i < 8; i++) { + if (mUndeleteFlag & (1 << i)) { + delete mTexture[i]; + } + delete mPalette[i]; + } + + if (mFontUndeleteFlag) { + delete mFont; + } } -#pragma pop /* 802EEF6C-802EF1E0 2E98AC 0274+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock8Fv */ #pragma push @@ -1299,14 +1751,24 @@ extern "C" asm void initialize__12J2DTevBlock8Fv() { /* 802EF1E0-802EF2B0 2E9B20 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock8FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s" +bool J2DTevBlock8::prepareTexture(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (i >= 8) { + return 0; + } + + if (mTexture[i] == NULL) { + mTexture[i] = new JUTTexture(); + + if (mTexture[i] == NULL) { + return false; + } + mUndeleteFlag |= (1 << i); + } + } + + return true; } -#pragma pop /* 802EF2B0-802EF67C 2E9BF0 03CC+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock8FUlPC7ResTIMGP10JUTPalette */ @@ -1321,14 +1783,47 @@ asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal /* 802EF67C-802EF80C 2E9FBC 0190+00 1/0 0/0 0/0 .text * insertTexture__12J2DTevBlock8FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s" +bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 8 || p_tex == NULL) { + return false; + } + + u8 texNo = 0; + for (; texNo < 8; texNo++) { + if (mTexture[texNo] == NULL || mTexture[texNo]->getTexInfo() == NULL) { + break; + } + } + + if (texNo < param_0) { + return false; + } + + if (texNo == 8) { + return false; + } + + if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) { + if (mUndeleteFlag & 0x80) { + delete mTexture[7]; + } + + mUndeleteFlag &= 0x7F; + } + + for (u8 i = 7; i > param_0; i--) { + mTexture[i] = mTexture[i - 1]; + mPalette[i] = mPalette[i - 1]; + mTexNo[i] = mTexNo[i - 1]; + } + + mTexture[param_0] = p_tex; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + shiftDeleteFlag(param_0, true); + mUndeleteFlag &= ~(1 << param_0); + return true; } -#pragma pop /* 802EF80C-802EFA98 2EA14C 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlPC7ResTIMG */ #pragma push @@ -1342,56 +1837,111 @@ asm bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) { /* 802EFA98-802EFB48 2EA3D8 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s" +bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 8) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + + mTexture[param_0] = p_tex; + mUndeleteFlag &= ~(1 << param_0); + delete mPalette[param_0]; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; } -#pragma pop /* 802EFB48-802EFC40 2EA488 00F8+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::removeTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s" +bool J2DTevBlock8::removeTexture(u32 param_0) { + if (param_0 >= 8) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + delete mPalette[param_0]; + + for (u32 i = param_0; i < 7; i++) { + mTexture[i] = mTexture[i + 1]; + mPalette[i] = mPalette[i + 1]; + mTexNo[i] = mTexNo[i + 1]; + } + + mTexture[7] = NULL; + mPalette[7] = NULL; + mTexNo[7] = -1; + shiftDeleteFlag(param_0, false); + return true; } -#pragma pop /* 802EFC40-802EFCEC 2EA580 00AC+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock8FP7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::setFont(ResFONT* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s" +bool J2DTevBlock8::setFont(ResFONT* p_font) { + if (p_font == NULL) { + return false; + } + + JUTResFont* resFont = new JUTResFont(p_font, NULL); + if (resFont == NULL) { + return false; + } + + if (mFontUndeleteFlag) { + delete mFont; + } + + mFont = resFont; + mFontUndeleteFlag = true; + return true; } -#pragma pop /* 802EFCEC-802EFD68 2EA62C 007C+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock8FP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s" +bool J2DTevBlock8::setFont(JUTFont* p_font) { + if (p_font == NULL) { + return false; + } + + if (mFontUndeleteFlag) { + delete mFont; + } + + mFont = (JUTResFont*)p_font; + mFontUndeleteFlag = false; + return true; } -#pragma pop /* 802EFD68-802EFE40 2EA6A8 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock8FUlPC7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s" +bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) { + if (param_0 >= 8) { + return false; + } + + if (p_tlut != NULL) { + if (mPalette[param_0] == NULL) { + mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + + if (mPalette[param_0] == NULL) { + return false; + } + } else { + mPalette[param_0]->storeTLUT(GX_TLUT0, (ResTLUT*)p_tlut); + } + + if (mTexture[param_0] != NULL) { + mTexture[param_0]->attachPalette(mPalette[param_0]); + } + } else { + delete mPalette[param_0]; + mPalette[param_0] = NULL; + } + + return true; } -#pragma pop /* 802EFE40-802EFEAC 2EA780 006C+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock8FUcb */ @@ -1416,34 +1966,35 @@ asm void J2DTevBlock8::setGX() { /* 802F019C-802F01E4 2EAADC 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock8F11_GXTexMapIDUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::loadTexture(_GXTexMapID param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__12J2DTevBlock8F11_GXTexMapIDUl.s" +void J2DTevBlock8::loadTexture(GXTexMapID texmapID, u32 texIndex) { + if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) { + mTexture[texIndex]->load(texmapID); + } } -#pragma pop /* 802F01E4-802F030C 2EAB24 0128+00 0/0 1/1 0/0 .text __ct__13J2DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock16::J2DTevBlock16() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__ct__13J2DTevBlock16Fv.s" +J2DTevBlock16::J2DTevBlock16() { + for (int i = 0; i < 8; i++) { + mTexture[i] = NULL; + } + + mUndeleteFlag = 0; + initialize(); } -#pragma pop /* 802F030C-802F03EC 2EAC4C 00E0+00 1/0 0/0 0/0 .text __dt__13J2DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTevBlock16::~J2DTevBlock16() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__13J2DTevBlock16Fv.s" +J2DTevBlock16::~J2DTevBlock16() { + for (int i = 0; i < 8; i++) { + if (mUndeleteFlag & (1 << i)) { + delete mTexture[i]; + } + delete mPalette[i]; + } + + if (mFontUndeleteFlag) { + delete mFont; + } } -#pragma pop /* 802F03EC-802F0660 2EAD2C 0274+00 1/0 0/0 0/0 .text initialize__13J2DTevBlock16Fv */ #pragma push @@ -1458,14 +2009,24 @@ extern "C" asm void initialize__13J2DTevBlock16Fv() { /* 802F0660-802F0730 2EAFA0 00D0+00 1/0 0/0 0/0 .text prepareTexture__13J2DTevBlock16FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::prepareTexture(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s" +bool J2DTevBlock16::prepareTexture(u8 param_0) { + for (u8 i = 0; i < param_0; i++) { + if (i >= 8) { + return 0; + } + + if (mTexture[i] == NULL) { + mTexture[i] = new JUTTexture(); + + if (mTexture[i] == NULL) { + return false; + } + mUndeleteFlag |= (1 << i); + } + } + + return true; } -#pragma pop /* 802F0730-802F0AFC 2EB070 03CC+00 1/0 0/0 0/0 .text * insertTexture__13J2DTevBlock16FUlPC7ResTIMGP10JUTPalette */ @@ -1480,14 +2041,47 @@ asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPa /* 802F0AFC-802F0C8C 2EB43C 0190+00 1/0 0/0 0/0 .text * insertTexture__13J2DTevBlock16FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s" +bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 8 || p_tex == NULL) { + return false; + } + + u8 texNo = 0; + for (; texNo < 8; texNo++) { + if (mTexture[texNo] == NULL || mTexture[texNo]->getTexInfo() == NULL) { + break; + } + } + + if (texNo < param_0) { + return false; + } + + if (texNo == 8) { + return false; + } + + if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) { + if (mUndeleteFlag & 0x80) { + delete mTexture[7]; + } + + mUndeleteFlag &= 0x7F; + } + + for (u8 i = 7; i > param_0; i--) { + mTexture[i] = mTexture[i - 1]; + mPalette[i] = mPalette[i - 1]; + mTexNo[i] = mTexNo[i - 1]; + } + + mTexture[param_0] = p_tex; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + shiftDeleteFlag(param_0, true); + mUndeleteFlag &= ~(1 << param_0); + return true; } -#pragma pop /* 802F0C8C-802F0F18 2EB5CC 028C+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlPC7ResTIMG */ #pragma push @@ -1501,57 +2095,112 @@ asm bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) { /* 802F0F18-802F0FC8 2EB858 00B0+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlP10JUTTexture */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s" +bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) { + if (param_0 >= 8) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + + mTexture[param_0] = p_tex; + mUndeleteFlag &= ~(1 << param_0); + delete mPalette[param_0]; + mPalette[param_0] = NULL; + mTexNo[param_0] = -1; + return true; } -#pragma pop /* 802F0FC8-802F10C0 2EB908 00F8+00 1/0 0/0 0/0 .text removeTexture__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::removeTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s" +bool J2DTevBlock16::removeTexture(u32 param_0) { + if (param_0 >= 8) { + return false; + } + + if (mUndeleteFlag & (1 << param_0)) { + delete mTexture[param_0]; + } + delete mPalette[param_0]; + + for (u32 i = param_0; i < 7; i++) { + mTexture[i] = mTexture[i + 1]; + mPalette[i] = mPalette[i + 1]; + mTexNo[i] = mTexNo[i + 1]; + } + + mTexture[7] = NULL; + mPalette[7] = NULL; + mTexNo[7] = -1; + shiftDeleteFlag(param_0, false); + return true; } -#pragma pop /* 802F10C0-802F116C 2EBA00 00AC+00 1/0 0/0 0/0 .text setFont__13J2DTevBlock16FP7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::setFont(ResFONT* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s" +bool J2DTevBlock16::setFont(ResFONT* p_font) { + if (p_font == NULL) { + return false; + } + + JUTResFont* resFont = new JUTResFont(p_font, NULL); + if (resFont == NULL) { + return false; + } + + if (mFontUndeleteFlag) { + delete mFont; + } + + mFont = resFont; + mFontUndeleteFlag = true; + return true; } -#pragma pop /* 802F116C-802F11E8 2EBAAC 007C+00 1/0 0/0 0/0 .text setFont__13J2DTevBlock16FP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s" +bool J2DTevBlock16::setFont(JUTFont* p_font) { + if (p_font == NULL) { + return false; + } + + if (mFontUndeleteFlag) { + delete mFont; + } + + mFont = (JUTResFont*)p_font; + mFontUndeleteFlag = false; + return true; } -#pragma pop /* 802F11E8-802F12C0 2EBB28 00D8+00 1/0 0/0 0/0 .text setPalette__13J2DTevBlock16FUlPC7ResTLUT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s" +bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) { + if (param_0 >= 8) { + return false; + } + + if (p_tlut != NULL) { + if (mPalette[param_0] == NULL) { + mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + + if (mPalette[param_0] == NULL) { + return false; + } + } else { + mPalette[param_0]->storeTLUT(GX_TLUT0, (ResTLUT*)p_tlut); + } + + if (mTexture[param_0] != NULL) { + mTexture[param_0]->attachPalette(mPalette[param_0]); + } + } else { + delete mPalette[param_0]; + mPalette[param_0] = NULL; + } + + return true; } -#pragma pop /* 802F12C0-802F132C 2EBC00 006C+00 1/0 0/0 0/0 .text shiftDeleteFlag__13J2DTevBlock16FUcb */ #pragma push @@ -1575,14 +2224,11 @@ asm void J2DTevBlock16::setGX() { /* 802F161C-802F1664 2EBF5C 0048+00 1/0 0/0 0/0 .text loadTexture__13J2DTevBlock16F11_GXTexMapIDUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::loadTexture(_GXTexMapID param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/loadTexture__13J2DTevBlock16F11_GXTexMapIDUl.s" +void J2DTevBlock16::loadTexture(GXTexMapID texmapID, u32 texIndex) { + if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) { + mTexture[texIndex]->load(texmapID); + } } -#pragma pop /* 802F1664-802F1730 2EBFA4 00CC+00 1/0 0/0 0/0 .text initialize__15J2DIndBlockFullFv */ #pragma push @@ -1682,29 +2328,19 @@ J2DGXColorS10::J2DGXColorS10() { } /* 802F1B94-802F1BA0 2EC4D4 000C+00 1/0 0/0 0/0 .text getType__15J2DIndBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DIndBlockFull::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__15J2DIndBlockFullFv.s" +u32 J2DIndBlockFull::getType() { + return 'IBLF'; } -#pragma pop /* 802F1BA0-802F1BA8 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J2DIndBlockFullFUc */ -void J2DIndBlockFull::setIndTexStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0); +void J2DIndBlockFull::setIndTexStageNum(u8 num) { + mIndTexStageNum = num; } /* 802F1BA8-802F1BB0 2EC4E8 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J2DIndBlockFullCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DIndBlockFull::getIndTexStageNum() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s" +u8 J2DIndBlockFull::getIndTexStageNum() const { + return mIndTexStageNum; } -#pragma pop /* 802F1BB0-802F1BCC 2EC4F0 001C+00 1/0 0/0 0/0 .text * setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder */ @@ -1718,14 +2354,9 @@ asm void J2DIndBlockFull::setIndTexOrder(u32 param_0, J2DIndTexOrder param_1) { #pragma pop /* 802F1BCC-802F1BE0 2EC50C 0014+00 1/0 0/0 0/0 .text getIndTexOrder__15J2DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DIndBlockFull::getIndTexOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s" +J2DIndTexOrder* J2DIndBlockFull::getIndTexOrder(u32 param_0) { + return &mIndTexOrder[param_0]; } -#pragma pop /* 802F1BE0-802F1C38 2EC520 0058+00 1/0 0/0 0/0 .text * setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx */ @@ -1740,14 +2371,9 @@ asm void J2DIndBlockFull::setIndTexMtx(u32 param_0, J2DIndTexMtx param_1) { /* 802F1C38-802F1C4C 2EC578 0014+00 1/0 0/0 0/0 .text getIndTexMtx__15J2DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DIndBlockFull::getIndTexMtx(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s" +J2DIndTexMtx* J2DIndBlockFull::getIndTexMtx(u32 param_0) { + return &mIndTexMtx[param_0]; } -#pragma pop /* 802F1C4C-802F1C68 2EC58C 001C+00 1/0 0/0 0/0 .text * setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale */ @@ -1761,34 +2387,17 @@ asm void J2DIndBlockFull::setIndTexCoordScale(u32 param_0, J2DIndTexCoordScale p #pragma pop /* 802F1C68-802F1C7C 2EC5A8 0014+00 1/0 0/0 0/0 .text getIndTexCoordScale__15J2DIndBlockFullFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DIndBlockFull::getIndTexCoordScale(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s" +J2DIndTexCoordScale* J2DIndBlockFull::getIndTexCoordScale(u32 param_0) { + return &mTexCoordScale[param_0]; } -#pragma pop /* 802F1C7C-802F1D18 2EC5BC 009C+00 1/0 0/0 0/0 .text __dt__15J2DIndBlockFullFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DIndBlockFull::~J2DIndBlockFull() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/__dt__15J2DIndBlockFullFv.s" -} -#pragma pop +J2DIndBlockFull::~J2DIndBlockFull() {} /* 802F1D18-802F1D24 2EC658 000C+00 1/0 0/0 0/0 .text getType__13J2DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__13J2DTevBlock16Fv.s" +u32 J2DTevBlock16::getType() { + return 'TV16'; } -#pragma pop /* 802F1D24-802F1D2C 2EC664 0008+00 1/0 0/0 0/0 .text getMaxStage__13J2DTevBlock16Fv */ s32 J2DTevBlock16::getMaxStage() { @@ -1796,308 +2405,181 @@ s32 J2DTevBlock16::getMaxStage() { } /* 802F1D2C-802F1D3C 2EC66C 0010+00 1/0 0/0 0/0 .text setTexNo__13J2DTevBlock16FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__13J2DTevBlock16FUlUs.s" +void J2DTevBlock16::setTexNo(u32 index, u16 texNo) { + mTexNo[index] = texNo; } -#pragma pop /* 802F1D3C-802F1D4C 2EC67C 0010+00 1/0 0/0 0/0 .text getTexNo__13J2DTevBlock16CFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock16::getTexNo(u32 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s" +u32 J2DTevBlock16::getTexNo(u32 index) const { + return mTexNo[index]; } -#pragma pop /* 802F1D4C-802F1D54 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__13J2DTevBlock16FUs */ -void J2DTevBlock16::setFontNo(u16 param_0) { - *(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0); +void J2DTevBlock16::setFontNo(u16 fontNo) { + mFontNo = fontNo; } /* 802F1D54-802F1D5C 2EC694 0008+00 1/0 0/0 0/0 .text getFontNo__13J2DTevBlock16CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock16::getFontNo() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s" +u32 J2DTevBlock16::getFontNo() const { + return mFontNo; } -#pragma pop /* 802F1D5C-802F1D80 2EC69C 0024+00 1/0 0/0 0/0 .text setTevOrder__13J2DTevBlock16FUl11J2DTevOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevOrder(u32 param_0, J2DTevOrder param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__13J2DTevBlock16FUl11J2DTevOrder.s" +void J2DTevBlock16::setTevOrder(u32 index, J2DTevOrder order) { + mTevOrder[index].mTevOrderInfo.mTexCoord = order.mTevOrderInfo.mTexCoord; + mTevOrder[index].mTevOrderInfo.mTexMap = order.mTevOrderInfo.mTexMap; + mTevOrder[index].mTevOrderInfo.mColor = order.mTevOrderInfo.mColor; } -#pragma pop /* 802F1D80-802F1D94 2EC6C0 0014+00 1/0 0/0 0/0 .text getTevOrder__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s" +J2DTevOrder* J2DTevBlock16::getTevOrder(u32 index) { + return &mTevOrder[index]; } -#pragma pop /* 802F1D94-802F1DC0 2EC6D4 002C+00 1/0 0/0 0/0 .text * setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevColor(u32 param_0, J2DGXColorS10 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__13J2DTevBlock16FUl13J2DGXColorS10.s" +void J2DTevBlock16::setTevColor(u32 index, J2DGXColorS10 color) { + mTevColor[index] = color; } -#pragma pop /* 802F1DC0-802F1DD4 2EC700 0014+00 1/0 0/0 0/0 .text getTevColor__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s" +J2DGXColorS10* J2DTevBlock16::getTevColor(u32 index) { + return &mTevColor[index]; } -#pragma pop /* 802F1DD4-802F1E00 2EC714 002C+00 1/0 0/0 0/0 .text * setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevKColor(u32 param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor.s" +void J2DTevBlock16::setTevKColor(u32 index, JUtility::TColor color) { + mTevKColor[index].r = color.r; + mTevKColor[index].g = color.g; + mTevKColor[index].b = color.b; + mTevKColor[index].a = color.a; } -#pragma pop /* 802F1E00-802F1E14 2EC740 0014+00 1/0 0/0 0/0 .text getTevKColor__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevKColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s" +JUtility::TColor* J2DTevBlock16::getTevKColor(u32 index) { + return &mTevKColor[index]; } -#pragma pop /* 802F1E14-802F1E20 2EC754 000C+00 1/0 0/0 0/0 .text setTevKColorSel__13J2DTevBlock16FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevKColorSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__13J2DTevBlock16FUlUc.s" +void J2DTevBlock16::setTevKColorSel(u32 index, u8 sel) { + mTevKColorSel[index] = sel; } -#pragma pop /* 802F1E20-802F1E2C 2EC760 000C+00 1/0 0/0 0/0 .text getTevKColorSel__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevKColorSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s" +u8 J2DTevBlock16::getTevKColorSel(u32 index) { + return mTevKColorSel[index]; } -#pragma pop /* 802F1E2C-802F1E38 2EC76C 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__13J2DTevBlock16FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevKAlphaSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__13J2DTevBlock16FUlUc.s" +void J2DTevBlock16::setTevKAlphaSel(u32 index, u8 sel) { + mTevKAlphaSel[index] = sel; } -#pragma pop /* 802F1E38-802F1E44 2EC778 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevKAlphaSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s" +u8 J2DTevBlock16::getTevKAlphaSel(u32 index) { + return mTevKAlphaSel[index]; } -#pragma pop /* 802F1E44-802F1E4C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J2DTevBlock16FUc */ -void J2DTevBlock16::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 118) /* this->field_0x76 */ = (u8)(param_0); +void J2DTevBlock16::setTevStageNum(u8 stageNum) { + mTevStageNum = stageNum; } /* 802F1E4C-802F1E54 2EC78C 0008+00 1/0 0/0 0/0 .text getTevStageNum__13J2DTevBlock16CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevStageNum() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s" +u8 J2DTevBlock16::getTevStageNum() const { + return mTevStageNum; } -#pragma pop /* 802F1E54-802F1E90 2EC794 003C+00 1/0 0/0 0/0 .text setTevStage__13J2DTevBlock16FUl11J2DTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevStage(u32 param_0, J2DTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__13J2DTevBlock16FUl11J2DTevStage.s" +void J2DTevBlock16::setTevStage(u32 index, J2DTevStage stage) { + mTevStage[index] = stage; } -#pragma pop /* 802F1E90-802F1EA4 2EC7D0 0014+00 1/0 0/0 0/0 .text getTevStage__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s" +J2DTevStage* J2DTevBlock16::getTevStage(u32 index) { + return &mTevStage[index]; } -#pragma pop /* 802F1EA4-802F1EDC 2EC7E4 0038+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo.s" +void J2DTevBlock16::setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) { + mTevStage[index].setTevSwapModeInfo(info); } -#pragma pop /* 802F1EDC-802F1EEC 2EC81C 0010+00 1/0 0/0 0/0 .text * setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable.s" +void J2DTevBlock16::setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) { + mTevSwapModeTable[index] = table; } -#pragma pop /* 802F1EEC-802F1EFC 2EC82C 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTevSwapModeTable(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s" +J2DTevSwapModeTable* J2DTevBlock16::getTevSwapModeTable(u32 index) { + return &mTevSwapModeTable[index]; } -#pragma pop /* 802F1EFC-802F1F10 2EC83C 0014+00 1/0 0/0 0/0 .text * setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage.s" +void J2DTevBlock16::setIndTevStage(u32 index, J2DIndTevStage stage) { + mIndTevStage[index] = stage; } -#pragma pop /* 802F1F10-802F1F24 2EC850 0014+00 1/0 0/0 0/0 .text getIndTevStage__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getIndTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s" +J2DIndTevStage* J2DTevBlock16::getIndTevStage(u32 index) { + return &mIndTevStage[index]; } -#pragma pop /* 802F1F24-802F1F54 2EC864 0030+00 1/0 0/0 0/0 .text insertTexture__13J2DTevBlock16FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s" +bool J2DTevBlock16::insertTexture(u32 index, ResTIMG const* p_timg) { + return insertTexture(index, p_timg, NULL); } -#pragma pop /* 802F1F54-802F1F74 2EC894 0020+00 1/0 0/0 0/0 .text getTexture__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s" +JUTTexture* J2DTevBlock16::getTexture(u32 index) { + if (index >= 8) { + return NULL; + } + + return mTexture[index]; } -#pragma pop /* 802F1F74-802F1F94 2EC8B4 0020+00 1/0 0/0 0/0 .text getPalette__13J2DTevBlock16FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getPalette(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s" +JUTPalette* J2DTevBlock16::getPalette(u32 index) { + if (index >= 8) { + return NULL; + } + + return mPalette[index]; } -#pragma pop /* 802F1F94-802F1F9C 2EC8D4 0008+00 1/0 0/0 0/0 .text getFont__13J2DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock16::getFont() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s" +JUTFont* J2DTevBlock16::getFont() { + return mFont; } -#pragma pop /* 802F1F9C-802F1FAC 2EC8DC 0010+00 1/0 0/0 0/0 .text setUndeleteFlag__13J2DTevBlock16FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setUndeleteFlag(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__13J2DTevBlock16FUc.s" +void J2DTevBlock16::setUndeleteFlag(u8 flag) { + mUndeleteFlag &= flag; } -#pragma pop /* 802F1FAC-802F1FB8 2EC8EC 000C+00 1/0 0/0 0/0 .text setFontUndeleteFlag__13J2DTevBlock16Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock16::setFontUndeleteFlag() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__13J2DTevBlock16Fv.s" +void J2DTevBlock16::setFontUndeleteFlag() { + mFontUndeleteFlag = false; } -#pragma pop /* 802F1FB8-802F1FC4 2EC8F8 000C+00 1/0 0/0 0/0 .text getType__12J2DTevBlock8Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock8Fv.s" +u32 J2DTevBlock8::getType() { + return 'TVB8'; } -#pragma pop /* 802F1FC4-802F1FCC 2EC904 0008+00 1/0 0/0 0/0 .text getMaxStage__12J2DTevBlock8Fv */ s32 J2DTevBlock8::getMaxStage() { @@ -2105,308 +2587,181 @@ s32 J2DTevBlock8::getMaxStage() { } /* 802F1FCC-802F1FDC 2EC90C 0010+00 1/0 0/0 0/0 .text setTexNo__12J2DTevBlock8FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock8FUlUs.s" +void J2DTevBlock8::setTexNo(u32 index, u16 texNo) { + mTexNo[index] = texNo; } -#pragma pop /* 802F1FDC-802F1FEC 2EC91C 0010+00 1/0 0/0 0/0 .text getTexNo__12J2DTevBlock8CFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock8::getTexNo(u32 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s" +u32 J2DTevBlock8::getTexNo(u32 index) const { + return mTexNo[index]; } -#pragma pop /* 802F1FEC-802F1FF4 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock8FUs */ -void J2DTevBlock8::setFontNo(u16 param_0) { - *(u16*)(((u8*)this) + 20) /* this->field_0x14 */ = (u16)(param_0); +void J2DTevBlock8::setFontNo(u16 fontNo) { + mFontNo = fontNo; } /* 802F1FF4-802F1FFC 2EC934 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock8CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock8::getFontNo() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s" +u32 J2DTevBlock8::getFontNo() const { + return mFontNo; } -#pragma pop /* 802F1FFC-802F2020 2EC93C 0024+00 1/0 0/0 0/0 .text setTevOrder__12J2DTevBlock8FUl11J2DTevOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevOrder(u32 param_0, J2DTevOrder param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock8FUl11J2DTevOrder.s" +void J2DTevBlock8::setTevOrder(u32 index, J2DTevOrder order) { + mTevOrder[index].mTevOrderInfo.mTexCoord = order.mTevOrderInfo.mTexCoord; + mTevOrder[index].mTevOrderInfo.mTexMap = order.mTevOrderInfo.mTexMap; + mTevOrder[index].mTevOrderInfo.mColor = order.mTevOrderInfo.mColor; } -#pragma pop /* 802F2020-802F2034 2EC960 0014+00 1/0 0/0 0/0 .text getTevOrder__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s" +J2DTevOrder* J2DTevBlock8::getTevOrder(u32 index) { + return &mTevOrder[index]; } -#pragma pop /* 802F2034-802F2060 2EC974 002C+00 1/0 0/0 0/0 .text * setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevColor(u32 param_0, J2DGXColorS10 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock8FUl13J2DGXColorS10.s" +void J2DTevBlock8::setTevColor(u32 index, J2DGXColorS10 color) { + mTevColor[index] = color; } -#pragma pop /* 802F2060-802F2074 2EC9A0 0014+00 1/0 0/0 0/0 .text getTevColor__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s" +J2DGXColorS10* J2DTevBlock8::getTevColor(u32 index) { + return &mTevColor[index]; } -#pragma pop /* 802F2074-802F20A0 2EC9B4 002C+00 1/0 0/0 0/0 .text * setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevKColor(u32 param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor.s" +void J2DTevBlock8::setTevKColor(u32 index, JUtility::TColor color) { + mTevKColor[index].r = color.r; + mTevKColor[index].g = color.g; + mTevKColor[index].b = color.b; + mTevKColor[index].a = color.a; } -#pragma pop /* 802F20A0-802F20B4 2EC9E0 0014+00 1/0 0/0 0/0 .text getTevKColor__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevKColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s" +JUtility::TColor* J2DTevBlock8::getTevKColor(u32 index) { + return &mTevKColor[index]; } -#pragma pop /* 802F20B4-802F20C0 2EC9F4 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J2DTevBlock8FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevKColorSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock8FUlUc.s" +void J2DTevBlock8::setTevKColorSel(u32 index, u8 sel) { + mTevKColorSel[index] = sel; } -#pragma pop /* 802F20C0-802F20CC 2ECA00 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevKColorSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s" +u8 J2DTevBlock8::getTevKColorSel(u32 index) { + return mTevKColorSel[index]; } -#pragma pop /* 802F20CC-802F20D8 2ECA0C 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J2DTevBlock8FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevKAlphaSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock8FUlUc.s" +void J2DTevBlock8::setTevKAlphaSel(u32 index, u8 sel) { + mTevKAlphaSel[index] = sel; } -#pragma pop /* 802F20D8-802F20E4 2ECA18 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevKAlphaSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s" +u8 J2DTevBlock8::getTevKAlphaSel(u32 index) { + return mTevKAlphaSel[index]; } -#pragma pop /* 802F20E4-802F20EC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock8FUc */ -void J2DTevBlock8::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 86) /* this->field_0x56 */ = (u8)(param_0); +void J2DTevBlock8::setTevStageNum(u8 stageNum) { + mTevStageNum = stageNum; } /* 802F20EC-802F20F4 2ECA2C 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock8CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevStageNum() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s" +u8 J2DTevBlock8::getTevStageNum() const { + return mTevStageNum; } -#pragma pop /* 802F20F4-802F2130 2ECA34 003C+00 1/0 0/0 0/0 .text setTevStage__12J2DTevBlock8FUl11J2DTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevStage(u32 param_0, J2DTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock8FUl11J2DTevStage.s" +void J2DTevBlock8::setTevStage(u32 index, J2DTevStage stage) { + mTevStage[index] = stage; } -#pragma pop /* 802F2130-802F2144 2ECA70 0014+00 1/0 0/0 0/0 .text getTevStage__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s" +J2DTevStage* J2DTevBlock8::getTevStage(u32 index) { + return &mTevStage[index]; } -#pragma pop /* 802F2144-802F217C 2ECA84 0038+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo.s" +void J2DTevBlock8::setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) { + mTevStage[index].setTevSwapModeInfo(info); } -#pragma pop /* 802F217C-802F218C 2ECABC 0010+00 1/0 0/0 0/0 .text * setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable.s" +void J2DTevBlock8::setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) { + mTevSwapModeTable[index] = table; } -#pragma pop /* 802F218C-802F219C 2ECACC 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTevSwapModeTable(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s" +J2DTevSwapModeTable* J2DTevBlock8::getTevSwapModeTable(u32 index) { + return &mTevSwapModeTable[index]; } -#pragma pop /* 802F219C-802F21B0 2ECADC 0014+00 1/0 0/0 0/0 .text * setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage.s" +void J2DTevBlock8::setIndTevStage(u32 index, J2DIndTevStage stage) { + mIndTevStage[index] = stage; } -#pragma pop /* 802F21B0-802F21C4 2ECAF0 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getIndTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s" +J2DIndTevStage* J2DTevBlock8::getIndTevStage(u32 index) { + return &mIndTevStage[index]; } -#pragma pop /* 802F21C4-802F21F4 2ECB04 0030+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock8FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s" +bool J2DTevBlock8::insertTexture(u32 index, ResTIMG const* p_timg) { + return insertTexture(index, p_timg, NULL); } -#pragma pop /* 802F21F4-802F2214 2ECB34 0020+00 1/0 0/0 0/0 .text getTexture__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s" +JUTTexture* J2DTevBlock8::getTexture(u32 index) { + if (index >= 8) { + return NULL; + } + + return mTexture[index]; } -#pragma pop /* 802F2214-802F2234 2ECB54 0020+00 1/0 0/0 0/0 .text getPalette__12J2DTevBlock8FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getPalette(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s" +JUTPalette* J2DTevBlock8::getPalette(u32 index) { + if (index >= 8) { + return NULL; + } + + return mPalette[index]; } -#pragma pop /* 802F2234-802F223C 2ECB74 0008+00 1/0 0/0 0/0 .text getFont__12J2DTevBlock8Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock8::getFont() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s" +JUTFont* J2DTevBlock8::getFont() { + return mFont; } -#pragma pop /* 802F223C-802F224C 2ECB7C 0010+00 1/0 0/0 0/0 .text setUndeleteFlag__12J2DTevBlock8FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setUndeleteFlag(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock8FUc.s" +void J2DTevBlock8::setUndeleteFlag(u8 flag) { + mUndeleteFlag &= flag; } -#pragma pop /* 802F224C-802F2258 2ECB8C 000C+00 1/0 0/0 0/0 .text setFontUndeleteFlag__12J2DTevBlock8Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock8::setFontUndeleteFlag() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock8Fv.s" +void J2DTevBlock8::setFontUndeleteFlag() { + mFontUndeleteFlag = false; } -#pragma pop /* 802F2258-802F2264 2ECB98 000C+00 1/0 0/0 0/0 .text getType__12J2DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock4Fv.s" +u32 J2DTevBlock4::getType() { + return 'TVB4'; } -#pragma pop /* 802F2264-802F226C 2ECBA4 0008+00 1/0 0/0 0/0 .text getMaxStage__12J2DTevBlock4Fv */ s32 J2DTevBlock4::getMaxStage() { @@ -2414,308 +2769,181 @@ s32 J2DTevBlock4::getMaxStage() { } /* 802F226C-802F227C 2ECBAC 0010+00 1/0 0/0 0/0 .text setTexNo__12J2DTevBlock4FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock4FUlUs.s" +void J2DTevBlock4::setTexNo(u32 index, u16 texNo) { + mTexNo[index] = texNo; } -#pragma pop /* 802F227C-802F228C 2ECBBC 0010+00 1/0 0/0 0/0 .text getTexNo__12J2DTevBlock4CFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock4::getTexNo(u32 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s" +u32 J2DTevBlock4::getTexNo(u32 index) const { + return mTexNo[index]; } -#pragma pop /* 802F228C-802F2294 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock4FUs */ -void J2DTevBlock4::setFontNo(u16 param_0) { - *(u16*)(((u8*)this) + 12) /* this->field_0xc */ = (u16)(param_0); +void J2DTevBlock4::setFontNo(u16 fontNo) { + mFontNo = fontNo; } /* 802F2294-802F229C 2ECBD4 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock4CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock4::getFontNo() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s" +u32 J2DTevBlock4::getFontNo() const { + return mFontNo; } -#pragma pop /* 802F229C-802F22C0 2ECBDC 0024+00 1/0 0/0 0/0 .text setTevOrder__12J2DTevBlock4FUl11J2DTevOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevOrder(u32 param_0, J2DTevOrder param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock4FUl11J2DTevOrder.s" +void J2DTevBlock4::setTevOrder(u32 index, J2DTevOrder order) { + mTevOrder[index].mTevOrderInfo.mTexCoord = order.mTevOrderInfo.mTexCoord; + mTevOrder[index].mTevOrderInfo.mTexMap = order.mTevOrderInfo.mTexMap; + mTevOrder[index].mTevOrderInfo.mColor = order.mTevOrderInfo.mColor; } -#pragma pop /* 802F22C0-802F22D4 2ECC00 0014+00 1/0 0/0 0/0 .text getTevOrder__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s" +J2DTevOrder* J2DTevBlock4::getTevOrder(u32 index) { + return &mTevOrder[index]; } -#pragma pop /* 802F22D4-802F2300 2ECC14 002C+00 1/0 0/0 0/0 .text * setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevColor(u32 param_0, J2DGXColorS10 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock4FUl13J2DGXColorS10.s" +void J2DTevBlock4::setTevColor(u32 index, J2DGXColorS10 color) { + mTevColor[index] = color; } -#pragma pop /* 802F2300-802F2314 2ECC40 0014+00 1/0 0/0 0/0 .text getTevColor__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s" +J2DGXColorS10* J2DTevBlock4::getTevColor(u32 index) { + return &mTevColor[index]; } -#pragma pop /* 802F2314-802F2340 2ECC54 002C+00 1/0 0/0 0/0 .text * setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevKColor(u32 param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor.s" +void J2DTevBlock4::setTevKColor(u32 index, JUtility::TColor color) { + mTevKColor[index].r = color.r; + mTevKColor[index].g = color.g; + mTevKColor[index].b = color.b; + mTevKColor[index].a = color.a; } -#pragma pop /* 802F2340-802F2354 2ECC80 0014+00 1/0 0/0 0/0 .text getTevKColor__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevKColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s" +JUtility::TColor* J2DTevBlock4::getTevKColor(u32 index) { + return &mTevKColor[index]; } -#pragma pop /* 802F2354-802F2360 2ECC94 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J2DTevBlock4FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevKColorSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock4FUlUc.s" +void J2DTevBlock4::setTevKColorSel(u32 index, u8 sel) { + mTevKColorSel[index] = sel; } -#pragma pop /* 802F2360-802F236C 2ECCA0 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevKColorSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s" +u8 J2DTevBlock4::getTevKColorSel(u32 index) { + return mTevKColorSel[index]; } -#pragma pop /* 802F236C-802F2378 2ECCAC 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J2DTevBlock4FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevKAlphaSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock4FUlUc.s" +void J2DTevBlock4::setTevKAlphaSel(u32 index, u8 sel) { + mTevKAlphaSel[index] = sel; } -#pragma pop /* 802F2378-802F2384 2ECCB8 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevKAlphaSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s" +u8 J2DTevBlock4::getTevKAlphaSel(u32 index) { + return mTevKAlphaSel[index]; } -#pragma pop /* 802F2384-802F238C -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock4FUc */ -void J2DTevBlock4::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 62) /* this->field_0x3e */ = (u8)(param_0); +void J2DTevBlock4::setTevStageNum(u8 stageNum) { + mTevStageNum = stageNum; } /* 802F238C-802F2394 2ECCCC 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock4CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevStageNum() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s" +u8 J2DTevBlock4::getTevStageNum() const { + return mTevStageNum; } -#pragma pop /* 802F2394-802F23D0 2ECCD4 003C+00 1/0 0/0 0/0 .text setTevStage__12J2DTevBlock4FUl11J2DTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevStage(u32 param_0, J2DTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock4FUl11J2DTevStage.s" +void J2DTevBlock4::setTevStage(u32 index, J2DTevStage stage) { + mTevStage[index] = stage; } -#pragma pop /* 802F23D0-802F23E4 2ECD10 0014+00 1/0 0/0 0/0 .text getTevStage__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s" +J2DTevStage* J2DTevBlock4::getTevStage(u32 index) { + return &mTevStage[index]; } -#pragma pop /* 802F23E4-802F241C 2ECD24 0038+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo.s" +void J2DTevBlock4::setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) { + mTevStage[index].setTevSwapModeInfo(info); } -#pragma pop /* 802F241C-802F242C 2ECD5C 0010+00 1/0 0/0 0/0 .text * setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable.s" +void J2DTevBlock4::setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) { + mTevSwapModeTable[index] = table; } -#pragma pop /* 802F242C-802F243C 2ECD6C 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTevSwapModeTable(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s" +J2DTevSwapModeTable* J2DTevBlock4::getTevSwapModeTable(u32 index) { + return &mTevSwapModeTable[index]; } -#pragma pop /* 802F243C-802F2450 2ECD7C 0014+00 1/0 0/0 0/0 .text * setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage.s" +void J2DTevBlock4::setIndTevStage(u32 index, J2DIndTevStage stage) { + mIndTevStage[index] = stage; } -#pragma pop /* 802F2450-802F2464 2ECD90 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getIndTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s" +J2DIndTevStage* J2DTevBlock4::getIndTevStage(u32 index) { + return &mIndTevStage[index]; } -#pragma pop /* 802F2464-802F2494 2ECDA4 0030+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock4FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s" +bool J2DTevBlock4::insertTexture(u32 index, ResTIMG const* p_timg) { + return insertTexture(index, p_timg, NULL); } -#pragma pop /* 802F2494-802F24B4 2ECDD4 0020+00 1/0 0/0 0/0 .text getTexture__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s" +JUTTexture* J2DTevBlock4::getTexture(u32 index) { + if (index >= 4) { + return NULL; + } + + return mTexture[index]; } -#pragma pop /* 802F24B4-802F24D4 2ECDF4 0020+00 1/0 0/0 0/0 .text getPalette__12J2DTevBlock4FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getPalette(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s" +JUTPalette* J2DTevBlock4::getPalette(u32 index) { + if (index >= 4) { + return NULL; + } + + return mPalette[index]; } -#pragma pop /* 802F24D4-802F24DC 2ECE14 0008+00 1/0 0/0 0/0 .text getFont__12J2DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock4::getFont() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s" +JUTFont* J2DTevBlock4::getFont() { + return mFont; } -#pragma pop /* 802F24DC-802F24EC 2ECE1C 0010+00 1/0 0/0 0/0 .text setUndeleteFlag__12J2DTevBlock4FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setUndeleteFlag(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock4FUc.s" +void J2DTevBlock4::setUndeleteFlag(u8 flag) { + mUndeleteFlag &= flag; } -#pragma pop /* 802F24EC-802F24FC 2ECE2C 0010+00 1/0 0/0 0/0 .text setFontUndeleteFlag__12J2DTevBlock4Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock4::setFontUndeleteFlag() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock4Fv.s" +void J2DTevBlock4::setFontUndeleteFlag() { + mUndeleteFlag &= 0x7F; } -#pragma pop /* 802F24FC-802F2508 2ECE3C 000C+00 1/0 0/0 0/0 .text getType__12J2DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock2Fv.s" +u32 J2DTevBlock2::getType() { + return 'TVB2'; } -#pragma pop /* 802F2508-802F2510 2ECE48 0008+00 1/0 0/0 0/0 .text getMaxStage__12J2DTevBlock2Fv */ s32 J2DTevBlock2::getMaxStage() { @@ -2723,308 +2951,181 @@ s32 J2DTevBlock2::getMaxStage() { } /* 802F2510-802F2520 2ECE50 0010+00 1/0 0/0 0/0 .text setTexNo__12J2DTevBlock2FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock2FUlUs.s" +void J2DTevBlock2::setTexNo(u32 index, u16 texNo) { + mTexNo[index] = texNo; } -#pragma pop /* 802F2520-802F2530 2ECE60 0010+00 1/0 0/0 0/0 .text getTexNo__12J2DTevBlock2CFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock2::getTexNo(u32 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s" +u32 J2DTevBlock2::getTexNo(u32 index) const { + return mTexNo[index]; } -#pragma pop /* 802F2530-802F2538 -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock2FUs */ -void J2DTevBlock2::setFontNo(u16 param_0) { - *(u16*)(((u8*)this) + 8) /* this->field_0x8 */ = (u16)(param_0); +void J2DTevBlock2::setFontNo(u16 fontNo) { + mFontNo = fontNo; } /* 802F2538-802F2540 2ECE78 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock2CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock2::getFontNo() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s" +u32 J2DTevBlock2::getFontNo() const { + return mFontNo; } -#pragma pop /* 802F2540-802F2564 2ECE80 0024+00 1/0 0/0 0/0 .text setTevOrder__12J2DTevBlock2FUl11J2DTevOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevOrder(u32 param_0, J2DTevOrder param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock2FUl11J2DTevOrder.s" +void J2DTevBlock2::setTevOrder(u32 index, J2DTevOrder order) { + mTevOrder[index].mTevOrderInfo.mTexCoord = order.mTevOrderInfo.mTexCoord; + mTevOrder[index].mTevOrderInfo.mTexMap = order.mTevOrderInfo.mTexMap; + mTevOrder[index].mTevOrderInfo.mColor = order.mTevOrderInfo.mColor; } -#pragma pop /* 802F2564-802F2578 2ECEA4 0014+00 1/0 0/0 0/0 .text getTevOrder__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s" +J2DTevOrder* J2DTevBlock2::getTevOrder(u32 index) { + return &mTevOrder[index]; } -#pragma pop /* 802F2578-802F25A4 2ECEB8 002C+00 1/0 0/0 0/0 .text * setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevColor(u32 param_0, J2DGXColorS10 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock2FUl13J2DGXColorS10.s" +void J2DTevBlock2::setTevColor(u32 index, J2DGXColorS10 color) { + mTevColor[index] = color; } -#pragma pop /* 802F25A4-802F25B8 2ECEE4 0014+00 1/0 0/0 0/0 .text getTevColor__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s" +J2DGXColorS10* J2DTevBlock2::getTevColor(u32 index) { + return &mTevColor[index]; } -#pragma pop /* 802F25B8-802F25E4 2ECEF8 002C+00 1/0 0/0 0/0 .text * setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevKColor(u32 param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor.s" +void J2DTevBlock2::setTevKColor(u32 index, JUtility::TColor color) { + mTevKColor[index].r = color.r; + mTevKColor[index].g = color.g; + mTevKColor[index].b = color.b; + mTevKColor[index].a = color.a; } -#pragma pop /* 802F25E4-802F25F8 2ECF24 0014+00 1/0 0/0 0/0 .text getTevKColor__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevKColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s" +JUtility::TColor* J2DTevBlock2::getTevKColor(u32 index) { + return &mTevKColor[index]; } -#pragma pop /* 802F25F8-802F2604 2ECF38 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J2DTevBlock2FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevKColorSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock2FUlUc.s" +void J2DTevBlock2::setTevKColorSel(u32 index, u8 sel) { + mTevKColorSel[index] = sel; } -#pragma pop /* 802F2604-802F2610 2ECF44 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevKColorSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s" +u8 J2DTevBlock2::getTevKColorSel(u32 index) { + return mTevKColorSel[index]; } -#pragma pop /* 802F2610-802F261C 2ECF50 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J2DTevBlock2FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevKAlphaSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock2FUlUc.s" +void J2DTevBlock2::setTevKAlphaSel(u32 index, u8 sel) { + mTevKAlphaSel[index] = sel; } -#pragma pop /* 802F261C-802F2628 2ECF5C 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevKAlphaSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s" +u8 J2DTevBlock2::getTevKAlphaSel(u32 index) { + return mTevKAlphaSel[index]; } -#pragma pop /* 802F2628-802F2630 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock2FUc */ -void J2DTevBlock2::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 50) /* this->field_0x32 */ = (u8)(param_0); +void J2DTevBlock2::setTevStageNum(u8 stageNum) { + mTevStageNum = stageNum; } /* 802F2630-802F2638 2ECF70 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock2CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevStageNum() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s" +u8 J2DTevBlock2::getTevStageNum() const { + return mTevStageNum; } -#pragma pop /* 802F2638-802F2674 2ECF78 003C+00 1/0 0/0 0/0 .text setTevStage__12J2DTevBlock2FUl11J2DTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevStage(u32 param_0, J2DTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock2FUl11J2DTevStage.s" +void J2DTevBlock2::setTevStage(u32 index, J2DTevStage stage) { + mTevStage[index] = stage; } -#pragma pop /* 802F2674-802F2688 2ECFB4 0014+00 1/0 0/0 0/0 .text getTevStage__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s" +J2DTevStage* J2DTevBlock2::getTevStage(u32 index) { + return &mTevStage[index]; } -#pragma pop /* 802F2688-802F26C0 2ECFC8 0038+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo.s" +void J2DTevBlock2::setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) { + mTevStage[index].setTevSwapModeInfo(info); } -#pragma pop /* 802F26C0-802F26D0 2ED000 0010+00 1/0 0/0 0/0 .text * setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable.s" +void J2DTevBlock2::setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) { + mTevSwapModeTable[index] = table; } -#pragma pop /* 802F26D0-802F26E0 2ED010 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTevSwapModeTable(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s" +J2DTevSwapModeTable* J2DTevBlock2::getTevSwapModeTable(u32 index) { + return &mTevSwapModeTable[index]; } -#pragma pop /* 802F26E0-802F26F4 2ED020 0014+00 1/0 0/0 0/0 .text * setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage.s" +void J2DTevBlock2::setIndTevStage(u32 index, J2DIndTevStage stage) { + mIndTevStage[index] = stage; } -#pragma pop /* 802F26F4-802F2708 2ED034 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getIndTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s" +J2DIndTevStage* J2DTevBlock2::getIndTevStage(u32 index) { + return &mIndTevStage[index]; } -#pragma pop /* 802F2708-802F2738 2ED048 0030+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock2FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s" +bool J2DTevBlock2::insertTexture(u32 index, ResTIMG const* p_timg) { + return insertTexture(index, p_timg, NULL); } -#pragma pop /* 802F2738-802F2758 2ED078 0020+00 1/0 0/0 0/0 .text getTexture__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s" +JUTTexture* J2DTevBlock2::getTexture(u32 index) { + if (index >= 2) { + return NULL; + } + + return mTexture[index]; } -#pragma pop /* 802F2758-802F2778 2ED098 0020+00 1/0 0/0 0/0 .text getPalette__12J2DTevBlock2FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getPalette(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s" +JUTPalette* J2DTevBlock2::getPalette(u32 index) { + if (index >= 2) { + return NULL; + } + + return mPalette[index]; } -#pragma pop /* 802F2778-802F2780 2ED0B8 0008+00 1/0 0/0 0/0 .text getFont__12J2DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock2::getFont() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s" +JUTFont* J2DTevBlock2::getFont() { + return mFont; } -#pragma pop /* 802F2780-802F2790 2ED0C0 0010+00 1/0 0/0 0/0 .text setUndeleteFlag__12J2DTevBlock2FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setUndeleteFlag(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock2FUc.s" +void J2DTevBlock2::setUndeleteFlag(u8 flag) { + mUndeleteFlag &= flag; } -#pragma pop /* 802F2790-802F27A0 2ED0D0 0010+00 1/0 0/0 0/0 .text setFontUndeleteFlag__12J2DTevBlock2Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock2::setFontUndeleteFlag() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock2Fv.s" +void J2DTevBlock2::setFontUndeleteFlag() { + mUndeleteFlag &= 0x7F; } -#pragma pop /* 802F27A0-802F27AC 2ED0E0 000C+00 1/0 0/0 0/0 .text getType__12J2DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::getType() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getType__12J2DTevBlock1Fv.s" +u32 J2DTevBlock1::getType() { + return 'TVB1'; } -#pragma pop /* 802F27AC-802F27B4 2ED0EC 0008+00 1/0 0/0 0/0 .text getMaxStage__12J2DTevBlock1Fv */ s32 J2DTevBlock1::getMaxStage() { @@ -3032,293 +3133,176 @@ s32 J2DTevBlock1::getMaxStage() { } /* 802F27B4-802F27C4 2ED0F4 0010+00 1/0 0/0 0/0 .text setTexNo__12J2DTevBlock1FUlUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTexNo(u32 param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexNo__12J2DTevBlock1FUlUs.s" +void J2DTevBlock1::setTexNo(u32 index, u16 texNo) { + mTexNo[index] = texNo; } -#pragma pop /* 802F27C4-802F27D4 2ED104 0010+00 1/0 0/0 0/0 .text getTexNo__12J2DTevBlock1CFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock1::getTexNo(u32 param_0) const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s" +u32 J2DTevBlock1::getTexNo(u32 index) const { + return mTexNo[index]; } -#pragma pop /* 802F27D4-802F27DC -00001 0008+00 0/0 0/0 0/0 .text setFontNo__12J2DTevBlock1FUs */ -void J2DTevBlock1::setFontNo(u16 param_0) { - *(u16*)(((u8*)this) + 6) /* this->field_0x6 */ = (u16)(param_0); +void J2DTevBlock1::setFontNo(u16 fontNo) { + mFontNo = fontNo; } /* 802F27DC-802F27E4 2ED11C 0008+00 1/0 0/0 0/0 .text getFontNo__12J2DTevBlock1CFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 J2DTevBlock1::getFontNo() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s" +u32 J2DTevBlock1::getFontNo() const { + return mFontNo; } -#pragma pop /* 802F27E4-802F2808 2ED124 0024+00 1/0 0/0 0/0 .text setTevOrder__12J2DTevBlock1FUl11J2DTevOrder */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevOrder(u32 param_0, J2DTevOrder param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevOrder__12J2DTevBlock1FUl11J2DTevOrder.s" +void J2DTevBlock1::setTevOrder(u32 index, J2DTevOrder order) { + mTevOrder[index].mTevOrderInfo.mTexCoord = order.mTevOrderInfo.mTexCoord; + mTevOrder[index].mTevOrderInfo.mTexMap = order.mTevOrderInfo.mTexMap; + mTevOrder[index].mTevOrderInfo.mColor = order.mTevOrderInfo.mColor; } -#pragma pop /* 802F2808-802F281C 2ED148 0014+00 1/0 0/0 0/0 .text getTevOrder__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevOrder(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s" +J2DTevOrder* J2DTevBlock1::getTevOrder(u32 index) { + return &mTevOrder[index]; } -#pragma pop /* 802F281C-802F2848 2ED15C 002C+00 1/0 0/0 0/0 .text * setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevColor(u32 param_0, J2DGXColorS10 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevColor__12J2DTevBlock1FUl13J2DGXColorS10.s" +void J2DTevBlock1::setTevColor(u32 index, J2DGXColorS10 color) { + mTevColor[index] = color; } -#pragma pop /* 802F2848-802F285C 2ED188 0014+00 1/0 0/0 0/0 .text getTevColor__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s" +J2DGXColorS10* J2DTevBlock1::getTevColor(u32 index) { + return &mTevColor[index]; } -#pragma pop /* 802F285C-802F2888 2ED19C 002C+00 1/0 0/0 0/0 .text * setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevKColor(u32 param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor.s" +void J2DTevBlock1::setTevKColor(u32 index, JUtility::TColor color) { + mTevKColor[index].r = color.r; + mTevKColor[index].g = color.g; + mTevKColor[index].b = color.b; + mTevKColor[index].a = color.a; } -#pragma pop /* 802F2888-802F289C 2ED1C8 0014+00 1/0 0/0 0/0 .text getTevKColor__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevKColor(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s" +JUtility::TColor* J2DTevBlock1::getTevKColor(u32 index) { + return &mTevKColor[index]; } -#pragma pop /* 802F289C-802F28A8 2ED1DC 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J2DTevBlock1FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevKColorSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKColorSel__12J2DTevBlock1FUlUc.s" +void J2DTevBlock1::setTevKColorSel(u32 index, u8 sel) { + mTevKColorSel[index] = sel; } -#pragma pop /* 802F28A8-802F28B4 2ED1E8 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevKColorSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s" +u8 J2DTevBlock1::getTevKColorSel(u32 index) { + return mTevKColorSel[index]; } -#pragma pop /* 802F28B4-802F28C0 2ED1F4 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J2DTevBlock1FUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevKAlphaSel(u32 param_0, u8 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevKAlphaSel__12J2DTevBlock1FUlUc.s" +void J2DTevBlock1::setTevKAlphaSel(u32 index, u8 sel) { + mTevKAlphaSel[index] = sel; } -#pragma pop /* 802F28C0-802F28CC 2ED200 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevKAlphaSel(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s" +u8 J2DTevBlock1::getTevKAlphaSel(u32 index) { + return mTevKAlphaSel[index]; } -#pragma pop /* 802F28CC-802F28D0 2ED20C 0004+00 1/0 0/0 0/0 .text setTevStageNum__12J2DTevBlock1FUc */ -void J2DTevBlock1::setTevStageNum(u8 param_0) { +void J2DTevBlock1::setTevStageNum(u8) { /* empty function */ } /* 802F28D0-802F28D8 2ED210 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J2DTevBlock1CFv */ -bool J2DTevBlock1::getTevStageNum() const { - return true; +u8 J2DTevBlock1::getTevStageNum() const { + return 1; } /* 802F28D8-802F2914 2ED218 003C+00 1/0 0/0 0/0 .text setTevStage__12J2DTevBlock1FUl11J2DTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevStage(u32 param_0, J2DTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevStage__12J2DTevBlock1FUl11J2DTevStage.s" +void J2DTevBlock1::setTevStage(u32 index, J2DTevStage stage) { + mTevStage[index] = stage; } -#pragma pop /* 802F2914-802F2928 2ED254 0014+00 1/0 0/0 0/0 .text getTevStage__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s" +J2DTevStage* J2DTevBlock1::getTevStage(u32 index) { + return &mTevStage[index]; } -#pragma pop /* 802F2928-802F2960 2ED268 0038+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo.s" +void J2DTevBlock1::setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) { + mTevStage[index].setTevSwapModeInfo(info); } -#pragma pop /* 802F2960-802F2970 2ED2A0 0010+00 1/0 0/0 0/0 .text * setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable.s" +void J2DTevBlock1::setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) { + mTevSwapModeTable[index] = table; } -#pragma pop /* 802F2970-802F2980 2ED2B0 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTevSwapModeTable(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s" +J2DTevSwapModeTable* J2DTevBlock1::getTevSwapModeTable(u32 index) { + return &mTevSwapModeTable[index]; } -#pragma pop /* 802F2980-802F2994 2ED2C0 0014+00 1/0 0/0 0/0 .text * setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage.s" +void J2DTevBlock1::setIndTevStage(u32 index, J2DIndTevStage stage) { + mIndTevStage[index] = stage; } -#pragma pop /* 802F2994-802F29A8 2ED2D4 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getIndTevStage(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s" +J2DIndTevStage* J2DTevBlock1::getIndTevStage(u32 index) { + return &mIndTevStage[index]; } -#pragma pop /* 802F29A8-802F29D8 2ED2E8 0030+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock1FUlPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s" +bool J2DTevBlock1::insertTexture(u32 index, ResTIMG const* p_timg) { + return insertTexture(index, p_timg, NULL); } -#pragma pop /* 802F29D8-802F29F8 2ED318 0020+00 1/0 0/0 0/0 .text getTexture__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getTexture(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s" +JUTTexture* J2DTevBlock1::getTexture(u32 index) { + if (index >= 1) { + return NULL; + } + + return mTexture[index]; } -#pragma pop /* 802F29F8-802F2A18 2ED338 0020+00 1/0 0/0 0/0 .text getPalette__12J2DTevBlock1FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getPalette(u32 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s" +JUTPalette* J2DTevBlock1::getPalette(u32 index) { + if (index >= 1) { + return NULL; + } + + return mPalette[index]; } -#pragma pop /* 802F2A18-802F2A20 2ED358 0008+00 1/0 0/0 0/0 .text getFont__12J2DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTevBlock1::getFont() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s" +JUTFont* J2DTevBlock1::getFont() { + return mFont; } -#pragma pop /* 802F2A20-802F2A30 2ED360 0010+00 1/0 0/0 0/0 .text setUndeleteFlag__12J2DTevBlock1FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setUndeleteFlag(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setUndeleteFlag__12J2DTevBlock1FUc.s" +void J2DTevBlock1::setUndeleteFlag(u8 flag) { + mUndeleteFlag &= flag; } -#pragma pop /* 802F2A30-802F2A40 2ED370 0010+00 1/0 0/0 0/0 .text setFontUndeleteFlag__12J2DTevBlock1Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTevBlock1::setFontUndeleteFlag() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DMatBlock/setFontUndeleteFlag__12J2DTevBlock1Fv.s" +void J2DTevBlock1::setFontUndeleteFlag() { + mUndeleteFlag &= 0x7F; } -#pragma pop /* 802F2A40-802F2A44 2ED380 0004+00 1/0 0/0 0/0 .text initialize__11J2DTevBlockFv */ void J2DTevBlock::initialize() { @@ -3327,128 +3311,128 @@ void J2DTevBlock::initialize() { /* 802F2A44-802F2A48 2ED384 0004+00 1/0 0/0 0/0 .text loadTexture__11J2DTevBlockF11_GXTexMapIDUl */ -void J2DTevBlock::loadTexture(_GXTexMapID param_0, u32 param_1) { +void J2DTevBlock::loadTexture(GXTexMapID, u32) { /* empty function */ } /* 802F2A48-802F2A4C 2ED388 0004+00 1/0 0/0 0/0 .text setFontNo__11J2DTevBlockFUs */ -void J2DTevBlock::setFontNo(u16 param_0) { +void J2DTevBlock::setFontNo(u16) { /* empty function */ } /* 802F2A4C-802F2A50 2ED38C 0004+00 1/0 0/0 0/0 .text setTevOrder__11J2DTevBlockFUl11J2DTevOrder */ -void J2DTevBlock::setTevOrder(u32 param_0, J2DTevOrder param_1) { +void J2DTevBlock::setTevOrder(u32, J2DTevOrder) { /* empty function */ } /* 802F2A50-802F2A54 2ED390 0004+00 1/0 0/0 0/0 .text setTevKColorSel__11J2DTevBlockFUlUc */ -void J2DTevBlock::setTevKColorSel(u32 param_0, u8 param_1) { +void J2DTevBlock::setTevKColorSel(u32, u8) { /* empty function */ } /* 802F2A54-802F2A58 2ED394 0004+00 1/0 0/0 0/0 .text setTevKAlphaSel__11J2DTevBlockFUlUc */ -void J2DTevBlock::setTevKAlphaSel(u32 param_0, u8 param_1) { +void J2DTevBlock::setTevKAlphaSel(u32, u8) { /* empty function */ } /* 802F2A58-802F2A5C 2ED398 0004+00 1/0 0/0 0/0 .text setTevStageNum__11J2DTevBlockFUc */ -void J2DTevBlock::setTevStageNum(u8 param_0) { +void J2DTevBlock::setTevStageNum(u8) { /* empty function */ } /* 802F2A5C-802F2A60 2ED39C 0004+00 1/0 0/0 0/0 .text setTevStage__11J2DTevBlockFUl11J2DTevStage */ -void J2DTevBlock::setTevStage(u32 param_0, J2DTevStage param_1) { +void J2DTevBlock::setTevStage(u32, J2DTevStage) { /* empty function */ } /* 802F2A60-802F2A64 2ED3A0 0004+00 1/0 0/0 0/0 .text * setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo */ -void J2DTevBlock::setTevSwapModeInfo(u32 param_0, J2DTevSwapModeInfo param_1) { +void J2DTevBlock::setTevSwapModeInfo(u32, J2DTevSwapModeInfo) { /* empty function */ } /* 802F2A64-802F2A68 2ED3A4 0004+00 1/0 0/0 0/0 .text * setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable */ -void J2DTevBlock::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable param_1) { +void J2DTevBlock::setTevSwapModeTable(u32, J2DTevSwapModeTable) { /* empty function */ } /* 802F2A68-802F2A6C 2ED3A8 0004+00 1/0 0/0 0/0 .text * setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage */ -void J2DTevBlock::setIndTevStage(u32 param_0, J2DIndTevStage param_1) { +void J2DTevBlock::setIndTevStage(u32, J2DIndTevStage) { /* empty function */ } /* 802F2A6C-802F2A74 2ED3AC 0008+00 1/0 0/0 0/0 .text insertTexture__11J2DTevBlockFUlP10JUTTexture */ -bool J2DTevBlock::insertTexture(u32 param_0, JUTTexture* param_1) { +bool J2DTevBlock::insertTexture(u32, JUTTexture*) { return false; } /* 802F2A74-802F2A7C 2ED3B4 0008+00 1/0 0/0 0/0 .text * insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette */ -bool J2DTevBlock::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) { +bool J2DTevBlock::insertTexture(u32, ResTIMG const*, JUTPalette*) { return false; } /* 802F2A7C-802F2A84 2ED3BC 0008+00 1/0 0/0 0/0 .text insertTexture__11J2DTevBlockFUlPC7ResTIMG */ -bool J2DTevBlock::insertTexture(u32 param_0, ResTIMG const* param_1) { +bool J2DTevBlock::insertTexture(u32, ResTIMG const*) { return false; } /* 802F2A84-802F2A8C 2ED3C4 0008+00 1/0 0/0 0/0 .text setTexture__11J2DTevBlockFUlP10JUTTexture */ -bool J2DTevBlock::setTexture(u32 param_0, JUTTexture* param_1) { +bool J2DTevBlock::setTexture(u32, JUTTexture*) { return false; } /* 802F2A8C-802F2A94 2ED3CC 0008+00 1/0 0/0 0/0 .text setTexture__11J2DTevBlockFUlPC7ResTIMG */ -bool J2DTevBlock::setTexture(u32 param_0, ResTIMG const* param_1) { +bool J2DTevBlock::setTexture(u32, ResTIMG const*) { return false; } /* 802F2A94-802F2A9C 2ED3D4 0008+00 1/0 0/0 0/0 .text removeTexture__11J2DTevBlockFUl */ -bool J2DTevBlock::removeTexture(u32 param_0) { +bool J2DTevBlock::removeTexture(u32) { return false; } /* 802F2A9C-802F2AA4 2ED3DC 0008+00 1/0 0/0 0/0 .text setFont__11J2DTevBlockFP7JUTFont */ -bool J2DTevBlock::setFont(JUTFont* param_0) { +bool J2DTevBlock::setFont(JUTFont*) { return false; } /* 802F2AA4-802F2AAC 2ED3E4 0008+00 1/0 0/0 0/0 .text setFont__11J2DTevBlockFP7ResFONT */ -bool J2DTevBlock::setFont(ResFONT* param_0) { +bool J2DTevBlock::setFont(ResFONT*) { return false; } /* 802F2AAC-802F2AB4 2ED3EC 0008+00 1/0 0/0 0/0 .text setPalette__11J2DTevBlockFUlPC7ResTLUT */ -bool J2DTevBlock::setPalette(u32 param_0, ResTLUT const* param_1) { +bool J2DTevBlock::setPalette(u32, ResTLUT const*) { return false; } /* 802F2AB4-802F2ABC 2ED3F4 0008+00 1/0 0/0 0/0 .text prepareTexture__11J2DTevBlockFUc */ -bool J2DTevBlock::prepareTexture(u8 param_0) { +bool J2DTevBlock::prepareTexture(u8) { return false; } /* 802F2ABC-802F2AC4 2ED3FC 0008+00 1/0 0/0 0/0 .text getFont__11J2DTevBlockFv */ -bool J2DTevBlock::getFont() { - return false; +JUTFont* J2DTevBlock::getFont() { + return NULL; } /* 802F2AC4-802F2AC8 2ED404 0004+00 1/0 0/0 0/0 .text shiftDeleteFlag__11J2DTevBlockFUcb */ -void J2DTevBlock::shiftDeleteFlag(u8 param_0, bool param_1) { +void J2DTevBlock::shiftDeleteFlag(u8, bool) { /* empty function */ } /* 802F2AC8-802F2ACC 2ED408 0004+00 1/0 0/0 0/0 .text setUndeleteFlag__11J2DTevBlockFUc */ -void J2DTevBlock::setUndeleteFlag(u8 param_0) { +void J2DTevBlock::setUndeleteFlag(u8) { /* empty function */ } diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 5a220d7cc2e..3f53cb4c92c 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -456,7 +456,8 @@ asm J2DColorBlock::~J2DColorBlock() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DIndBlock::~J2DIndBlock() { +// asm J2DIndBlock::~J2DIndBlock() { +extern "C" asm void __dt__11J2DIndBlockFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterial/__dt__11J2DIndBlockFv.s" } @@ -466,7 +467,8 @@ asm J2DIndBlock::~J2DIndBlock() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm J2DTevBlock::~J2DTevBlock() { +// asm J2DTevBlock::~J2DTevBlock() { +extern "C" asm void __dt__11J2DTevBlockFv() { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterial/__dt__11J2DTevBlockFv.s" } @@ -508,7 +510,7 @@ extern "C" void setGX__15J2DIndBlockNullFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DIndBlockNull::getType() { +asm u32 J2DIndBlockNull::getType() { nofralloc #include "asm/JSystem/J2DGraph/J2DMaterial/getType__15J2DIndBlockNullFv.s" } diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index c0705539b34..caf72f13b48 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -12,14 +12,10 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Declarations: -// - /* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text __ct__7J2DPaneFv */ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; - id = 'PAN1'; + mKind = 'PAN1'; mVisible = true; mInfoTag = 0; mUserInfoTag = 0; @@ -31,15 +27,15 @@ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { /* 802F5CB8-802F5D40 2F05F8 0088+00 3/3 0/0 0/0 .text initiate__7J2DPaneFv */ void J2DPane::initiate() { - _4 = -1; + field_0x4 = -1; mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = 0; mBasePosition = 0; mRotAxis = ROTATE_Z; mScaleY = mScaleX = 1; mCullMode = GX_CULL_NONE; - mAlpha = 0xFF; + mAlpha = 255; mIsInfluencedAlpha = true; - mColorAlpha = 0xFF; + mColorAlpha = 255; mConnected = false; calcMtx(); @@ -47,44 +43,45 @@ void J2DPane::initiate() { /* 802F5D40-802F5DD0 2F0680 0090+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2 */ -J2DPane::J2DPane(J2DPane* param_0, bool param_1, u64 tag, JGeometry::TBox2 const& box) +J2DPane::J2DPane(J2DPane* p_pane, bool visible, u64 tag, JGeometry::TBox2 const& bounds) : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; - this->initialize(param_0, param_1, tag, box); + initialize(p_pane, visible, tag, bounds); } /* 802F5DD0-802F5E88 2F0710 00B8+00 1/1 0/0 0/0 .text * initialize__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2 */ -void J2DPane::initialize(J2DPane* pane, bool visible, u64 infoTag, - JGeometry::TBox2 const& box) { - id = 'PAN1'; +void J2DPane::initialize(J2DPane* p_pane, bool visible, u64 infoTag, + JGeometry::TBox2 const& bounds) { + mKind = 'PAN1'; mVisible = visible; mInfoTag = infoTag; mUserInfoTag = 0; - mBounds.set(box); - if (pane != NULL) { - pane->mPaneTree.appendChild(&this->mPaneTree); + mBounds.set(bounds); + if (p_pane != NULL) { + p_pane->mPaneTree.appendChild(&mPaneTree); } - this->initiate(); - this->changeUseTrans(pane); - this->calcMtx(); + + initiate(); + changeUseTrans(p_pane); + calcMtx(); } /* 802F5E88-802F5F08 2F07C8 0080+00 0/0 3/3 0/0 .text __ct__7J2DPaneFUxRCQ29JGeometry8TBox2 */ -J2DPane::J2DPane(u64 infoTag, JGeometry::TBox2 const& box) +J2DPane::J2DPane(u64 infoTag, JGeometry::TBox2 const& bounds) : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; - this->initialize(infoTag, box); + initialize(infoTag, bounds); } /* 802F5F08-802F5F9C 2F0848 0094+00 1/1 0/0 0/0 .text * initialize__7J2DPaneFUxRCQ29JGeometry8TBox2 */ -void J2DPane::initialize(u64 tag, const JGeometry::TBox2& dim) { - id = 'PAN1'; +void J2DPane::initialize(u64 tag, const JGeometry::TBox2& bounds) { + mKind = 'PAN1'; mVisible = true; mInfoTag = tag; mUserInfoTag = 0; - mBounds.set(dim); + mBounds.set(bounds); initiate(); changeUseTrans(NULL); calcMtx(); @@ -92,83 +89,93 @@ void J2DPane::initialize(u64 tag, const JGeometry::TBox2& dim) { /* 802F5F9C-802F60C4 2F08DC 0128+00 0/0 1/1 0/0 .text * __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc */ -J2DPane::J2DPane(J2DPane* pane, JSURandomInputStream* inputStream, u8 isEx) : mPaneTree(this) { +J2DPane::J2DPane(J2DPane* p_pane, JSURandomInputStream* p_stream, u8 isEx) : mPaneTree(this) { mTransform = NULL; - if (isEx == 0) { - s32 position = inputStream->getPosition(); - s32 buf[2]; - inputStream->read(&buf, sizeof(buf)); - id = buf[0]; - position += buf[1]; - this->makePaneStream(pane, inputStream); - inputStream->seek(position, JSUStreamSeekFrom_SET); + if (!isEx) { + s32 position = p_stream->getPosition(); + + J2DPaneHeader header; + p_stream->read(&header, sizeof(header)); + mKind = header.mKind; + position += header.mSize; + makePaneStream(p_pane, p_stream); + p_stream->seek(position, JSUStreamSeekFrom_SET); } else { - s32 position = inputStream->getPosition(); - s32 buf[2]; - inputStream->peek(&buf, sizeof(buf)); - id = buf[0]; - position += buf[1]; - this->makePaneExStream(pane, inputStream); - inputStream->seek(position, JSUStreamSeekFrom_SET); + s32 position = p_stream->getPosition(); + + J2DPaneHeader header; + p_stream->peek(&header, sizeof(header)); + mKind = header.mKind; + position += header.mSize; + makePaneExStream(p_pane, p_stream); + p_stream->seek(position, JSUStreamSeekFrom_SET); } } /* 802F60C4-802F63F8 2F0A04 0334+00 1/1 3/3 0/0 .text * makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ -void J2DPane::makePaneStream(J2DPane* pane, JSURandomInputStream* inputStream) { +void J2DPane::makePaneStream(J2DPane* p_pane, JSURandomInputStream* p_stream) { u8 unk; - inputStream->read(&unk, 1); - inputStream->read(&mVisible, 1); - inputStream->skip(2); - mInfoTag = inputStream->read32b(); - f32 x0 = inputStream->readS16(); - f32 y0 = inputStream->readS16(); - f32 x1 = x0 + inputStream->readS16(); - f32 y1 = y0 + inputStream->readS16(); + p_stream->read(&unk, 1); + p_stream->read(&mVisible, 1); + p_stream->skip(2); + + mInfoTag = p_stream->read32b(); + + f32 x0 = p_stream->readS16(); + f32 y0 = p_stream->readS16(); + f32 x1 = x0 + p_stream->readS16(); + f32 y1 = y0 + p_stream->readS16(); mBounds.set(x0, y0, x1, y1); + unk -= 6; mRotateX = 0; mRotateY = 0; mRotateZ = 0; if (unk != 0) { - mRotateZ = inputStream->readU16(); + mRotateZ = p_stream->readU16(); unk--; } + if (unk != 0) { - mBasePosition = inputStream->readU8(); + mBasePosition = p_stream->readU8(); unk--; } else { mBasePosition = 0; } mRotAxis = ROTATE_Z; - mAlpha = 0xFF; + + mAlpha = 255; if (unk != 0) { - mAlpha = inputStream->readU8(); + mAlpha = p_stream->readU8(); unk--; } + mIsInfluencedAlpha = true; if (unk != 0) { - mIsInfluencedAlpha = inputStream->readU8(); + mIsInfluencedAlpha = p_stream->readU8(); unk--; } - inputStream->align(4); - if (pane != NULL) { - pane->mPaneTree.appendChild(&this->mPaneTree); + + p_stream->align(4); + if (p_pane != NULL) { + p_pane->mPaneTree.appendChild(&mPaneTree); } + mCullMode = GX_CULL_NONE; - mColorAlpha = 0xFF; + mColorAlpha = 255; mConnected = false; - _4 = 0xFFFF; + field_0x4 = 0xFFFF; mScaleX = 1; mScaleY = 1; mUserInfoTag = 0; - this->changeUseTrans(pane); - this->calcMtx(); + changeUseTrans(p_pane); + calcMtx(); } /* 802F63F8-802F658C 2F0D38 0194+00 4/4 0/0 0/0 .text changeUseTrans__7J2DPaneFP7J2DPane */ -void J2DPane::changeUseTrans(J2DPane* pane) { +void J2DPane::changeUseTrans(J2DPane* p_pane) { f32 xOffset = 0; f32 yOffset = 0; if (mBasePosition % 3 == 1) { @@ -176,27 +183,34 @@ void J2DPane::changeUseTrans(J2DPane* pane) { } else if (mBasePosition % 3 == 2) { xOffset = mBounds.getWidth(); } + if (mBasePosition / 3 == 1) { yOffset = mBounds.getHeight() / 2; } else if (mBasePosition / 3 == 2) { yOffset = mBounds.getHeight(); } + mTranslateX = mBounds.i.x + xOffset; mTranslateY = mBounds.i.y + yOffset; + mRotateOffsetX = xOffset; mRotateOffsetY = yOffset; - f32 f1 = -mTranslateX; - f32 f2 = -mTranslateY; - mBounds.addPos(f1, f2); - if (pane != NULL) { - u8 otherBasePos = pane->mBasePosition; - f32 width = pane->getWidth(); - f32 height = pane->getHeight(); + + f32 addX = -mTranslateX; + f32 addY = -mTranslateY; + mBounds.addPos(addX, addY); + + if (p_pane != NULL) { + u8 otherBasePos = p_pane->mBasePosition; + f32 width = p_pane->getWidth(); + f32 height = p_pane->getHeight(); + if (otherBasePos % 3 == 1) { mTranslateX -= width / 2; } else if (otherBasePos % 3 == 2) { mTranslateX -= width; } + if (otherBasePos / 3 == 1) { mTranslateY -= height / 2; } else if (otherBasePos / 3 == 2) { @@ -215,97 +229,107 @@ J2DPane::~J2DPane() { } /* 802F666C-802F6714 2F0FAC 00A8+00 0/0 2/2 0/0 .text appendChild__7J2DPaneFP7J2DPane */ -bool J2DPane::appendChild(J2DPane* pChild) { - if (pChild == NULL) +bool J2DPane::appendChild(J2DPane* p_child) { + if (p_child == NULL) return false; - const J2DPane* parent = pChild->getParentPane(); - bool result = mPaneTree.appendChild(&pChild->mPaneTree); + const J2DPane* parent = p_child->getParentPane(); + bool result = mPaneTree.appendChild(&p_child->mPaneTree); if (result && parent == NULL) { - pChild->add(mBounds.i.x, mBounds.i.y); - pChild->calcMtx(); + p_child->add(mBounds.i.x, mBounds.i.y); + p_child->calcMtx(); } return result; } /* 802F6714-802F67E0 2F1054 00CC+00 0/0 1/1 0/0 .text insertChild__7J2DPaneFP7J2DPaneP7J2DPane */ -bool J2DPane::insertChild(J2DPane* before, J2DPane* child) { - if (child == NULL) +bool J2DPane::insertChild(J2DPane* p_prev, J2DPane* p_child) { + if (p_child == NULL) return false; - const J2DPane* parent = child->getParentPane(); + const J2DPane* parent = p_child->getParentPane(); bool result = - mPaneTree.insertChild(before != NULL ? &before->mPaneTree : NULL, &child->mPaneTree); + mPaneTree.insertChild(p_prev != NULL ? &p_prev->mPaneTree : NULL, &p_child->mPaneTree); if (result && parent == NULL) { - child->add(mBounds.i.x, mBounds.i.y); - child->calcMtx(); + p_child->add(mBounds.i.x, mBounds.i.y); + p_child->calcMtx(); } return result; } /* 802F67E0-802F6D18 2F1120 0538+00 0/0 1/1 0/0 .text draw__7J2DPaneFffPC14J2DGrafContextbb */ -void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* grafCtx, bool isOrthoGraf, bool param_4) { +void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGraf, bool param_4) { bool unkBool = param_4 && mVisible; - if (grafCtx->getGrafType() != 1) { + if (p_grafCtx->getGrafType() != 1) { isOrthoGraf = false; } + JSUTree* parentTree = mPaneTree.getParent(); J2DPane* parent = NULL; if (parentTree != NULL) { parent = parentTree->getObject(); } + if (mBounds.isValid()) { mGlobalBounds = mBounds; - f32 tX = mTranslateX; - f32 tY = mTranslateY; - mGlobalBounds.addPos(tX, tY); + + f32 addX = mTranslateX; + f32 addY = mTranslateY; + mGlobalBounds.addPos(addX, addY); + if (unkBool) { mClipRect = mBounds; - this->rewriteAlpha(); + rewriteAlpha(); } + if (parent != NULL) { f32 width = parent->mGlobalBounds.i.x - parent->mBounds.i.x; f32 height = parent->mGlobalBounds.i.y - parent->mBounds.i.y; mGlobalBounds.addPos(width, height); - PSMTXConcat(parent->mGlobalMtx, this->mPositionMtx, this->mGlobalMtx); + PSMTXConcat(parent->mGlobalMtx, mPositionMtx, mGlobalMtx); + if (unkBool) { if (isOrthoGraf) { mClipRect = mGlobalBounds; mClipRect.intersect(parent->mClipRect); } + mColorAlpha = mAlpha; if (mIsInfluencedAlpha) { - mColorAlpha = (mAlpha * parent->mColorAlpha) / 0xFF; + mColorAlpha = (mAlpha * parent->mColorAlpha) / 255; } } } else { mGlobalBounds.addPos(x, y); - this->makeMatrix(mTranslateX + x, mTranslateY + y); + makeMatrix(mTranslateX + x, mTranslateY + y); PSMTXCopy(mPositionMtx, mGlobalMtx); mClipRect = mGlobalBounds; mColorAlpha = mAlpha; } + JGeometry::TBox2 scissorBounds(0, 0, 0, 0); if (unkBool && isOrthoGraf) { - ((J2DOrthoGraph*)grafCtx)->scissorBounds(&scissorBounds, &mClipRect); + ((J2DOrthoGraph*)p_grafCtx)->scissorBounds(&scissorBounds, &mClipRect); } + if (unkBool && (mClipRect.isValid() || !isOrthoGraf)) { - J2DGrafContext tmpGraf(*grafCtx); + J2DGrafContext tmpGraf(*p_grafCtx); if (isOrthoGraf) { tmpGraf.scissor(scissorBounds); tmpGraf.setScissor(); } GXSetCullMode((GXCullMode)mCullMode); - this->drawSelf(x, y, &tmpGraf.mPosMtx); + drawSelf(x, y, &tmpGraf.mPosMtx); } + JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - iter.getObject()->draw(0, 0, grafCtx, isOrthoGraf, unkBool); + iter.getObject()->draw(0, 0, p_grafCtx, isOrthoGraf, unkBool); } } } @@ -313,6 +337,7 @@ void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* grafCtx, bool isOrthoGraf /* 802F6D18-802F6F60 2F1658 0248+00 2/2 4/4 0/0 .text place__7J2DPaneFRCQ29JGeometry8TBox2 */ void J2DPane::place(JGeometry::TBox2 const& box) { JGeometry::TBox2 tmpBox; + if (mBounds.i.x == 0) { tmpBox.i.x = 0; tmpBox.f.x = box.getWidth(); @@ -326,6 +351,7 @@ void J2DPane::place(JGeometry::TBox2 const& box) { tmpBox.f.x = box.getWidth() / 2; mTranslateX = (box.i.x + box.f.x) / 2; } + if (mBounds.i.y == 0) { tmpBox.i.y = 0; tmpBox.f.y = box.getHeight(); @@ -339,23 +365,24 @@ void J2DPane::place(JGeometry::TBox2 const& box) { tmpBox.f.y = box.getHeight() / 2; mTranslateY = (box.i.y + box.f.y) / 2; } + f32 xOff = tmpBox.i.x - mBounds.i.x; f32 yOff = tmpBox.i.y - mBounds.i.y; - for (J2DPane* childPane = this->getFirstChildPane(); childPane != NULL; - childPane = childPane->getNextChildPane()) { - childPane->mTranslateX += xOff; - childPane->mTranslateY += yOff; + for (J2DPane* child = getFirstChildPane(); child != NULL; child = child->getNextChildPane()) { + child->mTranslateX += xOff; + child->mTranslateY += yOff; if (xOff != 0 || yOff != 0) { - childPane->calcMtx(); + child->calcMtx(); } } mBounds = tmpBox; - J2DPane* parent = this->getParentPane(); + + J2DPane* parent = getParentPane(); if (parent != NULL) { mTranslateX += parent->mBounds.i.x; mTranslateY += parent->mBounds.i.y; } - this->calcMtx(); + calcMtx(); } /* 802F6F60-802F6FB4 2F18A0 0054+00 1/0 7/0 0/0 .text move__7J2DPaneFff */ @@ -438,8 +465,8 @@ void J2DPane::rotate(f32 angle) { } /* 802F7264-802F72E0 2F1BA4 007C+00 0/0 2/2 0/0 .text clip__7J2DPaneFRCQ29JGeometry8TBox2 */ -void J2DPane::clip(JGeometry::TBox2 const& box) { - JGeometry::TBox2 boxA(box); +void J2DPane::clip(JGeometry::TBox2 const& bounds) { + JGeometry::TBox2 boxA(bounds); JGeometry::TBox2 boxB(mGlobalBounds); boxA.addPos(boxB.i); mClipRect.intersect(boxA); @@ -476,20 +503,20 @@ J2DPane* J2DPane::searchUserInfo(u64 tag) { } /* 802F7430-802F74B8 2F1D70 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResTIMG */ -bool J2DPane::isUsed(const ResTIMG* timg) { +bool J2DPane::isUsed(const ResTIMG* p_timg) { JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - if (iter.getObject()->isUsed(timg)) + if (iter.getObject()->isUsed(p_timg)) return true; } return false; } /* 802F74B8-802F7540 2F1DF8 0088+00 1/0 7/7 0/0 .text isUsed__7J2DPaneFPC7ResFONT */ -bool J2DPane::isUsed(const ResFONT* font) { +bool J2DPane::isUsed(const ResFONT* p_font) { JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - if (iter.getObject()->isUsed(font)) + if (iter.getObject()->isUsed(p_font)) return true; } return false; @@ -501,9 +528,9 @@ void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { f32 tmpY = mRotateOffsetY - param_3; Mtx rotX, rotY, rotZ, rotMtx, mtx, tmp; PSMTXTrans(mtx, -tmpX, -tmpY, 0); - PSMTXRotRad(rotX, 'x', 0.01745329238474369f * mRotateX); - PSMTXRotRad(rotY, 'y', 0.01745329238474369f * mRotateY); - PSMTXRotRad(rotZ, 'z', 0.01745329238474369f * -mRotateZ); + PSMTXRotRad(rotX, 'x', DEG_TO_RAD(mRotateX)); + PSMTXRotRad(rotY, 'y', DEG_TO_RAD(mRotateY)); + PSMTXRotRad(rotZ, 'z', DEG_TO_RAD(-mRotateZ)); PSMTXConcat(rotZ, rotX, tmp); PSMTXConcat(rotY, tmp, rotMtx); PSMTXScaleApply(mtx, mPositionMtx, mScaleX, mScaleY, 1); @@ -513,7 +540,7 @@ void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { /* 802F7680-802F76F8 2F1FC0 0078+00 1/0 7/3 0/0 .text setCullBack__7J2DPaneF11_GXCullMode */ -void J2DPane::setCullBack(_GXCullMode mode) { +void J2DPane::setCullBack(GXCullMode mode) { mCullMode = mode; JSUTreeIterator iter; @@ -551,10 +578,11 @@ void J2DPane::setBasePosition(J2DBasePosition position) { } /* 802F77D0-802F79A8 2F2110 01D8+00 0/0 1/1 0/0 .text setInfluencedAlpha__7J2DPaneFbb */ -void J2DPane::setInfluencedAlpha(bool param_0, bool param_1) { - if (param_1 && mIsInfluencedAlpha != param_0) { - J2DPane* parent = this->getParentPane(); +void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) { + if (param_1 && mIsInfluencedAlpha != influencedAlpha) { + J2DPane* parent = getParentPane(); u8 alpha = 255; + for (; parent != NULL; parent = parent->getParentPane()) { if (parent->getAlpha() == 0) { alpha = 0; @@ -565,24 +593,27 @@ void J2DPane::setInfluencedAlpha(bool param_0, bool param_1) { break; } } - if (param_0) { + + if (influencedAlpha) { if (alpha == 0) { - this->setAlpha(0); + setAlpha(0); } else { f32 fAlpha = ((f32)mAlpha) / alpha * 255; + u8 alpha; if (fAlpha > 255) { alpha = 255; } else { alpha = fAlpha; } - this->setAlpha(alpha); + setAlpha(alpha); } } else { - this->setAlpha((f32)(alpha * mAlpha) / 255); + setAlpha((f32)(alpha * mAlpha) / 255); } } - mIsInfluencedAlpha = param_0; + + mIsInfluencedAlpha = influencedAlpha; } /* 802F79A8-802F7A8C 2F22E8 00E4+00 0/0 3/3 0/0 .text getGlbVtx__7J2DPaneCFUc */ @@ -600,11 +631,13 @@ JGeometry::TVec3 J2DPane::getGlbVtx(u8 param_0) const { } else { x = mBounds.i.x; } + if (param_0 & 2) { y = mBounds.f.y; } else { y = mBounds.i.y; } + out.x = x * mGlobalMtx[0][0] + y * mGlobalMtx[0][1] + mGlobalMtx[0][3]; out.y = x * mGlobalMtx[1][0] + y * mGlobalMtx[1][1] + mGlobalMtx[1][3]; out.z = x * mGlobalMtx[2][0] + y * mGlobalMtx[2][1] + mGlobalMtx[2][3]; @@ -636,70 +669,78 @@ J2DPane* J2DPane::getParentPane() { return getPaneTree()->getParent()->getObject(); } -struct J2DPaneInit { /* name unknown */ - u8 field_0x0[10]; - u16 field_0xa; - u8 isVisible; - u8 mBasePosition; - // padding - u64 mInfoTag; - u64 mUserInfoTag; - f32 rotationOffsetX; - f32 rotationOffsetY; - f32 scaleX; - f32 scaleY; - f32 rotXDegrees; - f32 rotYDegrees; - f32 rotZDegrees; - f32 translateX; - f32 translateY; - u8 field_0x44[4]; -}; +/* name unknown */ +struct J2DPaneInfo { + /* 0x00 */ u32 mKind; + /* 0x04 */ u32 mSize; + /* 0x08 */ u16 field_0x8; + /* 0x0A */ u16 field_0xa; + /* 0x0B */ u8 mVisible; + /* 0x0C */ u8 mBasePosition; + /* 0x10 */ u64 mInfoTag; + /* 0x18 */ u64 mUserInfoTag; + /* 0x20 */ f32 mRotOffsetX; + /* 0x24 */ f32 mRotOffsetY; + /* 0x28 */ f32 mScaleX; + /* 0x2C */ f32 mScaleY; + /* 0x30 */ f32 mRotateX; + /* 0x34 */ f32 mRotateY; + /* 0x38 */ f32 mRotateZ; + /* 0x3C */ f32 mTranslateX; + /* 0x40 */ f32 mTranslateY; +}; // Size: 0x48 /* 802F7B18-802F7D00 2F2458 01E8+00 1/1 6/6 0/0 .text * makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ -void J2DPane::makePaneExStream(J2DPane* parent, JSURandomInputStream* stream) { - stream->getPosition(); - J2DPaneInit data; - stream->read(&data, sizeof(data)); - _4 = data.field_0xa; - mVisible = !!data.isVisible; +void J2DPane::makePaneExStream(J2DPane* p_parent, JSURandomInputStream* p_stream) { + p_stream->getPosition(); + + J2DPaneInfo data; + p_stream->read(&data, sizeof(data)); + field_0x4 = data.field_0xa; + mVisible = !!data.mVisible; mInfoTag = data.mInfoTag; mUserInfoTag = data.mUserInfoTag; - mScaleX = data.scaleX; - mScaleY = data.scaleY; - mRotateX = data.rotXDegrees; - mRotateY = data.rotYDegrees; - mRotateZ = data.rotZDegrees; - mTranslateX = data.translateX; - mTranslateY = data.translateY; + mScaleX = data.mScaleX; + mScaleY = data.mScaleY; + mRotateX = data.mRotateX; + mRotateY = data.mRotateY; + mRotateZ = data.mRotateZ; + mTranslateX = data.mTranslateX; + mTranslateY = data.mTranslateY; mRotAxis = ROTATE_Z; + if (data.mBasePosition % 3 == 0) { mRotateOffsetX = 0; } else if (data.mBasePosition % 3 == 1) { - mRotateOffsetX = data.rotationOffsetX / 2; + mRotateOffsetX = data.mRotOffsetX / 2; } else { - mRotateOffsetX = data.rotationOffsetX; + mRotateOffsetX = data.mRotOffsetX; } + if (data.mBasePosition / 3 == 0) { mRotateOffsetY = 0; } else if (data.mBasePosition / 3 == 1) { - mRotateOffsetY = data.rotationOffsetY / 2; + mRotateOffsetY = data.mRotOffsetY / 2; } else { - mRotateOffsetY = data.rotationOffsetY; + mRotateOffsetY = data.mRotOffsetY; } - mBounds.set(-mRotateOffsetX, -mRotateOffsetY, data.rotationOffsetX - mRotateOffsetX, - data.rotationOffsetY - mRotateOffsetY); + + mBounds.set(-mRotateOffsetX, -mRotateOffsetY, data.mRotOffsetX - mRotateOffsetX, + data.mRotOffsetY - mRotateOffsetY); mBasePosition = data.mBasePosition; + mAlpha = 255; mIsInfluencedAlpha = false; - if (parent != NULL) { - parent->mPaneTree.appendChild(&this->mPaneTree); + + if (p_parent != NULL) { + p_parent->mPaneTree.appendChild(&mPaneTree); } + mCullMode = GX_CULL_NONE; mColorAlpha = 255; mConnected = false; - this->calcMtx(); + calcMtx(); } /* 802F7D00-802F7DB8 2F2640 00B8+00 0/0 1/1 0/0 .text J2DCast_F32_to_S16__7J2DPaneFfUc */ @@ -729,71 +770,73 @@ s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) { /* 802F7DB8-802F7EF4 2F26F8 013C+00 0/0 3/3 0/0 .text * getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive */ -void* J2DPane::getPointer(JSURandomInputStream* inputStream, u32 param_1, JKRArchive* archive) { +void* J2DPane::getPointer(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { JUTResReference resRef; - void* result; - if (archive == NULL) { + + void* pointer; + if (p_archive == NULL) { if (J2DScreen::getDataManage() == NULL) { - result = resRef.getResource(inputStream, param_1, NULL); + pointer = resRef.getResource(p_stream, param_1, NULL); } else { - s32 prevPos = inputStream->getPosition(); - result = resRef.getResource(inputStream, param_1, NULL); - if (result == 0) { - inputStream->seek(prevPos, JSUStreamSeekFrom_SET); - result = J2DScreen::getDataManage()->get(inputStream); + s32 prevPos = p_stream->getPosition(); + pointer = resRef.getResource(p_stream, param_1, NULL); + if (pointer == NULL) { + p_stream->seek(prevPos, JSUStreamSeekFrom_SET); + pointer = J2DScreen::getDataManage()->get(p_stream); } } } else { - s32 prevPos = inputStream->getPosition(); - result = resRef.getResource(inputStream, param_1, archive); - if (result == NULL) { - inputStream->seek(prevPos, JSUStreamSeekFrom_SET); - result = resRef.getResource(inputStream, param_1, NULL); + s32 prevPos = p_stream->getPosition(); + pointer = resRef.getResource(p_stream, param_1, p_archive); + if (pointer == NULL) { + p_stream->seek(prevPos, JSUStreamSeekFrom_SET); + pointer = resRef.getResource(p_stream, param_1, NULL); } - if (result == NULL) { + + if (pointer == NULL) { if (J2DScreen::getDataManage() != NULL) { - inputStream->seek(prevPos, JSUStreamSeekFrom_SET); - result = J2DScreen::getDataManage()->get(inputStream); + p_stream->seek(prevPos, JSUStreamSeekFrom_SET); + pointer = J2DScreen::getDataManage()->get(p_stream); } } } - return result; + return pointer; } /* 802F7EF4-802F7FC4 2F2834 00D0+00 2/0 7/4 0/0 .text setAnimation__7J2DPaneFP10J2DAnmBase */ -void J2DPane::setAnimation(J2DAnmBase* anm) { - if (anm != NULL) { - switch (anm->getKind()) { +void J2DPane::setAnimation(J2DAnmBase* p_anm) { + if (p_anm != NULL) { + switch (p_anm->getKind()) { default: break; - case 0: - setAnimation(static_cast(anm)); + case KIND_TRANSFORM: + setAnimation(static_cast(p_anm)); break; - case 1: - setAnimation(static_cast(anm)); + case KIND_COLOR: + setAnimation(static_cast(p_anm)); break; - case 7: - setAnimation(static_cast(anm)); + case KIND_VTX_COLOR: + setAnimation(static_cast(p_anm)); break; - case 4: - setAnimation(static_cast(anm)); + case KIND_TEXTURE_SRT: + setAnimation(static_cast(p_anm)); break; - case 2: - setAnimation(static_cast(anm)); + case KIND_TEX_PATTERN: + setAnimation(static_cast(p_anm)); break; - case 6: - setAnimation(static_cast(anm)); + case KIND_VISIBILITY: + setAnimation(static_cast(p_anm)); break; - case 5: - setAnimation(static_cast(anm)); + case KIND_TEV_REG: + setAnimation(static_cast(p_anm)); break; } } } /* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */ -void J2DPane::setAnimation(J2DAnmTransform* anm) { - mTransform = anm; +void J2DPane::setAnimation(J2DAnmTransform* p_anm) { + mTransform = p_anm; } /* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text animationTransform__7J2DPaneFv */ @@ -815,8 +858,8 @@ void J2DPane::clearAnmTransform() { /* 802F8080-802F8118 2F29C0 0098+00 1/0 7/0 0/0 .text * animationTransform__7J2DPaneFPC15J2DAnmTransform */ -const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* transform) { - const J2DAnmTransform* p = transform; +const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* p_transform) { + const J2DAnmTransform* p = p_transform; if (mTransform != NULL) p = mTransform; @@ -831,30 +874,30 @@ const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* transf /* 802F8118-802F81A0 2F2A58 0088+00 1/0 8/1 0/0 .text * setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull */ -void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* visibility) { - setAnimationVF(visibility); +void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* p_visibility) { + setAnimationVF(p_visibility); JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - iter.getObject()->setVisibileAnimation(visibility); + iter.getObject()->setVisibileAnimation(p_visibility); } } /* 802F81A0-802F8228 2F2AE0 0088+00 1/0 8/1 0/0 .text * setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor */ -void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* vtx_color) { - setAnimationVC(vtx_color); +void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* p_vtxColor) { + setAnimationVC(p_vtxColor); JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - iter.getObject()->setVtxColorAnimation(vtx_color); + iter.getObject()->setVtxColorAnimation(p_vtxColor); } } /* 802F8228-802F82C0 2F2B68 0098+00 1/0 7/3 0/0 .text animationPane__7J2DPaneFPC15J2DAnmTransform */ -const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* transform) { - const J2DAnmTransform* p = transform; +const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* p_transform) { + const J2DAnmTransform* p = p_transform; if (mTransform != NULL) p = mTransform; @@ -869,10 +912,10 @@ const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* transform) /* 802F82C0-802F83C8 2F2C00 0108+00 2/2 0/0 0/0 .text * updateTransform__7J2DPaneFPC15J2DAnmTransform */ -void J2DPane::updateTransform(J2DAnmTransform const* anmTransform) { - if (_4 != 0xFFFF && anmTransform != NULL) { +void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) { + if (field_0x4 != 0xFFFF && p_anmTransform != NULL) { J3DTransformInfo info; - anmTransform->getTransform(_4, &info); + p_anmTransform->getTransform(field_0x4, &info); mScaleX = info.mScale.x; mScaleY = info.mScale.z; mRotateX = (u16)info.mRotation.x * 360.0f / 65535.0f; @@ -880,12 +923,12 @@ void J2DPane::updateTransform(J2DAnmTransform const* anmTransform) { mRotateZ = (u16)info.mRotation.y * 360.0f / 65535.0f; mTranslateX = info.mTranslate.x; mTranslateY = info.mTranslate.z; - this->calcMtx(); + calcMtx(); } } /* 802F83C8-802F83CC 2F2D08 0004+00 1/0 0/0 0/0 .text drawSelf__7J2DPaneFffPA3_A4_f */ -void J2DPane::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { +void J2DPane::drawSelf(f32, f32, f32 (*)[3][4]) { /* empty function */ } @@ -896,14 +939,14 @@ void J2DPane::rewriteAlpha() { /* 802F83D0-802F83FC 2F2D10 002C+00 1/0 6/0 0/0 .text * setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull */ -void J2DPane::setAnimationVF(J2DAnmVisibilityFull* visibility) { - setAnimation(visibility); +void J2DPane::setAnimationVF(J2DAnmVisibilityFull* p_visibility) { + setAnimation(p_visibility); } /* 802F83FC-802F8428 2F2D3C 002C+00 1/0 6/0 0/0 .text setAnimationVC__7J2DPaneFP14J2DAnmVtxColor */ -void J2DPane::setAnimationVC(J2DAnmVtxColor* vtx_color) { - setAnimation(vtx_color); +void J2DPane::setAnimationVC(J2DAnmVtxColor* p_vtxColor) { + setAnimation(p_vtxColor); } /* 802F8428-802F8464 2F2D68 003C+00 1/0 4/0 0/0 .text setCullBack__7J2DPaneFb */ @@ -930,6 +973,6 @@ void J2DPane::update() { } /* 802F8478-802F847C 2F2DB8 0004+00 1/0 1/0 0/0 .text drawSelf__7J2DPaneFff */ -void J2DPane::drawSelf(f32 param_0, f32 param_1) { +void J2DPane::drawSelf(f32, f32) { /* empty function */ } diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index 0b8507bf27c..b74dba0716b 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -274,6 +274,13 @@ asm J2DPicture::J2DPicture() { /* 802FC118-802FC1D4 2F6A58 00BC+00 0/0 1/1 0/0 .text * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ +#ifdef NONMATCHING +J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive) + : field_0x10a(), field_0x12c(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + field_0x14c() { + private_readStream(p_pane, p_stream, p_archive); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -282,6 +289,7 @@ asm J2DPicture::J2DPicture(J2DPane* param_0, JSURandomInputStream* param_1, JKRA #include "asm/JSystem/J2DGraph/J2DPicture/__ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80456260-80456268 004860 0008+00 1/1 0/0 0/0 .sdata2 @1739 */ @@ -289,6 +297,111 @@ SECTION_SDATA2 static f64 lit_1739 = 4503599627370496.0 /* cast u32 to float */; /* 802FC1D4-802FC708 2F6B14 0534+00 0/0 1/1 0/0 .text * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */ +#ifdef NONMATCHING +J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, J2DMaterial* p_material) + : field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + field_0x14c() { + int position = p_stream->getPosition(); + + J2DPicHeader header; + p_stream->read(&header, sizeof(header)); + mKind = 'PIC1'; + + int position2 = p_stream->getPosition(); + + J2DPaneHeader panHeader; + p_stream->peek(&panHeader, sizeof(panHeader)); + p_pane->makePaneExStream(p_pane, p_stream); + p_stream->seek(position2 + panHeader.mSize, JSUStreamSeekFrom_SET); + + J2DScrnBlockPictureParameter picInfo; + p_stream->read(&picInfo, sizeof(picInfo)); + u16 matNum = picInfo.field_0x4; + + for (int i = 0; i < 4; i++) { + field_0x10a[i] = picInfo.field_0x10[i]; + mCornerColor[i] = picInfo.mCornerColor[i]; + } + + p_stream->seek(position + header.mSize, JSUStreamSeekFrom_SET); + + J2DMaterial* material = NULL; + if (matNum != 0xFFFF) { + material = &p_material[matNum]; + } + + mAlpha = 255; + if (material != NULL) { + mAlpha = material->getColorBlock()->getMatColor(0)->a; + } + + mBlack = JUtility::TColor(0); + mWhite = JUtility::TColor(0xFFFFFFFF); + mTextureCount = 0; + + if (material != NULL && material->getTevBlock() != NULL) { + u8 texgenNum = material->getTexGenBlock()->getTexGenNum(); + u32 stageNum = material->getTevBlock()->getTevStageNum(); + + if ((texgenNum == 1 && stageNum != 1) || (texgenNum != 1 && (int)stageNum != texgenNum + 1)) { + J2DGXColorS10* color0p = material->getTevBlock()->getTevColor(0); + GXColorS10 color0; + color0.r = color0p->r; + color0.g = color0p->g; + color0.b = color0p->b; + color0.a = color0p->a; + + J2DGXColorS10* color1p = material->getTevBlock()->getTevColor(1); + GXColorS10 color1; + color1.r = color1p->r; + color1.g = color1p->g; + color1.b = color1p->b; + color1.a = color1p->a; + + mBlack = JUtility::TColor(((u8)color0.r << 0x18) | ((u8)color0.g << 0x10) | + ((u8)color0.b << 8) | (u8)color0.a); + mWhite = JUtility::TColor(((u8)color1.r << 0x18) | ((u8)color1.g << 0x10) | + ((u8)color1.b << 8) | (u8)color1.a); + } + + if (texgenNum <= 2) { + texgenNum = 2; + } + mTextureCount = texgenNum; + } + + field_0x109 = 0; + + for (u32 i = 0; i < 2; i++) { + mTexture[i] = NULL; + + if (material != NULL && material->getTevBlock() != NULL) { + JUTTexture* tex = material->getTevBlock()->getTexture(i); + + if (tex != NULL) { + mTexture[i] = tex; + field_0x109 |= (1 << i); + } + } + } + + if (material != NULL && material->getTevBlock() != NULL) { + material->getTevBlock()->setUndeleteFlag(0xF0); + } + + mPalette = NULL; + + JUtility::TColor color(0xFFFFFFFF); + JUtility::TColor alpha(0xFFFFFFFF); + if (material != NULL && material->getTevBlock() != NULL) { + color = *material->getTevBlock()->getTevKColor(3); + alpha = *material->getTevBlock()->getTevKColor(1); + } + + setBlendColorRatio(color.a, color.b); + setBlendAlphaRatio(alpha.a, alpha.b); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -297,12 +410,31 @@ asm J2DPicture::J2DPicture(J2DPane* param_0, JSURandomInputStream* param_1, J2DM #include "asm/JSystem/J2DGraph/J2DPicture/__ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80456268-8045626C 004868 0004+00 9/9 0/0 0/0 .sdata2 @1767 */ SECTION_SDATA2 static f32 lit_1767 = 1.0f; /* 802FC708-802FC800 2F7048 00F8+00 0/0 20/20 1/1 .text __ct__10J2DPictureFPC7ResTIMG */ +#ifdef NONMATCHING +J2DPicture::J2DPicture(ResTIMG const* p_timg) + : field_0x10a(), mWhite(), mBlack(), mCornerColor(), field_0x148(), + field_0x14c() { + for (int i = 0; i < 2; i++) { + mTexture[i] = NULL; + } + + field_0x109 = 0; + mTextureCount = 0; + + if (p_timg != NULL) { + append(p_timg, 1.0f); + } + mPalette = NULL; + initinfo(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -311,9 +443,26 @@ asm J2DPicture::J2DPicture(ResTIMG const* param_0) { #include "asm/JSystem/J2DGraph/J2DPicture/__ct__10J2DPictureFPC7ResTIMG.s" } #pragma pop +#endif /* 802FC800-802FC8E8 2F7140 00E8+00 0/0 5/5 0/0 .text * __ct__10J2DPictureFUxRCQ29JGeometry8TBox2PC7ResTIMGPC7ResTLUT */ +#ifdef NONMATCHING +J2DPicture::J2DPicture(u64 tag, JGeometry::TBox2 const& bounds, + ResTIMG const* p_timg, ResTLUT const* p_tlut) + : J2DPane(tag, bounds), field_0x10a(), mPalette(NULL), mWhite(), mBlack(), mCornerColor(), field_0x148(), + field_0x14c() { + for (int i = 0; i < 2; i++) { + mTexture[i] = NULL; + } + + field_0x109 = 0; + mTextureCount = 0; + + private_initiate(p_timg, p_tlut); + initinfo(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -323,6 +472,7 @@ asm J2DPicture::J2DPicture(u64 param_0, JGeometry::TBox2 const& param_1, #include "asm/JSystem/J2DGraph/J2DPicture/func_802FC800.s" } #pragma pop +#endif /* 802FC8E8-802FCCDC 2F7228 03F4+00 1/1 0/0 0/0 .text * private_readStream__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ @@ -374,7 +524,7 @@ asm void J2DPicture::private_initiate(ResTIMG const* param_0, ResTLUT const* par // matches with real literal #ifdef NONMATCHING void J2DPicture::initinfo() { - id = 'PIC1'; + mKind = 'PIC1'; setTexCoord(NULL, BIND15, MIRROR0, false); setBlendRatio(lit_1767, lit_1767); @@ -400,7 +550,7 @@ J2DPicture::~J2DPicture() { delete mTexture[i]; } } - delete field_0x12c; + delete mPalette; } /* 802FD098-802FD168 2F79D8 00D0+00 1/0 0/0 0/0 .text prepareTexture__10J2DPictureFUc */ diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index 722443fe813..bb60ce1778d 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -210,7 +210,7 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { #ifdef NONMATCHING J2DScreen::J2DScreen() : J2DPane(NULL, true, 'root', JGeometry::TBox2(0.0f, 0.0f, 0.0f, 0.0f)), mColor() { - _4 = -1; + field_0x4 = -1; mScissor = false; mMaterialNum = 0; mMaterials = NULL; @@ -255,61 +255,50 @@ void J2DScreen::clean() { /* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive */ -#ifdef NONMATCHING -bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* archive) { - if (archive == NULL) { +bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* p_archive) { + if (p_archive == NULL) { return false; } - void* res = JKRFileLoader::getGlbResource(resName, archive); + void* res = JKRFileLoader::getGlbResource(resName, p_archive); if (res != NULL) { - u32 size = archive->getExpandedResSize(res); + u32 size = p_archive->getExpandedResSize(res); JSUMemoryInputStream stream(res, size); - return setPriority(&stream, param_1, archive); + return setPriority(&stream, param_1, p_archive); } return false; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s" -} -#pragma pop -#endif /* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ -bool J2DScreen::setPriority(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) { - if (archive == NULL) { +bool J2DScreen::setPriority(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { + if (p_archive == NULL) { return false; } else { - return private_set(stream, param_1, archive); + return private_set(p_stream, param_1, p_archive); } } /* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ -bool J2DScreen::private_set(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) { - if (!checkSignature(stream)) { +bool J2DScreen::private_set(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { + if (!checkSignature(p_stream)) { return false; } - if (!getScreenInformation(stream)) { + if (!getScreenInformation(p_stream)) { return false; } - bool make_end = makeHierarchyPanes(this, stream, param_1, archive) != 2; + bool make_end = makeHierarchyPanes(this, p_stream, param_1, p_archive) != 2; if (!(param_1 & 0x1F0000)) { clean(); } if (make_end) { - return stream->isGood(); + return p_stream->isGood(); } return false; @@ -317,9 +306,9 @@ bool J2DScreen::private_set(JSURandomInputStream* stream, u32 param_1, JKRArchiv /* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text * checkSignature__9J2DScreenFP20JSURandomInputStream */ -bool J2DScreen::checkSignature(JSURandomInputStream* stream) { +bool J2DScreen::checkSignature(JSURandomInputStream* p_stream) { J2DScrnHeader header; - stream->read(&header, 32); + p_stream->read(&header, sizeof(J2DScrnHeader)); if (header.mTag != 'SCRN' || (header.mType != 'blo1' && header.mType != 'blo2')) { return false; @@ -330,9 +319,9 @@ bool J2DScreen::checkSignature(JSURandomInputStream* stream) { /* 802F8894-802F8990 2F31D4 00FC+00 1/1 0/0 0/0 .text * getScreenInformation__9J2DScreenFP20JSURandomInputStream */ -bool J2DScreen::getScreenInformation(JSURandomInputStream* stream) { +bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) { J2DScrnInfoHeader info; - stream->read(&info, sizeof(J2DScrnInfoHeader)); + p_stream->read(&info, sizeof(J2DScrnInfoHeader)); if (info.mTag != 'INF1') { return false; @@ -346,7 +335,7 @@ bool J2DScreen::getScreenInformation(JSURandomInputStream* stream) { mColor = color; if (info.mSize > 0x10) { - stream->skip(info.mSize - 0x10); + p_stream->skip(info.mSize - 0x10); } return true; @@ -355,32 +344,32 @@ bool J2DScreen::getScreenInformation(JSURandomInputStream* stream) { /* 802F8990-802F8B98 2F32D0 0208+00 1/1 0/0 0/0 .text * makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive */ // goto can probably be replaced -s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* stream, u32 param_2, - JKRArchive* archive) { +s32 J2DScreen::makeHierarchyPanes(J2DPane* p_basePane, JSURandomInputStream* p_stream, u32 param_2, + JKRArchive* p_archive) { J2DScrnBlockHeader header; - J2DPane* next_pane = basePane; + J2DPane* next_pane = p_basePane; do { loop: - stream->peek(&header, sizeof(J2DScrnBlockHeader)); + p_stream->peek(&header, sizeof(J2DScrnBlockHeader)); switch (header.mTag) { case 'EXT1': - stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + p_stream->seek(header.mSize, JSUStreamSeekFrom_CUR); return 1; case 'BGN1': - stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + p_stream->seek(header.mSize, JSUStreamSeekFrom_CUR); - int ret = makeHierarchyPanes(next_pane, stream, param_2, archive); + int ret = makeHierarchyPanes(next_pane, p_stream, param_2, p_archive); if (ret == 0) { goto loop; } return ret; case 'END1': - stream->seek(header.mSize, JSUStreamSeekFrom_CUR); + p_stream->seek(header.mSize, JSUStreamSeekFrom_CUR); return 0; case 'TEX1': - J2DResReference* texRes = getResReference(stream, param_2); + J2DResReference* texRes = getResReference(p_stream, param_2); mTexRes = texRes; if (texRes != NULL) { @@ -388,7 +377,7 @@ s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* strea } return 2; case 'FNT1': - J2DResReference* fntRes = getResReference(stream, param_2); + J2DResReference* fntRes = getResReference(p_stream, param_2); mFontRes = fntRes; if (fntRes != NULL) { @@ -396,16 +385,16 @@ s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* strea } return 2; case 'MAT1': - if (createMaterial(stream, param_2, archive)) { + if (createMaterial(p_stream, param_2, p_archive)) { goto loop; } return 2; } - if (archive == NULL) { - next_pane = createPane(header, stream, basePane, param_2); + if (p_archive == NULL) { + next_pane = createPane(header, p_stream, p_basePane, param_2); } else { - next_pane = createPane(header, stream, basePane, param_2, archive); + next_pane = createPane(header, p_stream, p_basePane, param_2, p_archive); } } while (next_pane != NULL); @@ -414,54 +403,54 @@ s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* strea /* 802F8B98-802F8ED4 2F34D8 033C+00 1/0 0/0 0/0 .text * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive */ -J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream, - J2DPane* basePane, u32 param_3, JKRArchive* archive) { +J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream, + J2DPane* p_basePane, u32 param_3, JKRArchive* p_archive) { J2DPane* newPane; switch (header.mTag) { case 'PAN1': - newPane = new J2DPane(basePane, stream, 0); + newPane = new J2DPane(p_basePane, p_stream, 0); break; case 'WIN1': - newPane = new J2DWindow(basePane, stream, archive); + newPane = new J2DWindow(p_basePane, p_stream, p_archive); break; case 'PIC1': - newPane = new J2DPicture(basePane, stream, archive); + newPane = new J2DPicture(p_basePane, p_stream, p_archive); break; case 'TBX1': - newPane = new J2DTextBox(basePane, stream, archive); + newPane = new J2DTextBox(p_basePane, p_stream, p_archive); break; case 'PAN2': - newPane = new J2DPane(basePane, stream, 1); + newPane = new J2DPane(p_basePane, p_stream, 1); break; case 'WIN2': if (param_3 & 0x1F0000) { - newPane = new J2DWindowEx(basePane, stream, param_3, mMaterials); + newPane = new J2DWindowEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DWindow(basePane, stream, mMaterials); + newPane = new J2DWindow(p_basePane, p_stream, mMaterials); break; case 'PIC2': if (param_3 & 0x1F0000) { - newPane = new J2DPictureEx(basePane, stream, param_3, mMaterials); + newPane = new J2DPictureEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DPicture(basePane, stream, mMaterials); + newPane = new J2DPicture(p_basePane, p_stream, mMaterials); break; case 'TBX2': if (param_3 & 0x1F0000) { - newPane = new J2DTextBoxEx(basePane, stream, param_3, mMaterials); + newPane = new J2DTextBoxEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DTextBox(basePane, stream, param_3, mMaterials); + newPane = new J2DTextBox(p_basePane, p_stream, param_3, mMaterials); break; default: - s32 position = stream->getPosition(); + s32 position = p_stream->getPosition(); s32 size = header.mSize; s32 start = size + position; - newPane = new J2DPane(basePane, stream, 0); - stream->seek(start, JSUStreamSeekFrom_SET); + newPane = new J2DPane(p_basePane, p_stream, 0); + p_stream->seek(start, JSUStreamSeekFrom_SET); break; } @@ -478,7 +467,7 @@ SECTION_SDATA2 static f32 lit_1830 = 1.0f; /* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */ // matches with literals #ifdef NONMATCHING -void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* grafCtx) { +void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { u32 x, y, width, height; if (mScissor) { @@ -486,11 +475,11 @@ void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* grafCtx) { } if (grafCtx != NULL) { - J2DPane::draw(param_0, param_1, grafCtx, mScissor, true); + J2DPane::draw(x, y, grafCtx, mScissor, true); } else { J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); ortho.setPort(); - J2DPane::draw(param_0, param_1, &ortho, mScissor, true); + J2DPane::draw(x, y, &ortho, mScissor, true); } if (mScissor) { @@ -543,15 +532,15 @@ J2DPane* J2DScreen::searchUserInfo(u64 tag) { } /* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text drawSelf__9J2DScreenFffPA3_A4_f */ -// close. issues with color +// matches with literals #ifdef NONMATCHING void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { JUtility::TColor color(mColor); u8 alpha = (color.a * mAlpha) / 255; if (alpha != 0) { - JUtility::TColor color2((u32)alpha); - color = color2; + JUtility::TColor sp8(alpha | ((u32)color & 0xFFFFFF00)); + color = sp8; GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); @@ -570,7 +559,7 @@ void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { GXColor1u32(color); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); - GXEnd(); + i_GXEnd(); } } #else @@ -588,15 +577,15 @@ asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { * getResReference__9J2DScreenFP20JSURandomInputStreamUl */ // small regalloc #ifdef NONMATCHING -J2DResReference* J2DScreen::getResReference(JSURandomInputStream* stream, u32 param_1) { - s32 position = stream->getPosition(); - stream->skip(4); +J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 param_1) { + s32 position = p_stream->getPosition(); + p_stream->skip(4); s32 start, end; - start = stream->readS32(); - stream->skip(4); - end = stream->readS32(); - stream->seek(position + end, JSUStreamSeekFrom_SET); + start = p_stream->readS32(); + p_stream->skip(4); + end = p_stream->readS32(); + p_stream->seek(position + end, JSUStreamSeekFrom_SET); s32 size = end - start; @@ -608,7 +597,7 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* stream, u32 pa } if (buffer != NULL) { - stream->read(buffer, size); + p_stream->read(buffer, size); } return (J2DResReference*)buffer; @@ -628,14 +617,14 @@ asm J2DResReference* J2DScreen::getResReference(JSURandomInputStream* param_0, u * createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ // nametab section has issues #ifdef NONMATCHING -bool J2DScreen::createMaterial(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) { - s32 position = stream->getPosition(); +bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { + s32 position = p_stream->getPosition(); J2DScrnBlockHeader header; - stream->read(&header, 8); - mMaterialNum = stream->readU16(); + p_stream->read(&header, 8); + mMaterialNum = p_stream->readU16(); - stream->skip(2); + p_stream->skip(2); if (param_1 & 0x1F0000) { mMaterials = new J2DMaterial[mMaterialNum]; @@ -645,12 +634,12 @@ bool J2DScreen::createMaterial(JSURandomInputStream* stream, u32 param_1, JKRArc u8* buffer = new (-4) u8[header.mSize]; if (mMaterials != NULL && buffer != NULL) { - stream->seek(position, JSUStreamSeekFrom_SET); - stream->read(buffer, header.mSize); + p_stream->seek(position, JSUStreamSeekFrom_SET); + p_stream->read(buffer, header.mSize); J2DMaterialFactory factory(*(J2DMaterialBlock*)buffer); for (u16 i = 0; i < mMaterialNum; i++) { - factory.create(&mMaterials[i], i, param_1, mTexRes, mFontRes, archive); + factory.create(&mMaterials[i], i, param_1, mTexRes, mFontRes, p_archive); } if (param_1 & 0x1F0000) { @@ -699,13 +688,13 @@ asm bool J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1, #endif /* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */ -bool J2DScreen::isUsed(ResTIMG const* img) { - return J2DPane::isUsed(img); +bool J2DScreen::isUsed(ResTIMG const* p_timg) { + return J2DPane::isUsed(p_timg); } /* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */ -bool J2DScreen::isUsed(ResFONT const* font) { - return J2DPane::isUsed(font); +bool J2DScreen::isUsed(ResFONT const* p_font) { + return J2DPane::isUsed(p_font); } /* ############################################################################################## */ @@ -733,85 +722,85 @@ void J2DScreen::animation() { } /* 802F9704-802F9798 2F4044 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP11J2DAnmColor */ -void J2DScreen::setAnimation(J2DAnmColor* anmColor) { - anmColor->searchUpdateMaterialID(this); - u16 matNum = anmColor->getUpdateMaterialNum(); +void J2DScreen::setAnimation(J2DAnmColor* p_anmColor) { + p_anmColor->searchUpdateMaterialID(this); + u16 matNum = p_anmColor->getUpdateMaterialNum(); for (u16 i = 0; i < matNum; i++) { - u16 matID = anmColor->getUpdateMaterialID(i); + u16 matID = p_anmColor->getUpdateMaterialID(i); if (matID < mMaterialNum) { - mMaterials[matID].setAnimation(anmColor); + mMaterials[matID].setAnimation(p_anmColor); } } } /* 802F9798-802F9838 2F40D8 00A0+00 1/0 0/0 0/0 .text * setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey */ -void J2DScreen::setAnimation(J2DAnmTextureSRTKey* anmSRTKey) { - anmSRTKey->searchUpdateMaterialID(this); - u16 matNum = anmSRTKey->getUpdateMaterialNum(); +void J2DScreen::setAnimation(J2DAnmTextureSRTKey* p_anmSRTKey) { + p_anmSRTKey->searchUpdateMaterialID(this); + u16 matNum = p_anmSRTKey->getUpdateMaterialNum(); for (u16 i = 0; i < matNum; i++) { - u16 matID = anmSRTKey->getUpdateMaterialID(i); + u16 matID = p_anmSRTKey->getUpdateMaterialID(i); if (matID < mMaterialNum) { - mMaterials[matID].setAnimation(anmSRTKey); + mMaterials[matID].setAnimation(p_anmSRTKey); } } } /* 802F9838-802F98CC 2F4178 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP16J2DAnmTexPattern */ -void J2DScreen::setAnimation(J2DAnmTexPattern* anmPattern) { - anmPattern->searchUpdateMaterialID(this); - u16 matNum = anmPattern->getUpdateMaterialNum(); +void J2DScreen::setAnimation(J2DAnmTexPattern* p_anmPattern) { + p_anmPattern->searchUpdateMaterialID(this); + u16 matNum = p_anmPattern->getUpdateMaterialNum(); for (u16 i = 0; i < matNum; i++) { - u16 matID = anmPattern->getUpdateMaterialID(i); + u16 matID = p_anmPattern->getUpdateMaterialID(i); if (matID < mMaterialNum) { - mMaterials[matID].setAnimation(anmPattern); + mMaterials[matID].setAnimation(p_anmPattern); } } } /* 802F98CC-802F99A8 2F420C 00DC+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP15J2DAnmTevRegKey */ -void J2DScreen::setAnimation(J2DAnmTevRegKey* anmRegKey) { - anmRegKey->searchUpdateMaterialID(this); +void J2DScreen::setAnimation(J2DAnmTevRegKey* p_anmRegKey) { + p_anmRegKey->searchUpdateMaterialID(this); - u16 cMatNum = anmRegKey->getCRegUpdateMaterialNum(); + u16 cMatNum = p_anmRegKey->getCRegUpdateMaterialNum(); for (u16 i = 0; i < cMatNum; i++) { - u16 matID = anmRegKey->getCRegUpdateMaterialID(i); + u16 matID = p_anmRegKey->getCRegUpdateMaterialID(i); if (matID < mMaterialNum) { - mMaterials[matID].setAnimation(anmRegKey); + mMaterials[matID].setAnimation(p_anmRegKey); } } - u16 kMatNum = anmRegKey->getKRegUpdateMaterialNum(); + u16 kMatNum = p_anmRegKey->getKRegUpdateMaterialNum(); for (u16 i = 0; i < kMatNum; i++) { - u16 matID = anmRegKey->getKRegUpdateMaterialID(i); + u16 matID = p_anmRegKey->getKRegUpdateMaterialID(i); if (matID < mMaterialNum) { - mMaterials[matID].setAnimation(anmRegKey); + mMaterials[matID].setAnimation(p_anmRegKey); } } } /* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor */ -void J2DScreen::setAnimation(J2DAnmVtxColor* anmVtxColor) { - J2DPane::setVtxColorAnimation(anmVtxColor); +void J2DScreen::setAnimation(J2DAnmVtxColor* p_anmVtxColor) { + J2DPane::setVtxColorAnimation(p_anmVtxColor); } /* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text * setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */ -void J2DScreen::setAnimation(J2DAnmVisibilityFull* anmVisibility) { - J2DPane::setVisibileAnimation(anmVisibility); +void J2DScreen::setAnimation(J2DAnmVisibilityFull* p_anmVisibility) { + J2DPane::setVisibileAnimation(p_anmVisibility); } /* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */ -J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream, - J2DPane* basePane, u32 param_3) { - return createPane(header, stream, basePane, param_3, NULL); +J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream, + J2DPane* p_basePane, u32 param_3) { + return createPane(header, p_stream, p_basePane, param_3, NULL); } /* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */ @@ -825,18 +814,18 @@ void J2DScreen::calcMtx() { } /* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */ -void J2DScreen::setAnimation(J2DAnmBase* anm) { - J2DPane::setAnimation(anm); +void J2DScreen::setAnimation(J2DAnmBase* p_anm) { + J2DPane::setAnimation(p_anm); } /* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text * setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull */ -void J2DScreen::setAnimationVF(J2DAnmVisibilityFull* param_0) { +void J2DScreen::setAnimationVF(J2DAnmVisibilityFull*) { /* empty function */ } /* 802F9A78-802F9A7C 2F43B8 0004+00 1/0 0/0 0/0 .text setAnimationVC__9J2DScreenFP14J2DAnmVtxColor */ -void J2DScreen::setAnimationVC(J2DAnmVtxColor* param_0) { +void J2DScreen::setAnimationVC(J2DAnmVtxColor*) { /* empty function */ } diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index 49a3e3487e7..edc385fbd13 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -9,285 +9,334 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __ct__10J2DTextBoxFv(); -extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive(); -extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); -extern "C" void func_802FFBC4(); -extern "C" void initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding(); -extern "C" void private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive(); -extern "C" void __dt__10J2DTextBoxFv(); -extern "C" void setFont__10J2DTextBoxFP7JUTFont(); -extern "C" void draw__10J2DTextBoxFff(); -extern "C" void draw__10J2DTextBoxFfff18J2DTextBoxHBinding(); -extern "C" void getStringPtr__10J2DTextBoxCFv(); -extern "C" void setString__10J2DTextBoxFPCce(); -extern "C" void setString__10J2DTextBoxFsPCce(); -extern "C" void setConnectParent__10J2DTextBoxFb(); -extern "C" void drawSelf__10J2DTextBoxFff(); -extern "C" void drawSelf__10J2DTextBoxFffPA3_A4_f(); -extern "C" void resize__10J2DTextBoxFff(); -extern "C" void isUsed__10J2DTextBoxFPC7ResFONT(); -extern "C" s32 getTypeID__10J2DTextBoxCFv(); -extern "C" void isUsed__10J2DTextBoxFPC7ResTIMG(); -extern "C" void rewriteAlpha__10J2DTextBoxFv(); -extern "C" extern char const* const J2DTextBox__stringBase0; - -// -// External References: -// - -extern "C" void setAlpha__7J2DPaneFUc(); -extern "C" void calcMtx__7J2DPaneFv(); -extern "C" void makeMatrix__7J2DPaneFff(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey(); -extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor(); -extern "C" void setWhite__10J2DTextBoxFQ28JUtility6TColor(); -extern "C" void setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey(); -extern "C" void setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void getWhite__10J2DTextBoxCFv(); -extern "C" void getBlack__10J2DTextBoxCFv(); -extern "C" void getFont__10J2DTextBoxCFv(); -extern "C" void setBlack__10J2DTextBoxFQ28JUtility6TColor(); -extern "C" void setAnimation__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void setAnimation__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setAnimation__7J2DPaneFP16J2DAnmTexPattern(); -extern "C" bool getMaterial__10J2DTextBoxCFv(); -extern "C" void* __nw__FUl(); -extern "C" void* __nwa__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __dla__FPv(); -extern "C" void read__14JSUInputStreamFPvl(); -extern "C" void peek__20JSURandomInputStreamFPvl(); -extern "C" void seek__20JSURandomInputStreamFl17JSUStreamSeekFrom(); -extern "C" void __ct__10JUTResFontFPC7ResFONTP7JKRHeap(); -extern "C" void -__ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void __dt__8J2DPrintFv(); -extern "C" void locate__8J2DPrintFff(); -extern "C" void print__8J2DPrintFffUcPCce(); -extern "C" void printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc(); -extern "C" void __ct__7J2DPaneFv(); -extern "C" void func_802F5E88(); -extern "C" void makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void __dt__7J2DPaneFv(); -extern "C" void move__7J2DPaneFff(); -extern "C" void add__7J2DPaneFff(); -extern "C" void resize__7J2DPaneFff(); -extern "C" void search__7J2DPaneFUx(); -extern "C" void searchUserInfo__7J2DPaneFUx(); -extern "C" void isUsed__7J2DPaneFPC7ResTIMG(); -extern "C" void isUsed__7J2DPaneFPC7ResFONT(); -extern "C" void makeMatrix__7J2DPaneFffff(); -extern "C" void setCullBack__7J2DPaneF11_GXCullMode(); -extern "C" void makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream(); -extern "C" void getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive(); -extern "C" void setAnimation__7J2DPaneFP10J2DAnmBase(); -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTransform(); -extern "C" void clearAnmTransform__7J2DPaneFv(); -extern "C" void animationTransform__7J2DPaneFPC15J2DAnmTransform(); -extern "C" void setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void animationPane__7J2DPaneFPC15J2DAnmTransform(); -extern "C" void setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull(); -extern "C" void setAnimationVC__7J2DPaneFP14J2DAnmVtxColor(); -extern "C" void setCullBack__7J2DPaneFb(); -extern "C" void update__7J2DPaneFv(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803CD328-803CD3E8 02A448 00BC+04 5/5 0/0 0/0 .data __vt__10J2DTextBox */ -SECTION_DATA extern void* __vt__10J2DTextBox[47 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10J2DTextBoxFv, - (void*)getTypeID__10J2DTextBoxCFv, - (void*)move__7J2DPaneFff, - (void*)add__7J2DPaneFff, - (void*)resize__10J2DTextBoxFff, - (void*)setCullBack__7J2DPaneFb, - (void*)setCullBack__7J2DPaneF11_GXCullMode, - (void*)setAlpha__7J2DPaneFUc, - (void*)setConnectParent__10J2DTextBoxFb, - (void*)calcMtx__7J2DPaneFv, - (void*)update__7J2DPaneFv, - (void*)drawSelf__10J2DTextBoxFff, - (void*)drawSelf__10J2DTextBoxFffPA3_A4_f, - (void*)search__7J2DPaneFUx, - (void*)searchUserInfo__7J2DPaneFUx, - (void*)makeMatrix__7J2DPaneFff, - (void*)makeMatrix__7J2DPaneFffff, - (void*)isUsed__10J2DTextBoxFPC7ResTIMG, - (void*)isUsed__10J2DTextBoxFPC7ResFONT, - (void*)clearAnmTransform__7J2DPaneFv, - (void*)rewriteAlpha__10J2DTextBoxFv, - (void*)setAnimation__7J2DPaneFP10J2DAnmBase, - (void*)setAnimation__7J2DPaneFP15J2DAnmTransform, - (void*)setAnimation__7J2DPaneFP11J2DAnmColor, - (void*)setAnimation__7J2DPaneFP16J2DAnmTexPattern, - (void*)setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey, - (void*)setAnimation__7J2DPaneFP15J2DAnmTevRegKey, - (void*)setAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)animationTransform__7J2DPaneFPC15J2DAnmTransform, - (void*)setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)setAnimationVC__7J2DPaneFP14J2DAnmVtxColor, - (void*)animationPane__7J2DPaneFPC15J2DAnmTransform, - (void*)draw__10J2DTextBoxFff, - (void*)draw__10J2DTextBoxFfff18J2DTextBoxHBinding, - (void*)setFont__10J2DTextBoxFP7JUTFont, - (void*)getFont__10J2DTextBoxCFv, - (void*)setBlack__10J2DTextBoxFQ28JUtility6TColor, - (void*)setWhite__10J2DTextBoxFQ28JUtility6TColor, - (void*)setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor, - (void*)getBlack__10J2DTextBoxCFv, - (void*)getWhite__10J2DTextBoxCFv, - (void*)getMaterial__10J2DTextBoxCFv, - /* padding */ - NULL, -}; - /* 802FF660-802FF6D8 2F9FA0 0078+00 0/0 1/1 0/0 .text __ct__10J2DTextBoxFv */ J2DTextBox::J2DTextBox() : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { - initiate(NULL, 0, 0, HBIND_LEFT, VBIND_TOP); + initiate(NULL, NULL, 0, HBIND_LEFT, VBIND_TOP); } /* 802FF6D8-802FF75C 2FA018 0084+00 0/0 1/1 0/0 .text * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ -J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) +J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive) : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { - private_readStream(param_0, param_1, param_2); + private_readStream(p_pane, p_stream, p_archive); } -/* ############################################################################################## */ -/* 80456280-80456288 004880 0004+04 6/6 0/0 0/0 .sdata2 @1660 */ -SECTION_SDATA2 static f32 lit_1660[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80456288-80456290 004888 0008+00 3/3 0/0 0/0 .sdata2 @1662 */ -SECTION_SDATA2 static f64 lit_1662 = 4503601774854144.0 /* cast s32 to float */; - -/* 80456290-80456298 004890 0008+00 2/2 0/0 0/0 .sdata2 @1665 */ -SECTION_SDATA2 static f64 lit_1665 = 4503599627370496.0 /* cast u32 to float */; - /* 802FF75C-802FFBC4 2FA09C 0468+00 0/0 1/1 0/0 .text * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2, - J2DMaterial* param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s" +J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 param_2, + J2DMaterial* p_material) + : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { + J2DTextBoxInfo info; + + int startPos = p_stream->getPosition(); + + J2DTbxBlockHeader header; + p_stream->read(&header, 8); + mKind = 'TBX1'; + + int panHeaderPos = p_stream->getPosition(); + J2DTbxBlockHeader panHeader; + p_stream->peek(&panHeader, 8); + makePaneExStream(p_pane, p_stream); + p_stream->seek(panHeaderPos + panHeader.mSize, JSUStreamSeekFrom_SET); + + p_stream->read(&info, 0x20); + J2DMaterial* mat = NULL; + + if (info.mMaterialNum != 0xFFFF) { + mat = &p_material[info.mMaterialNum]; + + if (mat != NULL) { + if (mat->getTevBlock() != NULL) { + JUTFont* font = mat->getTevBlock()->getFont(); + + if (font != NULL) { + mFont = font; + mat->getTevBlock()->setFontUndeleteFlag(); + } + } + mAlpha = mat->getColorBlock()->getMatColor(0)->a; + } + } + + mCharSpacing = info.mCharSpace; + mLineSpacing = info.mLineSpace; + mFontSizeX = info.mFontSizeX; + mFontSizeY = info.mFontSizeY; + mFlags = (info.mHBind << 2) | info.mVBind; + mCharColor = JUtility::TColor(info.mCharColor); + mGradientColor = JUtility::TColor(info.mGradColor); + setConnectParent(info.mConnected); + + u16 strLength = 0; + if (!(param_2 & 0x2000000)) { + strLength = info.field_0x1c; + if ((s16)info.field_0x1c == -1) { + strLength = info.field_0x1e + 1; + } + } + + mStringLength = 0; + mStringPtr = NULL; + + if (strLength != 0) { + mStringPtr = new char[strLength]; + } + + if (mStringPtr != NULL) { + mStringLength = strLength; + int temp_r0 = (u16)strLength - 1; + u16 var_r26_2 = info.field_0x1e; + + if (temp_r0 < var_r26_2) { + var_r26_2 = (u16)temp_r0; + } + + p_stream->peek(mStringPtr, var_r26_2); + mStringPtr[var_r26_2] = 0; + } + + p_stream->skip(info.field_0x1e); + p_stream->seek(startPos + header.mSize, JSUStreamSeekFrom_SET); + mBlackColor = JUtility::TColor(0); + mWhiteColor = JUtility::TColor(0xFFFFFFFF); + + if (mat != NULL && mat->getTevBlock() != NULL) { + if (mat->getTevBlock()->getTevStageNum() != 1) { + J2DGXColorS10* color0p = mat->getTevBlock()->getTevColor(0); + GXColorS10 color0; + color0.r = color0p->r; + color0.g = color0p->g; + color0.b = color0p->b; + color0.a = color0p->a; + + J2DGXColorS10* color1p = mat->getTevBlock()->getTevColor(1); + GXColorS10 color1; + color1.r = color1p->r; + color1.g = color1p->g; + color1.b = color1p->b; + color1.a = color1p->a; + + mBlackColor = JUtility::TColor(((u8)color0.r << 0x18) | ((u8)color0.g << 0x10) | + ((u8)color0.b << 8) | (u8)color0.a); + mWhiteColor = JUtility::TColor(((u8)color1.r << 0x18) | ((u8)color1.g << 0x10) | + ((u8)color1.b << 8) | (u8)color1.a); + } + } + + field_0x10c = 0.0f; + field_0x110 = 0.0f; + mTextFontOwned = true; } -#pragma pop /* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text * __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */ -J2DTextBox::J2DTextBox(u64 param_0, JGeometry::TBox2 const& param_1, ResFONT const* param_2, - char const* param_3, s16 param_4, J2DTextBoxHBinding param_5, - J2DTextBoxVBinding param_6) - : J2DPane(param_0, param_1), mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), +J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2 const& bounds, ResFONT const* p_font, + char const* string, s16 strLength, J2DTextBoxHBinding hBind, + J2DTextBoxVBinding vBind) + : J2DPane(tag, bounds), mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { - initiate(param_2, param_3, param_4, param_5, param_6); + initiate(p_font, string, strLength, hBind, vBind); } /* 802FFC58-802FFE88 2FA598 0230+00 2/2 1/0 0/0 .text * initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::initiate(ResFONT const* param_0, char const* param_1, s16 param_2, - J2DTextBoxHBinding param_3, J2DTextBoxVBinding param_4) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding.s" +void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length, + J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) { + if (p_font != NULL) { + mFont = new JUTResFont(p_font, NULL); + } + + mCharColor.set(0xFFFFFFFF); + mGradientColor.set(0xFFFFFFFF); + mBlackColor = JUtility::TColor(0); + mWhiteColor = JUtility::TColor(0xFFFFFFFF); + + mFlags = (hBind << 2) | vBind; + mStringLength = 0; + mStringPtr = NULL; + + if (string != NULL && length != 0) { + u32 len = strlen(string); + u16 stringLen = length; + + if (length == -1) { + if (len >= 0xFFFF) { + len = 0xFFFF - 1; + } + stringLen = len + 1; + } + + mStringPtr = new char[stringLen]; + + if (stringLen != 0 && mStringPtr != NULL) { + strncpy(mStringPtr, string, stringLen - 1); + mStringPtr[stringLen - 1] = 0; + mStringLength = stringLen; + } + } + + field_0x10c = 0.0f; + field_0x110 = 0.0f; + mCharSpacing = 0.0f; + + if (mFont == NULL) { + mLineSpacing = 0.0f; + mFontSizeX = 0.0f; + mFontSizeY = 0.0f; + } else { + mLineSpacing = mFont->getLeading(); + mFontSizeX = mFont->getWidth(); + mFontSizeY = mFont->getHeight(); + } + + mKind = 'TBX1'; + mTextFontOwned = true; } -#pragma pop /* 802FFE88-803001E0 2FA7C8 0358+00 1/1 0/0 0/0 .text * private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::private_readStream(J2DPane* param_0, JSURandomInputStream* param_1, - JKRArchive* param_2) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive.s" +void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_stream, + JKRArchive* p_archive) { + int position = p_stream->getPosition(); + + J2DTbxBlockHeader header; + p_stream->read(&header, 8); + mKind = header.mTag; + + makePaneStream(p_pane, p_stream); + u8 spA = p_stream->readU8(); + + ResFONT* fontPtr = (ResFONT*)getPointer(p_stream, 'FONT', p_archive); + if (fontPtr != NULL) { + mFont = new JUTResFont(fontPtr, NULL); + } + + mCharColor.set(p_stream->read32b()); + mGradientColor.set(p_stream->read32b()); + mFlags = p_stream->read8b(); + mCharSpacing = p_stream->readS16(); + mLineSpacing = p_stream->readS16(); + mFontSizeX = p_stream->read16b(); + mFontSizeY = p_stream->read16b(); + + s16 stringLen = p_stream->read16b(); + mStringPtr = new char[stringLen + 1]; + + if (mStringPtr != NULL) { + p_stream->read(mStringPtr, stringLen); + mStringPtr[stringLen] = 0; + mStringLength = stringLen + 1; + } else { + p_stream->skip(stringLen); + mStringLength = 0; + } + + spA -= 10; + if (spA != 0) { + u8 sp8 = p_stream->read8b(); + if (sp8 != 0) { + setConnectParent(true); + } + + spA--; + } + + mBlackColor = JUtility::TColor(0); + mWhiteColor = JUtility::TColor(0xFFFFFFFF); + + if (spA != 0) { + mBlackColor.set(p_stream->read32b()); + spA--; + } + + if (spA != 0) { + mWhiteColor.set(p_stream->read32b()); + } + + field_0x10c = 0.0f; + field_0x110 = 0.0f; + p_stream->seek(position + header.mSize, JSUStreamSeekFrom_SET); + mTextFontOwned = true; } -#pragma pop /* 803001E0-80300278 2FAB20 0098+00 1/0 2/2 0/0 .text __dt__10J2DTextBoxFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm J2DTextBox::~J2DTextBox() { -extern "C" asm void __dt__10J2DTextBoxFv() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/__dt__10J2DTextBoxFv.s" +J2DTextBox::~J2DTextBox() { + if (mTextFontOwned) { + delete mFont; + } + + delete[] mStringPtr; } -#pragma pop /* 80300278-803002E8 2FABB8 0070+00 1/0 0/0 0/0 .text setFont__10J2DTextBoxFP7JUTFont */ -void J2DTextBox::setFont(JUTFont* pFont) { - if (pFont) { +void J2DTextBox::setFont(JUTFont* p_font) { + if (p_font) { if (mTextFontOwned) { delete mFont; } - mFont = pFont; + mFont = p_font; mTextFontOwned = false; } } -/* ############################################################################################## */ -/* 803A1C58-803A1C58 02E2B8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A1C58 = "%s"; -#pragma pop - /* 803002E8-80300490 2FAC28 01A8+00 1/0 0/0 0/0 .text draw__10J2DTextBoxFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::draw(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFff.s" +void J2DTextBox::draw(f32 posX, f32 posY) { + Mtx m; + + if (isVisible()) { + J2DPrint print(mFont, mCharSpacing, mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize(mFontSizeX, mFontSizeY); + makeMatrix(posX, posY, 0.0f, 0.0f); + + GXLoadPosMtxImm(mPositionMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + GXSetNumIndStages(0); + for (int i = 0; i < 16; i++) { + GXSetTevDirect((GXTevStageID)i); + } + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + + if (mStringPtr != NULL) { + print.print(0.0f, 0.0f, mAlpha, "%s", mStringPtr); + } + PSMTXIdentity(m); + GXLoadPosMtxImm(m, 0); + } } -#pragma pop /* 80300490-80300658 2FADD0 01C8+00 1/0 1/1 0/0 .text draw__10J2DTextBoxFfff18J2DTextBoxHBinding */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::draw(f32 param_0, f32 param_1, f32 param_2, J2DTextBoxHBinding param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/draw__10J2DTextBoxFfff18J2DTextBoxHBinding.s" +void J2DTextBox::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind) { + Mtx m; + + if (isVisible()) { + J2DPrint print(mFont, mCharSpacing, mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize(mFontSizeX, mFontSizeY); + makeMatrix(posX, posY, 0.0f, 0.0f); + + GXLoadPosMtxImm(mPositionMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + GXSetNumIndStages(0); + for (int i = 0; i < 16; i++) { + GXSetTevDirect((GXTevStageID)i); + } + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + + if (mStringPtr != NULL) { + print.printReturn(mStringPtr, param_2, 0.0f, hBind, VBIND_TOP, 0.0f, -mFontSizeY, + mAlpha); + } + PSMTXIdentity(m); + GXLoadPosMtxImm(m, 0); + } } -#pragma pop /* 80300658-80300660 2FAF98 0008+00 0/0 62/62 2/2 .text getStringPtr__10J2DTextBoxCFv */ char* J2DTextBox::getStringPtr() const { @@ -295,9 +344,10 @@ char* J2DTextBox::getStringPtr() const { } /* 80300660-8030074C 2FAFA0 00EC+00 0/0 6/6 0/0 .text setString__10J2DTextBoxFPCce */ -// missing block of instructions before delete[] -#ifdef NONMATCHING s32 J2DTextBox::setString(char const* string, ...) { + va_list args; + va_start(args, string); + delete[] mStringPtr; u32 len = strlen(string); @@ -314,115 +364,116 @@ s32 J2DTextBox::setString(char const* string, ...) { mStringLength = len + 1; strcpy(mStringPtr, string); } + + va_end(args); return len; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 J2DTextBox::setString(char const* param_0, ...) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFPCce.s" -} -#pragma pop -#endif /* 8030074C-80300870 2FB08C 0124+00 0/0 41/41 2/2 .text setString__10J2DTextBoxFsPCce */ -#ifdef NONMATCHING -s32 J2DTextBox::setString(s16 param_0, char const* string, ...) { +s32 J2DTextBox::setString(s16 length, char const* string, ...) { + va_list args; + va_start(args, string); + delete[] mStringPtr; mStringPtr = NULL; u32 len = strlen(string); + u16 stringLen = length; - if (param_0 == -1) { + if (length == -1) { if (len >= 0xFFFF) { len = 0xFFFF - 1; } - param_0 = len + 1; + stringLen = len + 1; } mStringLength = 0; - if (param_0 != 0) { - char* tmp = new char[param_0]; - mStringPtr = tmp; + if (stringLen != 0) { + mStringPtr = new char[stringLen]; } - if (mStringPtr) { - strncpy(mStringPtr, string, param_0 - 1); - mStringPtr[param_0 - 1] = 0; - mStringLength = param_0; + if (mStringPtr != NULL) { + strncpy(mStringPtr, string, stringLen - 1); + mStringPtr[stringLen - 1] = 0; + mStringLength = stringLen; } + + va_end(args); return len; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 J2DTextBox::setString(s16 param_0, char const* param_1, ...) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/setString__10J2DTextBoxFsPCce.s" -} -#pragma pop -#endif /* 80300870-803008E8 2FB1B0 0078+00 1/0 1/0 0/0 .text setConnectParent__10J2DTextBoxFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTextBox::setConnectParent(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/setConnectParent__10J2DTextBoxFb.s" +bool J2DTextBox::setConnectParent(bool connected) { + if (getPaneTree()->getParent() == NULL) { + return false; + } + + if ((u16)getPaneTree()->getParent()->getObject()->getTypeID() != 0x11) { + return false; + } + + mConnected = connected; + return connected; } -#pragma pop /* 803008E8-80300950 2FB228 0068+00 1/0 1/0 0/0 .text drawSelf__10J2DTextBoxFff */ void J2DTextBox::drawSelf(f32 param_0, f32 param_1) { - Mtx tmp; - PSMTXIdentity(tmp); + Mtx identity; + PSMTXIdentity(identity); - drawSelf(param_0, param_1, &tmp); + drawSelf(param_0, param_1, &identity); } -/* ############################################################################################## */ -/* 80456298-804562A0 004898 0004+04 1/1 0/0 0/0 .sdata2 @2049 */ -SECTION_SDATA2 static f32 lit_2049[1 + 1 /* padding */] = { - 9.999999747378752e-05f, - /* padding */ - 0.0f, -}; - /* 80300950-80300AF8 2FB290 01A8+00 1/0 0/0 0/0 .text drawSelf__10J2DTextBoxFffPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/drawSelf__10J2DTextBoxFffPA3_A4_f.s" +void J2DTextBox::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) { + Mtx m; + + J2DPrint print(mFont, mCharSpacing, mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize(mFontSizeX, mFontSizeY); + PSMTXConcat(*p_mtx, mGlobalMtx, m); + + GXLoadPosMtxImm(m, GX_PNMTX0); + GXSetNumIndStages(0); + for (int i = 0; i < 16; i++) { + GXSetTevDirect((GXTevStageID)i); + } + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + + print.locate(param_0 + mBounds.i.x, param_1 + mBounds.i.y); + if (mStringPtr != NULL) { + print.printReturn(mStringPtr, mBounds.getWidth() + 0.0001f, mBounds.getHeight(), + getHBinding(), getVBinding(), field_0x10c, field_0x110, mColorAlpha); + } } -#pragma pop /* 80300AF8-80300BFC 2FB438 0104+00 1/0 1/0 0/0 .text resize__10J2DTextBoxFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBox::resize(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/resize__10J2DTextBoxFff.s" +void J2DTextBox::resize(f32 x, f32 y) { + if (mConnected && getPaneTree() != NULL && getPaneTree()->getParent() != NULL) { + J2DPane* obj = getPaneTree()->getParent()->getObject(); + + if ((u16)obj->getTypeID() == 0x11) { + f32 obj_x = obj->getWidth() + (x - getWidth()); + f32 obj_y = obj->getHeight() + (y - getHeight()); + obj->resize(obj_x, obj_y); + return; + } + } + + J2DPane::resize(x, y); } -#pragma pop /* 80300BFC-80300C68 2FB53C 006C+00 1/0 0/0 0/0 .text isUsed__10J2DTextBoxFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool J2DTextBox::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBox/isUsed__10J2DTextBoxFPC7ResFONT.s" +bool J2DTextBox::isUsed(ResFONT const* p_font) { + if (mFont != NULL && mFont->getResFont() == p_font) { + return true; + } + + return J2DPane::isUsed(p_font); } -#pragma pop /* 80300C68-80300C70 2FB5A8 0008+00 1/0 1/0 0/0 .text getTypeID__10J2DTextBoxCFv */ s32 J2DTextBox::getTypeID() const { @@ -430,8 +481,8 @@ s32 J2DTextBox::getTypeID() const { } /* 80300C70-80300C90 2FB5B0 0020+00 1/0 0/0 0/0 .text isUsed__10J2DTextBoxFPC7ResTIMG */ -bool J2DTextBox::isUsed(ResTIMG const* param_0) { - return J2DPane::isUsed(param_0); +bool J2DTextBox::isUsed(ResTIMG const* p_timg) { + return J2DPane::isUsed(p_timg); } /* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text rewriteAlpha__10J2DTextBoxFv */ diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index 7ae1372960b..01a50b67767 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -102,165 +102,270 @@ extern "C" void _restgpr_28(); // Declarations: // -/* ############################################################################################## */ -/* 803CD608-803CD6C8 02A728 00BC+04 2/2 0/0 0/0 .data __vt__12J2DTextBoxEx */ -SECTION_DATA extern void* __vt__12J2DTextBoxEx[47 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J2DTextBoxExFv, - (void*)getTypeID__10J2DTextBoxCFv, - (void*)move__7J2DPaneFff, - (void*)add__7J2DPaneFff, - (void*)resize__10J2DTextBoxFff, - (void*)setCullBack__12J2DTextBoxExFb, - (void*)setCullBack__12J2DTextBoxExF11_GXCullMode, - (void*)setAlpha__12J2DTextBoxExFUc, - (void*)setConnectParent__10J2DTextBoxFb, - (void*)calcMtx__7J2DPaneFv, - (void*)update__7J2DPaneFv, - (void*)drawSelf__10J2DTextBoxFff, - (void*)drawSelf__12J2DTextBoxExFffPA3_A4_f, - (void*)search__7J2DPaneFUx, - (void*)searchUserInfo__7J2DPaneFUx, - (void*)makeMatrix__7J2DPaneFff, - (void*)makeMatrix__7J2DPaneFffff, - (void*)isUsed__12J2DTextBoxExFPC7ResTIMG, - (void*)isUsed__12J2DTextBoxExFPC7ResFONT, - (void*)clearAnmTransform__7J2DPaneFv, - (void*)rewriteAlpha__12J2DTextBoxExFv, - (void*)setAnimation__12J2DTextBoxExFP10J2DAnmBase, - (void*)setAnimation__12J2DTextBoxExFP15J2DAnmTransform, - (void*)setAnimation__12J2DTextBoxExFP11J2DAnmColor, - (void*)setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern, - (void*)setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey, - (void*)setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey, - (void*)setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull, - (void*)setAnimation__12J2DTextBoxExFP14J2DAnmVtxColor, - (void*)animationTransform__7J2DPaneFPC15J2DAnmTransform, - (void*)setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull, - (void*)setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor, - (void*)setAnimationVC__7J2DPaneFP14J2DAnmVtxColor, - (void*)animationPane__12J2DTextBoxExFPC15J2DAnmTransform, - (void*)draw__12J2DTextBoxExFff, - (void*)draw__12J2DTextBoxExFfff18J2DTextBoxHBinding, - (void*)setFont__12J2DTextBoxExFP7JUTFont, - (void*)getFont__12J2DTextBoxExCFv, - (void*)setBlack__12J2DTextBoxExFQ28JUtility6TColor, - (void*)setWhite__12J2DTextBoxExFQ28JUtility6TColor, - (void*)setBlackWhite__12J2DTextBoxExFQ28JUtility6TColorQ28JUtility6TColor, - (void*)getBlack__12J2DTextBoxExCFv, - (void*)getWhite__12J2DTextBoxExCFv, - (void*)getMaterial__12J2DTextBoxExCFv, - /* padding */ - NULL, -}; - -/* 804562D8-804562E0 0048D8 0004+04 4/4 0/0 0/0 .sdata2 @1534 */ -SECTION_SDATA2 static f32 lit_1534[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 804562E0-804562E8 0048E0 0008+00 2/2 0/0 0/0 .sdata2 @1536 */ -SECTION_SDATA2 static f64 lit_1536 = 4503601774854144.0 /* cast s32 to float */; - -/* 804562E8-804562F0 0048E8 0008+00 1/1 0/0 0/0 .sdata2 @1539 */ -SECTION_SDATA2 static f64 lit_1539 = 4503599627370496.0 /* cast u32 to float */; - /* 803071E4-8030751C 301B24 0338+00 0/0 1/1 0/0 .text * __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J2DTextBoxEx::J2DTextBoxEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2, - J2DMaterial* param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial.s" +J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 param_2, + J2DMaterial* p_material) { + J2DTextBoxInfo info; + + mVisibilityAnm = NULL; + + int startPos = p_stream->getPosition(); + + J2DTbxBlockHeader header; + p_stream->read(&header, 8); + mKind = header.mTag; + + int panHeaderPos = p_stream->getPosition(); + J2DTbxBlockHeader panHeader; + p_stream->peek(&panHeader, 8); + makePaneExStream(p_pane, p_stream); + p_stream->seek(panHeaderPos + panHeader.mSize, JSUStreamSeekFrom_SET); + + p_stream->read(&info, 0x20); + field_0x13c = info.field_0x2; + field_0x13e = info.mMaterialNum; + mMaterial = NULL; + + if (field_0x13e != 0xFFFF) { + mMaterial = &p_material[field_0x13e]; + p_material[field_0x13e].field_0x4 = this; + rewriteAlpha(); + + if (mMaterial != NULL) { + if (mMaterial->getTevBlock() != NULL) { + mFont = mMaterial->getTevBlock()->getFont(); + } + } + } + + mCharSpacing = info.mCharSpace; + mLineSpacing = info.mLineSpace; + mFontSizeX = info.mFontSizeX; + mFontSizeY = info.mFontSizeY; + mFlags = (info.mHBind << 2) | info.mVBind; + mCharColor = JUtility::TColor(info.mCharColor); + mGradientColor = JUtility::TColor(info.mGradColor); + setConnectParent(info.mConnected); + + u16 strLength = 0; + if (!(param_2 & 0x2000000)) { + strLength = info.field_0x1c; + if ((s16)info.field_0x1c == -1) { + strLength = info.field_0x1e + 1; + } + } + + mStringLength = 0; + mStringPtr = NULL; + + if (strLength != 0) { + mStringPtr = new char[strLength]; + } + + if (mStringPtr != NULL) { + mStringLength = strLength; + int temp_r0 = (u16)strLength - 1; + u16 var_r26_2 = info.field_0x1e; + + if (temp_r0 < var_r26_2) { + var_r26_2 = (u16)temp_r0; + } + + p_stream->peek(mStringPtr, var_r26_2); + mStringPtr[var_r26_2] = 0; + } + + p_stream->skip(info.field_0x1e); + p_stream->seek(startPos + header.mSize, JSUStreamSeekFrom_SET); + + field_0x10c = 0.0f; + field_0x110 = 0.0f; + mTextFontOwned = false; + field_0x140 = 0; } -#pragma pop /* 8030751C-803075AC 301E5C 0090+00 1/0 0/0 0/0 .text __dt__12J2DTextBoxExFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__12J2DTextBoxExFv() { - // asm J2DTextBoxEx::~J2DTextBoxEx() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/__dt__12J2DTextBoxExFv.s" +J2DTextBoxEx::~J2DTextBoxEx() { + if (field_0x140 != 0) { + delete mMaterial; + } } -#pragma pop - -/* ############################################################################################## */ -/* 804562F0-804562F8 0048F0 0004+04 1/1 0/0 0/0 .sdata2 @1731 */ -SECTION_SDATA2 static f32 lit_1731[1 + 1 /* padding */] = { - 9.999999747378752e-05f, - /* padding */ - 0.0f, -}; /* 803075AC-803078AC 301EEC 0300+00 1/0 0/0 0/0 .text drawSelf__12J2DTextBoxExFffPA3_A4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/drawSelf__12J2DTextBoxExFffPA3_A4_f.s" -} -#pragma pop +void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) { + Mtx m; -/* ############################################################################################## */ -/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A1DF0 = "%s"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A1DF3 = "\0\0\0\0"; -#pragma pop + JUTFont* font = NULL; + if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) { + font = mMaterial->getTevBlock()->getFont(); + } + + J2DPrint print(font, (int)mCharSpacing, (int)mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize((int)mFontSizeX, (int)mFontSizeY); + + if (mMaterial != NULL) { + mMaterial->setGX(); + PSMTXConcat(*p_mtx, mGlobalMtx, m); + + GXLoadPosMtxImm(m, GX_PNMTX0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + + print.locate(param_0 + mBounds.i.x, param_1 + mBounds.i.y); + + if (mMaterial->isVisible() && mStringPtr != NULL) { + u8 alpha = 255; + + if (mMaterial->getColorBlock()->getColorChan(1)->getMatSrc() == 1) { + if (mMaterial->getMaterialAlphaCalc() == 1) { + alpha = mColorAlpha; + } + } else if (mIsInfluencedAlpha) { + GXSetChanMatColor(GX_ALPHA0, JUtility::TColor(mColorAlpha)); + } + + print.printReturn(mStringPtr, (int)(mBounds.getWidth() + 0.0001f), (int)mBounds.getHeight(), + getHBinding(), getVBinding(), field_0x10c, field_0x110, alpha); + } + } +} /* 803078AC-80307AF0 3021EC 0244+00 1/0 0/0 0/0 .text draw__12J2DTextBoxExFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::draw(f32 param_0, f32 param_1) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFff.s" +void J2DTextBoxEx::draw(f32 posX, f32 posY) { + Mtx m; + + if (isVisible()) { + JUTFont* font = NULL; + if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) { + font = mMaterial->getTevBlock()->getFont(); + } + + J2DPrint print(font, mCharSpacing, mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize(mFontSizeX, mFontSizeY); + mColorAlpha = mAlpha; + + if (mMaterial != NULL) { + mMaterial->setGX(); + makeMatrix(posX, posY, 0.0f, 0.0f); + + GXLoadPosMtxImm(mPositionMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + + if (!mMaterial->isVisible()) { + return; + } + + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + + if (mStringPtr != NULL) { + u8 alpha = 255; + if (mMaterial->getMaterialAlphaCalc() == 1) { + alpha = mColorAlpha; + } + + print.print(0.0f, 0.0f, alpha, "%s", mStringPtr); + } + + for (int i = 0; i < 4; i++) { + GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); + } + + GXSetNumIndStages(0); + + for (int i = 0; i < 16; i++) { + GXSetTevDirect((GXTevStageID)i); + } + + PSMTXIdentity(m); + GXLoadPosMtxImm(m, 0); + } + } } -#pragma pop /* 80307AF0-80307D5C 302430 026C+00 1/0 0/0 0/0 .text draw__12J2DTextBoxExFfff18J2DTextBoxHBinding */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::draw(f32 param_0, f32 param_1, f32 param_2, J2DTextBoxHBinding param_3) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/draw__12J2DTextBoxExFfff18J2DTextBoxHBinding.s" +void J2DTextBoxEx::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind) { + Mtx m; + + if (isVisible()) { + JUTFont* font = NULL; + if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) { + font = mMaterial->getTevBlock()->getFont(); + } + + J2DPrint print(font, mCharSpacing, mLineSpacing, mCharColor, mGradientColor, mBlackColor, + mWhiteColor); + print.setFontSize(mFontSizeX, mFontSizeY); + mColorAlpha = mAlpha; + + if (mMaterial != NULL) { + mMaterial->setGX(); + makeMatrix(posX, posY, 0.0f, 0.0f); + + GXLoadPosMtxImm(mPositionMtx, GX_PNMTX0); + GXSetCurrentMtx(0); + + if (!mMaterial->isVisible()) { + return; + } + + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + + if (mStringPtr != NULL) { + u8 alpha = 255; + if (mMaterial->getMaterialAlphaCalc() == 1) { + alpha = mColorAlpha; + } + + print.printReturn(mStringPtr, param_2, 0.0f, hBind, VBIND_TOP, 0.0f, -mFontSizeY, + alpha); + } + + for (int i = 0; i < 4; i++) { + GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA); + } + + GXSetNumIndStages(0); + + for (int i = 0; i < 16; i++) { + GXSetTevDirect((GXTevStageID)i); + } + + PSMTXIdentity(m); + GXLoadPosMtxImm(m, 0); + } + } } -#pragma pop /* 80307D5C-80307DC0 30269C 0064+00 1/0 0/0 0/0 .text setFont__12J2DTextBoxExFP7JUTFont */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setFont(JUTFont* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setFont__12J2DTextBoxExFP7JUTFont.s" +void J2DTextBoxEx::setFont(JUTFont* p_font) { + if (p_font != NULL && mMaterial != NULL && mMaterial->getTevBlock() != NULL) { + mMaterial->getTevBlock()->setFont(p_font); + mFont = p_font; + } } -#pragma pop /* 80307DC0-80307E0C 302700 004C+00 1/0 0/0 0/0 .text getFont__12J2DTextBoxExCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTFont* J2DTextBoxEx::getFont() const { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/getFont__12J2DTextBoxExCFv.s" +JUTFont* J2DTextBoxEx::getFont() const { + if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) { + return mMaterial->getTevBlock()->getFont(); + } + + return NULL; } -#pragma pop /* 80307E0C-80307EF0 30274C 00E4+00 1/1 0/0 0/0 .text setTevOrder__12J2DTextBoxExFb */ #pragma push @@ -273,14 +378,16 @@ asm void J2DTextBoxEx::setTevOrder(bool param_0) { #pragma pop /* 80307EF0-80307F94 302830 00A4+00 1/1 0/0 0/0 .text setTevStage__12J2DTextBoxExFb */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setTevStage(bool param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setTevStage__12J2DTextBoxExFb.s" +void J2DTextBoxEx::setTevStage(bool param_0) { + J2DTevStage* stage = mMaterial->getTevBlock()->getTevStage(0); + + if (!param_0) { + setStage(stage, STAGE_0); + } else { + setStage(stage, STAGE_1); + setStage(mMaterial->getTevBlock()->getTevStage(1), STAGE_2); + } } -#pragma pop /* ############################################################################################## */ /* 803A1DB8-803A1DC4 02E418 000C+00 1/1 0/0 0/0 .rodata @1953 */ @@ -361,43 +468,90 @@ asm void J2DTextBoxEx::setStage(J2DTevStage* param_0, J2DTextBoxEx::stage_enum p /* 8030823C-803082C4 302B7C 0088+00 1/0 0/0 0/0 .text setBlack__12J2DTextBoxExFQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setBlack(JUtility::TColor param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setBlack__12J2DTextBoxExFQ28JUtility6TColor.s" +bool J2DTextBoxEx::setBlack(JUtility::TColor black) { + JUtility::TColor tevBlack; + JUtility::TColor tevWhite; + + if (!getBlackWhite(&tevBlack, &tevWhite)) { + return false; + } else { + return setBlackWhite(black, tevWhite); + } } -#pragma pop /* 803082C4-8030834C 302C04 0088+00 1/0 0/0 0/0 .text setWhite__12J2DTextBoxExFQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setWhite(JUtility::TColor param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setWhite__12J2DTextBoxExFQ28JUtility6TColor.s" +bool J2DTextBoxEx::setWhite(JUtility::TColor white) { + JUtility::TColor tevBlack; + JUtility::TColor tevWhite; + + if (!getBlackWhite(&tevBlack, &tevWhite)) { + return false; + } else { + return setBlackWhite(tevBlack, white); + } } -#pragma pop /* 8030834C-803084CC 302C8C 0180+00 1/0 0/0 0/0 .text * setBlackWhite__12J2DTextBoxExFQ28JUtility6TColorQ28JUtility6TColor */ +#ifdef NONMATCHING +bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { + if (mMaterial == NULL) { + return false; + } + + if (mMaterial->getTevBlock() == NULL) { + return false; + } + + if (!isSetBlackWhite(param_0, param_1)) { + return false; + } + + bool bvar = false; + if (param_0 != 0 || param_1 != -1) { + bvar = true; + } + + mMaterial->getTevBlock()->setTevStageNum(bvar ? 2 : 1); + setTevOrder(bvar); + setTevStage(bvar); + + if (bvar) { + J2DGXColorS10 color0; + color0.r = param_0.r; + color0.g = param_0.g; + color0.b = param_0.b; + color0.a = param_0.a; + mMaterial->getTevBlock()->setTevColor(0, color0); + + J2DGXColorS10 color1; + color1.r = param_1.r; + color1.g = param_1.g; + color1.b = param_1.b; + color1.a = param_1.a; + mMaterial->getTevBlock()->setTevColor(1, color1); + } + + return true; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { +asm bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/setBlackWhite__12J2DTextBoxExFQ28JUtility6TColorQ28JUtility6TColor.s" } #pragma pop +#endif /* 803084CC-80308668 302E0C 019C+00 4/4 0/0 0/0 .text * getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { +asm bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor.s" } @@ -408,7 +562,7 @@ asm void J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const { +asm bool J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor.s" } @@ -418,7 +572,7 @@ asm void J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColo #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::getBlack() const { +asm JUtility::TColor J2DTextBoxEx::getBlack() const { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/getBlack__12J2DTextBoxExCFv.s" } @@ -428,101 +582,93 @@ asm void J2DTextBoxEx::getBlack() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::getWhite() const { +asm JUtility::TColor J2DTextBoxEx::getWhite() const { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/getWhite__12J2DTextBoxExCFv.s" } #pragma pop /* 803087BC-803087DC 3030FC 0020+00 1/0 0/0 0/0 .text setAlpha__12J2DTextBoxExFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAlpha(u8 param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAlpha__12J2DTextBoxExFUc.s" +void J2DTextBoxEx::setAlpha(u8 alpha) { + mAlpha = alpha; + + if (mMaterial == NULL) { + return; + } + + if (mMaterial->getColorBlock()->getMatColor(0) == NULL) { + return; + } + + mMaterial->getColorBlock()->getMatColor(0)->a = alpha; } -#pragma pop /* 803087DC-80308810 30311C 0034+00 1/0 0/0 0/0 .text setCullBack__12J2DTextBoxExF11_GXCullMode */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setCullBack(_GXCullMode param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setCullBack__12J2DTextBoxExF11_GXCullMode.s" +void J2DTextBoxEx::setCullBack(GXCullMode mode) { + mCullMode = mode; + + if (mMaterial != NULL) { + mMaterial->getColorBlock()->setCullMode(mode); + } + + J2DPane::setCullBack(mode); } -#pragma pop /* 80308810-80308828 303150 0018+00 1/0 0/0 0/0 .text rewriteAlpha__12J2DTextBoxExFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::rewriteAlpha() { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/rewriteAlpha__12J2DTextBoxExFv.s" +void J2DTextBoxEx::rewriteAlpha() { + if (mMaterial == NULL) { + return; + } + + mAlpha = mMaterial->getColorBlock()->getMatColor(0)->a; } -#pragma pop /* 80308828-803088B4 303168 008C+00 1/0 0/0 0/0 .text isUsed__12J2DTextBoxExFPC7ResFONT */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::isUsed(ResFONT const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResFONT.s" +bool J2DTextBoxEx::isUsed(ResFONT const* p_font) { + if (getFont() != NULL && getFont()->getResFont() == p_font) { + return true; + } + + return J2DPane::isUsed(p_font); } -#pragma pop /* 803088B4-803088E0 3031F4 002C+00 1/0 0/0 0/0 .text setAnimation__12J2DTextBoxExFP11J2DAnmColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmColor* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP11J2DAnmColor.s" +void J2DTextBoxEx::setAnimation(J2DAnmColor* anm) { + if (mMaterial != NULL) { + mMaterial->setAnimation(anm); + } } -#pragma pop /* 803088E0-8030890C 303220 002C+00 1/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmTextureSRTKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey.s" +void J2DTextBoxEx::setAnimation(J2DAnmTextureSRTKey* anm) { + if (mMaterial != NULL) { + mMaterial->setAnimation(anm); + } } -#pragma pop /* 8030890C-80308938 30324C 002C+00 1/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmTexPattern* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern.s" +void J2DTextBoxEx::setAnimation(J2DAnmTexPattern* anm) { + if (mMaterial != NULL) { + mMaterial->setAnimation(anm); + } } -#pragma pop /* 80308938-80308964 303278 002C+00 1/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmTevRegKey* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey.s" +void J2DTextBoxEx::setAnimation(J2DAnmTevRegKey* anm) { + if (mMaterial != NULL) { + mMaterial->setAnimation(anm); + } } -#pragma pop /* 80308964-8030896C -00001 0008+00 0/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull */ -void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) { - *(u32*)(((u8*)this) + 324) /* this->field_0x144 */ = (u32)(param_0); +void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* anm) { + mVisibilityAnm = anm; } /* 8030896C-803089EC 3032AC 0080+00 1/0 0/0 0/0 .text @@ -530,7 +676,7 @@ void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBoxEx::animationPane(J2DAnmTransform const* param_0) { +asm const J2DAnmTransform* J2DTextBoxEx::animationPane(J2DAnmTransform const* param_0) { nofralloc #include "asm/JSystem/J2DGraph/J2DTextBoxEx/animationPane__12J2DTextBoxExFPC15J2DAnmTransform.s" } @@ -548,14 +694,9 @@ asm void J2DTextBoxEx::setCullBack(bool param_0) { /* 80308A28-80308A48 303368 0020+00 1/0 0/0 0/0 .text isUsed__12J2DTextBoxExFPC7ResTIMG */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::isUsed(ResTIMG const* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/isUsed__12J2DTextBoxExFPC7ResTIMG.s" +bool J2DTextBoxEx::isUsed(ResTIMG const* p_timg) { + return J2DPane::isUsed(p_timg); } -#pragma pop /* 80308A48-80308A4C 303388 0004+00 1/0 0/0 0/0 .text * setAnimation__12J2DTextBoxExFP14J2DAnmVtxColor */ @@ -565,13 +706,8 @@ void J2DTextBoxEx::setAnimation(J2DAnmVtxColor* param_0) { /* 80308A4C-80308A6C 30338C 0020+00 1/0 0/0 0/0 .text setAnimation__12J2DTextBoxExFP10J2DAnmBase */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J2DTextBoxEx::setAnimation(J2DAnmBase* param_0) { - nofralloc -#include "asm/JSystem/J2DGraph/J2DTextBoxEx/setAnimation__12J2DTextBoxExFP10J2DAnmBase.s" +void J2DTextBoxEx::setAnimation(J2DAnmBase* anm) { + J2DPane::setAnimation(anm); } -#pragma pop /* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index 6efc6bc9a16..f9c1f4e7ddc 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -148,7 +148,7 @@ void J3DSys::drawInit() { GXSetCurrentMtx(GX_PNMTX0); GXSetCullMode(GX_CULL_BACK); GXSetCoPlanar(GX_FALSE); - GXSetClipMode(GX_FALSE); + GXSetClipMode(GX_CLIP_ENABLE); GXSetColorUpdate(GX_TRUE); GXSetDither(GX_TRUE); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_NOOP); @@ -244,7 +244,7 @@ void J3DSys::drawInit() { GXSetTevIndirect((GXTevStageID)i, GX_INDTEXSTAGE0, GX_ITF_8, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF, GX_ITW_OFF, GX_FALSE, GX_FALSE, GX_ITBA_OFF); - OSInitFastCast(); + i_OSInitFastCast(); setTexCacheRegion(GX_TEXCACHE_32K); } diff --git a/libs/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp index aa110d6d20a..bb2409f8f57 100644 --- a/libs/JSystem/JAudio2/JAISoundStarter.cpp +++ b/libs/JSystem/JAudio2/JAISoundStarter.cpp @@ -7,27 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct JAISoundID {}; - -struct JAISoundHandle {}; - -struct JAISoundStarter { - /* 802A2F6C */ JAISoundStarter(bool); - /* 802A2F88 */ ~JAISoundStarter(); - /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); -}; - // // Forward References: // diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp index 325c17098c5..7c8438e661f 100644 --- a/libs/JSystem/JAudio2/JASTaskThread.cpp +++ b/libs/JSystem/JAudio2/JASTaskThread.cpp @@ -39,9 +39,6 @@ extern "C" void* __nw__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); extern "C" void __ct__9JKRThreadFP7JKRHeapUlii(); extern "C" void __dt__9JKRThreadFv(); -extern "C" void OSInitThreadQueue(); -extern "C" void OSSleepThread(); -extern "C" void OSWakeupThread(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); extern "C" void _savegpr_28(); diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index b169903d44c..2ee0175cba7 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -560,7 +560,7 @@ void JFWDisplay::threadSleep(s64 time) { s32 status = OSDisableInterrupts(); alarm.appendLink(); - OSSetAlarm(&alarm, time, JFWThreadAlarmHandler); + OSSetAlarm(&alarm, time, (OSAlarmHandler*)JFWThreadAlarmHandler); OSSuspendThread(alarm.getThread()); OSRestoreInterrupts(status); } @@ -681,7 +681,7 @@ static void JFWDrawDoneAlarm() { s32 status = OSDisableInterrupts(); alarm.createAlarm(); alarm.appendLink(); - OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 / 4), JFWGXAbortAlarmHandler); + OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 / 4), (OSAlarmHandler*)JFWGXAbortAlarmHandler); GXDrawDone(); alarm.cancelAlarm(); alarm.removeLink(); diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 05e76ef5c5c..af996a34441 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -205,7 +205,7 @@ bool JKRAramArchive::open(s32 entryNum) { mExpandedSize = (s32*)JKRAllocFromHeap(mHeap, mArcInfoBlock->num_file_entries * 4, abs(align)); if (mExpandedSize == NULL) { - JKRFree(mArcInfoBlock); + i_JKRFree(mArcInfoBlock); mMountMode = UNKNOWN_MOUNT_MODE; goto end; } else { @@ -218,10 +218,10 @@ bool JKRAramArchive::open(s32 entryNum) { mMountDirection == MOUNT_DIRECTION_HEAD ? JKRAramHeap::HEAD : JKRAramHeap::TAIL)); if (mBlock == NULL) { if (mArcInfoBlock != NULL) { - JKRFree(mArcInfoBlock); + i_JKRFree(mArcInfoBlock); } if (mExpandedSize != NULL) { - JKRFree(mExpandedSize); + i_JKRFree(mExpandedSize); } mMountMode = UNKNOWN_MOUNT_MODE; } else { diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index af76d5559bf..7f770f9f0ae 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -200,7 +200,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { } if (command->mAllocatedTransferBuffer) { - JKRFree(buffer); + i_JKRFree(buffer); command->mAllocatedTransferBuffer = false; } } diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 5273d54d47e..1e2ee8eb916 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -113,7 +113,7 @@ JKRDvdArchive::~JKRDvdArchive() { } if (mExpandedSize) { - JKRFree(mExpandedSize); + i_JKRFree(mExpandedSize); mExpandedSize = NULL; } diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index bf368bad545..85ac3e614ca 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -97,12 +97,12 @@ extern "C" u8 mErrorHandler__7JKRHeap[4]; // /* 802CEDB4-802CEE2C 2C96F4 0078+00 0/0 1/1 0/0 .text createRoot__10JKRExpHeapFib */ -JKRExpHeap* JKRExpHeap::createRoot(int param_0, bool errorFlag) { +JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { JKRExpHeap* heap = NULL; if (!sRootHeap) { void* memory; u32 memorySize; - initArena((char**)&memory, &memorySize, param_0); + initArena((char**)&memory, &memorySize, maxHeaps); u8* start = (u8*)memory + ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); u32 alignedSize = memorySize - ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); heap = new (memory) JKRExpHeap(start, alignedSize, NULL, errorFlag); diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 5f9c202d37f..09ee11deebd 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -204,27 +204,27 @@ void* JKRHeap::mUserRamEnd; u32 JKRHeap::mMemorySize; /* 802CE378-802CE428 2C8CB8 00B0+00 0/0 1/1 0/0 .text initArena__7JKRHeapFPPcPUli */ -bool JKRHeap::initArena(char** memory, u32* size, int param_3) { +bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { u32 ram_start; u32 ram_end; - u32 ram; + void* ram; - u32 low = OSGetArenaLo(); - u32 high = OSGetArenaHi(); + void* low = OSGetArenaLo(); + void* high = OSGetArenaHi(); if (low == high) return false; - ram = OSInitAlloc(low, high, param_3); - ram_start = ALIGN_NEXT(ram, 0x20); - ram_end = ALIGN_PREV(high, 0x20); + ram = OSInitAlloc(low, high, maxHeaps); + ram_start = ALIGN_NEXT((u32)ram, 0x20); + ram_end = ALIGN_PREV((u32)high, 0x20); GLOBAL_MEMORY* globalMemory = (GLOBAL_MEMORY*)OSPhysicalToCached(0); mCodeStart = globalMemory; mCodeEnd = (void*)ram_start; mUserRamStart = (void*)ram_start; mUserRamEnd = (void*)ram_end; mMemorySize = globalMemory->memory_size; - OSSetArenaLo(ram_end); - OSSetArenaHi(ram_end); + OSSetArenaLo((void*)ram_end); + OSSetArenaHi((void*)ram_end); *memory = (char*)ram_start; *size = ram_end - ram_start; return true; diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index fa5e48d14bd..5f530435435 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -134,7 +134,6 @@ extern "C" void orderSync__9JKRDecompFPUcPUcUlUl(); extern "C" void prepend__10JSUPtrListFP10JSUPtrLink(); extern "C" void remove__10JSUPtrListFP10JSUPtrLink(); extern "C" void panic_f__12JUTExceptionFPCciPCce(); -extern "C" void DCInvalidateRange(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index efe85ecfb17..a59da1fc76a 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -97,7 +97,7 @@ JKRThread::~JKRThread() { JKRFreeToHeap(mHeap, mStackMemory); JKRFreeToHeap(mHeap, mThreadRecord); } - JKRFree(mMessages); + i_JKRFree(mMessages); } /* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi diff --git a/libs/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp index c4fd67505d8..025aadaa101 100644 --- a/libs/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/JParticle/JPABaseShape.cpp @@ -912,7 +912,7 @@ void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { GXBegin(GX_POINTS, GX_VTXFMT1, 1); GXPosition3f32(ptcl->mPosition.x, ptcl->mPosition.y, ptcl->mPosition.z); GXTexCoord2f32(0.0f, 0.0f); - GXEnd(); + i_GXEnd(); GXSetVtxDesc(GX_VA_POS, GX_INDEX8); GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8); } diff --git a/libs/JSystem/JStage/JSGActor.cpp b/libs/JSystem/JStage/JSGActor.cpp index 124dd22bb15..38a102c933b 100644 --- a/libs/JSystem/JStage/JSGActor.cpp +++ b/libs/JSystem/JStage/JSGActor.cpp @@ -1,160 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGActor -// - #include "JSystem/JStage/JSGActor.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct Vec {}; - -struct JStage { - struct TActor { - /* 80280A48 */ ~TActor(); - /* 80280AA8 */ s32 JSGFGetType() const; - /* 80280AB0 */ void JSGGetTranslation(Vec*) const; - /* 80280AB4 */ void JSGSetTranslation(Vec const&); - /* 80280AB8 */ void JSGGetScaling(Vec*) const; - /* 80280ABC */ void JSGSetScaling(Vec const&); - /* 80280AC0 */ void JSGGetRotation(Vec*) const; - /* 80280AC4 */ void JSGSetRotation(Vec const&); - /* 80280AC8 */ s32 JSGGetShape() const; - /* 80280AD0 */ void JSGSetShape(u32); - /* 80280AD4 */ s32 JSGGetAnimation() const; - /* 80280ADC */ void JSGSetAnimation(u32); - /* 80280AE0 */ void JSGGetAnimationFrame() const; - /* 80280AE8 */ void JSGSetAnimationFrame(f32); - /* 80280AEC */ void JSGGetAnimationFrameMax() const; - /* 80280AF4 */ void JSGGetAnimationTransition() const; - /* 80280AFC */ void JSGSetAnimationTransition(f32); - /* 80280B00 */ s32 JSGGetTextureAnimation() const; - /* 80280B08 */ void JSGSetTextureAnimation(u32); - /* 80280B0C */ void JSGGetTextureAnimationFrame() const; - /* 80280B14 */ void JSGSetTextureAnimationFrame(f32); - /* 80280B18 */ void JSGGetTextureAnimationFrameMax() const; - }; - - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage6TActorFv(); -extern "C" s32 JSGFGetType__Q26JStage6TActorCFv(); -extern "C" void JSGGetTranslation__Q26JStage6TActorCFP3Vec(); -extern "C" void JSGSetTranslation__Q26JStage6TActorFRC3Vec(); -extern "C" void JSGGetScaling__Q26JStage6TActorCFP3Vec(); -extern "C" void JSGSetScaling__Q26JStage6TActorFRC3Vec(); -extern "C" void JSGGetRotation__Q26JStage6TActorCFP3Vec(); -extern "C" void JSGSetRotation__Q26JStage6TActorFRC3Vec(); -extern "C" s32 JSGGetShape__Q26JStage6TActorCFv(); -extern "C" void JSGSetShape__Q26JStage6TActorFUl(); -extern "C" s32 JSGGetAnimation__Q26JStage6TActorCFv(); -extern "C" void JSGSetAnimation__Q26JStage6TActorFUl(); -extern "C" void JSGGetAnimationFrame__Q26JStage6TActorCFv(); -extern "C" void JSGSetAnimationFrame__Q26JStage6TActorFf(); -extern "C" void JSGGetAnimationFrameMax__Q26JStage6TActorCFv(); -extern "C" void JSGGetAnimationTransition__Q26JStage6TActorCFv(); -extern "C" void JSGSetAnimationTransition__Q26JStage6TActorFf(); -extern "C" s32 JSGGetTextureAnimation__Q26JStage6TActorCFv(); -extern "C" void JSGSetTextureAnimation__Q26JStage6TActorFUl(); -extern "C" void JSGGetTextureAnimationFrame__Q26JStage6TActorCFv(); -extern "C" void JSGSetTextureAnimationFrame__Q26JStage6TActorFf(); -extern "C" void JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C45A8-803C4638 0216C8 008C+04 1/1 1/1 0/0 .data __vt__Q26JStage6TActor */ -SECTION_DATA extern void* __vt__Q26JStage6TActor[35 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage6TActorCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGGetTranslation__Q26JStage6TActorCFP3Vec, - (void*)JSGSetTranslation__Q26JStage6TActorFRC3Vec, - (void*)JSGGetScaling__Q26JStage6TActorCFP3Vec, - (void*)JSGSetScaling__Q26JStage6TActorFRC3Vec, - (void*)JSGGetRotation__Q26JStage6TActorCFP3Vec, - (void*)JSGSetRotation__Q26JStage6TActorFRC3Vec, - (void*)JSGGetShape__Q26JStage6TActorCFv, - (void*)JSGSetShape__Q26JStage6TActorFUl, - (void*)JSGGetAnimation__Q26JStage6TActorCFv, - (void*)JSGSetAnimation__Q26JStage6TActorFUl, - (void*)JSGGetAnimationFrame__Q26JStage6TActorCFv, - (void*)JSGSetAnimationFrame__Q26JStage6TActorFf, - (void*)JSGGetAnimationFrameMax__Q26JStage6TActorCFv, - (void*)JSGGetAnimationTransition__Q26JStage6TActorCFv, - (void*)JSGSetAnimationTransition__Q26JStage6TActorFf, - (void*)JSGGetTextureAnimation__Q26JStage6TActorCFv, - (void*)JSGSetTextureAnimation__Q26JStage6TActorFUl, - (void*)JSGGetTextureAnimationFrame__Q26JStage6TActorCFv, - (void*)JSGSetTextureAnimationFrame__Q26JStage6TActorFf, - (void*)JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv, - /* padding */ - NULL, -}; /* 80280A48-80280AA8 27B388 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage6TActorFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TActor::~TActor() { - nofralloc -#include "asm/JSystem/JStage/JSGActor/__dt__Q26JStage6TActorFv.s" -} -#pragma pop +JStage::TActor::~TActor() {} /* 80280AA8-80280AB0 27B3E8 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage6TActorCFv */ s32 JStage::TActor::JSGFGetType() const { @@ -163,35 +10,23 @@ s32 JStage::TActor::JSGFGetType() const { /* 80280AB0-80280AB4 27B3F0 0004+00 1/0 0/0 0/0 .text JSGGetTranslation__Q26JStage6TActorCFP3Vec */ -void JStage::TActor::JSGGetTranslation(Vec* param_0) const { - /* empty function */ -} +void JStage::TActor::JSGGetTranslation(Vec*) const {} /* 80280AB4-80280AB8 27B3F4 0004+00 1/0 0/0 0/0 .text JSGSetTranslation__Q26JStage6TActorFRC3Vec */ -void JStage::TActor::JSGSetTranslation(Vec const& param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetTranslation(Vec const&) {} /* 80280AB8-80280ABC 27B3F8 0004+00 1/0 0/0 0/0 .text JSGGetScaling__Q26JStage6TActorCFP3Vec */ -void JStage::TActor::JSGGetScaling(Vec* param_0) const { - /* empty function */ -} +void JStage::TActor::JSGGetScaling(Vec*) const {} /* 80280ABC-80280AC0 27B3FC 0004+00 1/0 0/0 0/0 .text JSGSetScaling__Q26JStage6TActorFRC3Vec */ -void JStage::TActor::JSGSetScaling(Vec const& param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetScaling(Vec const&) {} /* 80280AC0-80280AC4 27B400 0004+00 1/0 0/0 0/0 .text JSGGetRotation__Q26JStage6TActorCFP3Vec */ -void JStage::TActor::JSGGetRotation(Vec* param_0) const { - /* empty function */ -} +void JStage::TActor::JSGGetRotation(Vec*) const {} /* 80280AC4-80280AC8 27B404 0004+00 1/0 0/0 0/0 .text JSGSetRotation__Q26JStage6TActorFRC3Vec */ -void JStage::TActor::JSGSetRotation(Vec const& param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetRotation(Vec const&) {} /* 80280AC8-80280AD0 27B408 0008+00 1/0 1/0 0/0 .text JSGGetShape__Q26JStage6TActorCFv */ s32 JStage::TActor::JSGGetShape() const { @@ -199,9 +34,7 @@ s32 JStage::TActor::JSGGetShape() const { } /* 80280AD0-80280AD4 27B410 0004+00 1/0 0/0 0/0 .text JSGSetShape__Q26JStage6TActorFUl */ -void JStage::TActor::JSGSetShape(u32 param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetShape(u32) {} /* 80280AD4-80280ADC 27B414 0008+00 1/0 1/0 0/0 .text JSGGetAnimation__Q26JStage6TActorCFv */ s32 JStage::TActor::JSGGetAnimation() const { @@ -209,60 +42,31 @@ s32 JStage::TActor::JSGGetAnimation() const { } /* 80280ADC-80280AE0 27B41C 0004+00 1/0 0/0 0/0 .text JSGSetAnimation__Q26JStage6TActorFUl */ -void JStage::TActor::JSGSetAnimation(u32 param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 804553C8-804553D0 0039C8 0004+04 5/5 0/0 0/0 .sdata2 @343 */ -SECTION_SDATA2 static f32 lit_343[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; +void JStage::TActor::JSGSetAnimation(u32) {} /* 80280AE0-80280AE8 27B420 0008+00 1/0 1/0 0/0 .text JSGGetAnimationFrame__Q26JStage6TActorCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TActor::JSGGetAnimationFrame() const { - nofralloc -#include "asm/JSystem/JStage/JSGActor/JSGGetAnimationFrame__Q26JStage6TActorCFv.s" +f32 JStage::TActor::JSGGetAnimationFrame() const { + return 0.0f; } -#pragma pop /* 80280AE8-80280AEC 27B428 0004+00 1/0 0/0 0/0 .text JSGSetAnimationFrame__Q26JStage6TActorFf */ -void JStage::TActor::JSGSetAnimationFrame(f32 param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetAnimationFrame(f32) {} /* 80280AEC-80280AF4 27B42C 0008+00 1/0 0/0 0/0 .text JSGGetAnimationFrameMax__Q26JStage6TActorCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TActor::JSGGetAnimationFrameMax() const { - nofralloc -#include "asm/JSystem/JStage/JSGActor/JSGGetAnimationFrameMax__Q26JStage6TActorCFv.s" +f32 JStage::TActor::JSGGetAnimationFrameMax() const { + return 0.0f; } -#pragma pop /* 80280AF4-80280AFC 27B434 0008+00 1/0 1/0 0/0 .text * JSGGetAnimationTransition__Q26JStage6TActorCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TActor::JSGGetAnimationTransition() const { - nofralloc -#include "asm/JSystem/JStage/JSGActor/JSGGetAnimationTransition__Q26JStage6TActorCFv.s" +f32 JStage::TActor::JSGGetAnimationTransition() const { + return 0.0f; } -#pragma pop /* 80280AFC-80280B00 27B43C 0004+00 1/0 0/0 0/0 .text * JSGSetAnimationTransition__Q26JStage6TActorFf */ -void JStage::TActor::JSGSetAnimationTransition(f32 param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetAnimationTransition(f32) {} /* 80280B00-80280B08 27B440 0008+00 1/0 1/0 0/0 .text JSGGetTextureAnimation__Q26JStage6TActorCFv */ @@ -272,34 +76,20 @@ s32 JStage::TActor::JSGGetTextureAnimation() const { /* 80280B08-80280B0C 27B448 0004+00 1/0 0/0 0/0 .text JSGSetTextureAnimation__Q26JStage6TActorFUl */ -void JStage::TActor::JSGSetTextureAnimation(u32 param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetTextureAnimation(u32) {} /* 80280B0C-80280B14 27B44C 0008+00 1/0 1/0 0/0 .text * JSGGetTextureAnimationFrame__Q26JStage6TActorCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TActor::JSGGetTextureAnimationFrame() const { - nofralloc -#include "asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrame__Q26JStage6TActorCFv.s" +f32 JStage::TActor::JSGGetTextureAnimationFrame() const { + return 0.0f; } -#pragma pop /* 80280B14-80280B18 27B454 0004+00 1/0 0/0 0/0 .text * JSGSetTextureAnimationFrame__Q26JStage6TActorFf */ -void JStage::TActor::JSGSetTextureAnimationFrame(f32 param_0) { - /* empty function */ -} +void JStage::TActor::JSGSetTextureAnimationFrame(f32) {} /* 80280B18-80280B20 27B458 0008+00 1/0 0/0 0/0 .text * JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TActor::JSGGetTextureAnimationFrameMax() const { - nofralloc -#include "asm/JSystem/JStage/JSGActor/JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv.s" +f32 JStage::TActor::JSGGetTextureAnimationFrameMax() const { + return 0.0f; } -#pragma pop diff --git a/libs/JSystem/JStage/JSGAmbientLight.cpp b/libs/JSystem/JStage/JSGAmbientLight.cpp index f6c28e3e632..69e2b88ec7b 100644 --- a/libs/JSystem/JStage/JSGAmbientLight.cpp +++ b/libs/JSystem/JStage/JSGAmbientLight.cpp @@ -1,132 +1,18 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGAmbientLight -// - #include "JSystem/JStage/JSGAmbientLight.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct _GXColor {}; - -struct JStage { - struct TAmbientLight { - /* 80280B20 */ ~TAmbientLight(); - /* 80280B80 */ s32 JSGFGetType() const; - /* 80280B88 */ void JSGGetColor() const; - /* 80280B9C */ void JSGSetColor(_GXColor); - }; - - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage13TAmbientLightFv(); -extern "C" s32 JSGFGetType__Q26JStage13TAmbientLightCFv(); -extern "C" void JSGGetColor__Q26JStage13TAmbientLightCFv(); -extern "C" void JSGSetColor__Q26JStage13TAmbientLightF8_GXColor(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4638-803C4680 021758 0044+04 1/1 1/1 0/0 .data __vt__Q26JStage13TAmbientLight */ -SECTION_DATA extern void* __vt__Q26JStage13TAmbientLight[17 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage13TAmbientLightCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGGetColor__Q26JStage13TAmbientLightCFv, - (void*)JSGSetColor__Q26JStage13TAmbientLightF8_GXColor, - /* padding */ - NULL, -}; /* 80280B20-80280B80 27B460 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage13TAmbientLightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TAmbientLight::~TAmbientLight() { - nofralloc -#include "asm/JSystem/JStage/JSGAmbientLight/__dt__Q26JStage13TAmbientLightFv.s" -} -#pragma pop +JStage::TAmbientLight::~TAmbientLight() {} /* 80280B80-80280B88 27B4C0 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage13TAmbientLightCFv */ s32 JStage::TAmbientLight::JSGFGetType() const { return 4; } -/* ############################################################################################## */ -/* 804553D0-804553D8 0039D0 0004+04 1/1 0/0 0/0 .sdata2 @302 */ -SECTION_SDATA2 static u32 lit_302[1 + 1 /* padding */] = { - 0xFFFFFFFF, - /* padding */ - 0x00000000, -}; - /* 80280B88-80280B9C 27B4C8 0014+00 1/0 1/0 0/0 .text JSGGetColor__Q26JStage13TAmbientLightCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TAmbientLight::JSGGetColor() const { - nofralloc -#include "asm/JSystem/JStage/JSGAmbientLight/JSGGetColor__Q26JStage13TAmbientLightCFv.s" +GXColor JStage::TAmbientLight::JSGGetColor() const { + return (GXColor){255, 255, 255, 255}; } -#pragma pop /* 80280B9C-80280BA0 27B4DC 0004+00 1/0 0/0 0/0 .text * JSGSetColor__Q26JStage13TAmbientLightF8_GXColor */ -void JStage::TAmbientLight::JSGSetColor(_GXColor param_0) { - /* empty function */ -} +void JStage::TAmbientLight::JSGSetColor(GXColor) {} diff --git a/libs/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/JStage/JSGCamera.cpp index d8012939683..16a72b8a7c6 100644 --- a/libs/JSystem/JStage/JSGCamera.cpp +++ b/libs/JSystem/JStage/JSGCamera.cpp @@ -1,171 +1,8 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGCamera -// - #include "JSystem/JStage/JSGCamera.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct Vec {}; - -struct JStage { - struct TECameraProjection {}; - - struct TECameraView {}; - - struct TCamera { - /* 80280BA0 */ ~TCamera(); - /* 80280C00 */ s32 JSGFGetType() const; - /* 80280C08 */ bool JSGGetProjectionType() const; - /* 80280C10 */ void JSGSetProjectionType(JStage::TECameraProjection); - /* 80280C14 */ void JSGGetProjectionNear() const; - /* 80280C1C */ void JSGSetProjectionNear(f32); - /* 80280C20 */ void JSGGetProjectionFar() const; - /* 80280C2C */ void JSGSetProjectionFar(f32); - /* 80280C30 */ void JSGGetProjectionFovy() const; - /* 80280C38 */ void JSGSetProjectionFovy(f32); - /* 80280C3C */ void JSGGetProjectionAspect() const; - /* 80280C44 */ void JSGSetProjectionAspect(f32); - /* 80280C48 */ void JSGGetProjectionField(f32*) const; - /* 80280C4C */ void JSGSetProjectionField(f32 const*); - /* 80280C50 */ bool JSGGetViewType() const; - /* 80280C58 */ void JSGSetViewType(JStage::TECameraView); - /* 80280C5C */ void JSGGetViewPosition(Vec*) const; - /* 80280C60 */ void JSGSetViewPosition(Vec const&); - /* 80280C64 */ void JSGGetViewUpVector(Vec*) const; - /* 80280C68 */ void JSGSetViewUpVector(Vec const&); - /* 80280C6C */ void JSGGetViewTargetPosition(Vec*) const; - /* 80280C70 */ void JSGSetViewTargetPosition(Vec const&); - /* 80280C74 */ void JSGGetViewRoll() const; - /* 80280C7C */ void JSGSetViewRoll(f32); - }; - - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage7TCameraFv(); -extern "C" s32 JSGFGetType__Q26JStage7TCameraCFv(); -extern "C" bool JSGGetProjectionType__Q26JStage7TCameraCFv(); -extern "C" void JSGSetProjectionType__Q26JStage7TCameraFQ26JStage18TECameraProjection(); -extern "C" void JSGGetProjectionNear__Q26JStage7TCameraCFv(); -extern "C" void JSGSetProjectionNear__Q26JStage7TCameraFf(); -extern "C" void JSGGetProjectionFar__Q26JStage7TCameraCFv(); -extern "C" void JSGSetProjectionFar__Q26JStage7TCameraFf(); -extern "C" void JSGGetProjectionFovy__Q26JStage7TCameraCFv(); -extern "C" void JSGSetProjectionFovy__Q26JStage7TCameraFf(); -extern "C" void JSGGetProjectionAspect__Q26JStage7TCameraCFv(); -extern "C" void JSGSetProjectionAspect__Q26JStage7TCameraFf(); -extern "C" void JSGGetProjectionField__Q26JStage7TCameraCFPf(); -extern "C" void JSGSetProjectionField__Q26JStage7TCameraFPCf(); -extern "C" bool JSGGetViewType__Q26JStage7TCameraCFv(); -extern "C" void JSGSetViewType__Q26JStage7TCameraFQ26JStage12TECameraView(); -extern "C" void JSGGetViewPosition__Q26JStage7TCameraCFP3Vec(); -extern "C" void JSGSetViewPosition__Q26JStage7TCameraFRC3Vec(); -extern "C" void JSGGetViewUpVector__Q26JStage7TCameraCFP3Vec(); -extern "C" void JSGSetViewUpVector__Q26JStage7TCameraFRC3Vec(); -extern "C" void JSGGetViewTargetPosition__Q26JStage7TCameraCFP3Vec(); -extern "C" void JSGSetViewTargetPosition__Q26JStage7TCameraFRC3Vec(); -extern "C" void JSGGetViewRoll__Q26JStage7TCameraCFv(); -extern "C" void JSGSetViewRoll__Q26JStage7TCameraFf(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); -extern "C" extern u32 __float_max; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4680-803C4718 0217A0 0094+04 1/1 1/1 0/0 .data __vt__Q26JStage7TCamera */ -SECTION_DATA extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage7TCameraCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGGetProjectionType__Q26JStage7TCameraCFv, - (void*)JSGSetProjectionType__Q26JStage7TCameraFQ26JStage18TECameraProjection, - (void*)JSGGetProjectionNear__Q26JStage7TCameraCFv, - (void*)JSGSetProjectionNear__Q26JStage7TCameraFf, - (void*)JSGGetProjectionFar__Q26JStage7TCameraCFv, - (void*)JSGSetProjectionFar__Q26JStage7TCameraFf, - (void*)JSGGetProjectionFovy__Q26JStage7TCameraCFv, - (void*)JSGSetProjectionFovy__Q26JStage7TCameraFf, - (void*)JSGGetProjectionAspect__Q26JStage7TCameraCFv, - (void*)JSGSetProjectionAspect__Q26JStage7TCameraFf, - (void*)JSGGetProjectionField__Q26JStage7TCameraCFPf, - (void*)JSGSetProjectionField__Q26JStage7TCameraFPCf, - (void*)JSGGetViewType__Q26JStage7TCameraCFv, - (void*)JSGSetViewType__Q26JStage7TCameraFQ26JStage12TECameraView, - (void*)JSGGetViewPosition__Q26JStage7TCameraCFP3Vec, - (void*)JSGSetViewPosition__Q26JStage7TCameraFRC3Vec, - (void*)JSGGetViewUpVector__Q26JStage7TCameraCFP3Vec, - (void*)JSGSetViewUpVector__Q26JStage7TCameraFRC3Vec, - (void*)JSGGetViewTargetPosition__Q26JStage7TCameraCFP3Vec, - (void*)JSGSetViewTargetPosition__Q26JStage7TCameraFRC3Vec, - (void*)JSGGetViewRoll__Q26JStage7TCameraCFv, - (void*)JSGSetViewRoll__Q26JStage7TCameraFf, - /* padding */ - NULL, -}; +#include "MSL_C/math.h" /* 80280BA0-80280C00 27B4E0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage7TCameraFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TCamera::~TCamera() { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/__dt__Q26JStage7TCameraFv.s" -} -#pragma pop +JStage::TCamera::~TCamera() {} /* 80280C00-80280C08 27B540 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage7TCameraCFv */ @@ -181,93 +18,51 @@ bool JStage::TCamera::JSGGetProjectionType() const { /* 80280C10-80280C14 27B550 0004+00 1/0 1/0 0/0 .text * JSGSetProjectionType__Q26JStage7TCameraFQ26JStage18TECameraProjection */ -void JStage::TCamera::JSGSetProjectionType(JStage::TECameraProjection param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 804553D8-804553E0 0039D8 0004+04 4/4 0/0 0/0 .sdata2 @319 */ -SECTION_SDATA2 static f32 lit_319[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; +void JStage::TCamera::JSGSetProjectionType(JStage::TECameraProjection) {} /* 80280C14-80280C1C 27B554 0008+00 1/0 0/0 0/0 .text JSGGetProjectionNear__Q26JStage7TCameraCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TCamera::JSGGetProjectionNear() const { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/JSGGetProjectionNear__Q26JStage7TCameraCFv.s" +f32 JStage::TCamera::JSGGetProjectionNear() const { + return 0.0f; } -#pragma pop /* 80280C1C-80280C20 27B55C 0004+00 1/0 0/0 0/0 .text JSGSetProjectionNear__Q26JStage7TCameraFf */ -void JStage::TCamera::JSGSetProjectionNear(f32 param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetProjectionNear(f32) {} /* 80280C20-80280C2C 27B560 000C+00 1/0 0/0 0/0 .text JSGGetProjectionFar__Q26JStage7TCameraCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TCamera::JSGGetProjectionFar() const { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/JSGGetProjectionFar__Q26JStage7TCameraCFv.s" +f32 JStage::TCamera::JSGGetProjectionFar() const { + return __float_max[0]; } -#pragma pop /* 80280C2C-80280C30 27B56C 0004+00 1/0 0/0 0/0 .text JSGSetProjectionFar__Q26JStage7TCameraFf */ -void JStage::TCamera::JSGSetProjectionFar(f32 param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetProjectionFar(f32) {} /* 80280C30-80280C38 27B570 0008+00 1/0 0/0 0/0 .text JSGGetProjectionFovy__Q26JStage7TCameraCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TCamera::JSGGetProjectionFovy() const { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/JSGGetProjectionFovy__Q26JStage7TCameraCFv.s" +f32 JStage::TCamera::JSGGetProjectionFovy() const { + return 0.0f; } -#pragma pop /* 80280C38-80280C3C 27B578 0004+00 1/0 0/0 0/0 .text JSGSetProjectionFovy__Q26JStage7TCameraFf */ -void JStage::TCamera::JSGSetProjectionFovy(f32 param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetProjectionFovy(f32) {} /* 80280C3C-80280C44 27B57C 0008+00 1/0 0/0 0/0 .text JSGGetProjectionAspect__Q26JStage7TCameraCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TCamera::JSGGetProjectionAspect() const { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/JSGGetProjectionAspect__Q26JStage7TCameraCFv.s" +f32 JStage::TCamera::JSGGetProjectionAspect() const { + return 0.0f; } -#pragma pop /* 80280C44-80280C48 27B584 0004+00 1/0 0/0 0/0 .text JSGSetProjectionAspect__Q26JStage7TCameraFf */ -void JStage::TCamera::JSGSetProjectionAspect(f32 param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetProjectionAspect(f32) {} /* 80280C48-80280C4C 27B588 0004+00 1/0 1/0 0/0 .text JSGGetProjectionField__Q26JStage7TCameraCFPf */ -void JStage::TCamera::JSGGetProjectionField(f32* param_0) const { - /* empty function */ -} +void JStage::TCamera::JSGGetProjectionField(f32*) const {} /* 80280C4C-80280C50 27B58C 0004+00 1/0 1/0 0/0 .text JSGSetProjectionField__Q26JStage7TCameraFPCf */ -void JStage::TCamera::JSGSetProjectionField(f32 const* param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetProjectionField(f32 const*) {} /* 80280C50-80280C58 27B590 0008+00 1/0 1/0 0/0 .text JSGGetViewType__Q26JStage7TCameraCFv */ bool JStage::TCamera::JSGGetViewType() const { @@ -276,58 +71,37 @@ bool JStage::TCamera::JSGGetViewType() const { /* 80280C58-80280C5C 27B598 0004+00 1/0 1/0 0/0 .text * JSGSetViewType__Q26JStage7TCameraFQ26JStage12TECameraView */ -void JStage::TCamera::JSGSetViewType(JStage::TECameraView param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetViewType(JStage::TECameraView) {} /* 80280C5C-80280C60 27B59C 0004+00 1/0 0/0 0/0 .text JSGGetViewPosition__Q26JStage7TCameraCFP3Vec */ -void JStage::TCamera::JSGGetViewPosition(Vec* param_0) const { - /* empty function */ -} +void JStage::TCamera::JSGGetViewPosition(Vec*) const {} /* 80280C60-80280C64 27B5A0 0004+00 1/0 0/0 0/0 .text JSGSetViewPosition__Q26JStage7TCameraFRC3Vec */ -void JStage::TCamera::JSGSetViewPosition(Vec const& param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetViewPosition(Vec const&) {} /* 80280C64-80280C68 27B5A4 0004+00 1/0 0/0 0/0 .text JSGGetViewUpVector__Q26JStage7TCameraCFP3Vec */ -void JStage::TCamera::JSGGetViewUpVector(Vec* param_0) const { - /* empty function */ -} +void JStage::TCamera::JSGGetViewUpVector(Vec*) const {} /* 80280C68-80280C6C 27B5A8 0004+00 1/0 0/0 0/0 .text JSGSetViewUpVector__Q26JStage7TCameraFRC3Vec */ -void JStage::TCamera::JSGSetViewUpVector(Vec const& param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetViewUpVector(Vec const&) {} /* 80280C6C-80280C70 27B5AC 0004+00 1/0 0/0 0/0 .text * JSGGetViewTargetPosition__Q26JStage7TCameraCFP3Vec */ -void JStage::TCamera::JSGGetViewTargetPosition(Vec* param_0) const { - /* empty function */ -} +void JStage::TCamera::JSGGetViewTargetPosition(Vec*) const {} /* 80280C70-80280C74 27B5B0 0004+00 1/0 0/0 0/0 .text * JSGSetViewTargetPosition__Q26JStage7TCameraFRC3Vec */ -void JStage::TCamera::JSGSetViewTargetPosition(Vec const& param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetViewTargetPosition(Vec const&) {} /* 80280C74-80280C7C 27B5B4 0008+00 1/0 0/0 0/0 .text JSGGetViewRoll__Q26JStage7TCameraCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TCamera::JSGGetViewRoll() const { - nofralloc -#include "asm/JSystem/JStage/JSGCamera/JSGGetViewRoll__Q26JStage7TCameraCFv.s" +f32 JStage::TCamera::JSGGetViewRoll() const { + return 0.0f; } -#pragma pop /* 80280C7C-80280C80 27B5BC 0004+00 1/0 0/0 0/0 .text JSGSetViewRoll__Q26JStage7TCameraFf */ -void JStage::TCamera::JSGSetViewRoll(f32 param_0) { - /* empty function */ -} +void JStage::TCamera::JSGSetViewRoll(f32) {} diff --git a/libs/JSystem/JStage/JSGFog.cpp b/libs/JSystem/JStage/JSGFog.cpp index 762de36e293..192626a42c9 100644 --- a/libs/JSystem/JStage/JSGFog.cpp +++ b/libs/JSystem/JStage/JSGFog.cpp @@ -1,127 +1,8 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGFog -// - #include "JSystem/JStage/JSGFog.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct _GXFogType {}; - -struct _GXColor {}; - -struct JStage { - struct TFog { - /* 80280C80 */ ~TFog(); - /* 80280CE0 */ s32 JSGFGetType() const; - /* 80280CE8 */ bool JSGGetFogFunction() const; - /* 80280CF0 */ void JSGSetFogFunction(_GXFogType); - /* 80280CF4 */ void JSGGetStartZ() const; - /* 80280CFC */ void JSGSetStartZ(f32); - /* 80280D00 */ void JSGGetEndZ() const; - /* 80280D0C */ void JSGSetEndZ(f32); - /* 80280D10 */ void JSGGetColor() const; - /* 80280D24 */ void JSGSetColor(_GXColor); - }; - - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage4TFogFv(); -extern "C" s32 JSGFGetType__Q26JStage4TFogCFv(); -extern "C" bool JSGGetFogFunction__Q26JStage4TFogCFv(); -extern "C" void JSGSetFogFunction__Q26JStage4TFogF10_GXFogType(); -extern "C" void JSGGetStartZ__Q26JStage4TFogCFv(); -extern "C" void JSGSetStartZ__Q26JStage4TFogFf(); -extern "C" void JSGGetEndZ__Q26JStage4TFogCFv(); -extern "C" void JSGSetEndZ__Q26JStage4TFogFf(); -extern "C" void JSGGetColor__Q26JStage4TFogCFv(); -extern "C" void JSGSetColor__Q26JStage4TFogF8_GXColor(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); -extern "C" extern u32 __float_max; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4718-803C4778 021838 005C+04 1/1 1/1 0/0 .data __vt__Q26JStage4TFog */ -SECTION_DATA extern void* __vt__Q26JStage4TFog[23 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage4TFogCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGGetFogFunction__Q26JStage4TFogCFv, - (void*)JSGSetFogFunction__Q26JStage4TFogF10_GXFogType, - (void*)JSGGetStartZ__Q26JStage4TFogCFv, - (void*)JSGSetStartZ__Q26JStage4TFogFf, - (void*)JSGGetEndZ__Q26JStage4TFogCFv, - (void*)JSGSetEndZ__Q26JStage4TFogFf, - (void*)JSGGetColor__Q26JStage4TFogCFv, - (void*)JSGSetColor__Q26JStage4TFogF8_GXColor, - /* padding */ - NULL, -}; +#include "MSL_C/math.h" /* 80280C80-80280CE0 27B5C0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage4TFogFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TFog::~TFog() { - nofralloc -#include "asm/JSystem/JStage/JSGFog/__dt__Q26JStage4TFogFv.s" -} -#pragma pop +JStage::TFog::~TFog() {} /* 80280CE0-80280CE8 27B620 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage4TFogCFv */ s32 JStage::TFog::JSGFGetType() const { @@ -135,64 +16,28 @@ bool JStage::TFog::JSGGetFogFunction() const { /* 80280CF0-80280CF4 27B630 0004+00 1/0 0/0 0/0 .text * JSGSetFogFunction__Q26JStage4TFogF10_GXFogType */ -void JStage::TFog::JSGSetFogFunction(_GXFogType param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 804553E0-804553E4 0039E0 0004+00 1/1 0/0 0/0 .sdata2 @319 */ -SECTION_SDATA2 static u8 lit_319[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; +void JStage::TFog::JSGSetFogFunction(GXFogType) {} /* 80280CF4-80280CFC 27B634 0008+00 1/0 1/0 0/0 .text JSGGetStartZ__Q26JStage4TFogCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TFog::JSGGetStartZ() const { - nofralloc -#include "asm/JSystem/JStage/JSGFog/JSGGetStartZ__Q26JStage4TFogCFv.s" +f32 JStage::TFog::JSGGetStartZ() const { + return 0.0f; } -#pragma pop /* 80280CFC-80280D00 27B63C 0004+00 1/0 0/0 0/0 .text JSGSetStartZ__Q26JStage4TFogFf */ -void JStage::TFog::JSGSetStartZ(f32 param_0) { - /* empty function */ -} +void JStage::TFog::JSGSetStartZ(f32) {} /* 80280D00-80280D0C 27B640 000C+00 1/0 1/0 0/0 .text JSGGetEndZ__Q26JStage4TFogCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TFog::JSGGetEndZ() const { - nofralloc -#include "asm/JSystem/JStage/JSGFog/JSGGetEndZ__Q26JStage4TFogCFv.s" +f32 JStage::TFog::JSGGetEndZ() const { + return __float_max[0]; } -#pragma pop /* 80280D0C-80280D10 27B64C 0004+00 1/0 0/0 0/0 .text JSGSetEndZ__Q26JStage4TFogFf */ -void JStage::TFog::JSGSetEndZ(f32 param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 804553E4-804553E8 0039E4 0004+00 1/1 0/0 0/0 .sdata2 @336 */ -SECTION_SDATA2 static u32 lit_336 = 0xFFFFFFFF; +void JStage::TFog::JSGSetEndZ(f32) {} /* 80280D10-80280D24 27B650 0014+00 1/0 1/0 0/0 .text JSGGetColor__Q26JStage4TFogCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TFog::JSGGetColor() const { - nofralloc -#include "asm/JSystem/JStage/JSGFog/JSGGetColor__Q26JStage4TFogCFv.s" +GXColor JStage::TFog::JSGGetColor() const { + return (GXColor){255, 255, 255, 255}; } -#pragma pop /* 80280D24-80280D28 27B664 0004+00 1/0 0/0 0/0 .text JSGSetColor__Q26JStage4TFogF8_GXColor */ -void JStage::TFog::JSGSetColor(_GXColor param_0) { - /* empty function */ -} +void JStage::TFog::JSGSetColor(GXColor) {} diff --git a/libs/JSystem/JStage/JSGLight.cpp b/libs/JSystem/JStage/JSGLight.cpp index f1341582753..2a91bec0493 100644 --- a/libs/JSystem/JStage/JSGLight.cpp +++ b/libs/JSystem/JStage/JSGLight.cpp @@ -1,144 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGLight -// - #include "JSystem/JStage/JSGLight.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct _GXSpotFn {}; - -struct _GXDistAttnFn {}; - -struct _GXColor {}; - -struct Vec {}; - -struct JStage { - struct TELight {}; - - struct TLight { - /* 80280D28 */ ~TLight(); - /* 80280D88 */ s32 JSGFGetType() const; - /* 80280D90 */ bool JSGGetLightType() const; - /* 80280D98 */ void JSGSetLightType(JStage::TELight); - /* 80280D9C */ void JSGGetColor() const; - /* 80280DB0 */ void JSGSetColor(_GXColor); - /* 80280DB4 */ void JSGGetDistanceAttenuation(f32*, f32*, _GXDistAttnFn*) const; - /* 80280DB8 */ void JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn); - /* 80280DBC */ void JSGGetAngleAttenuation(f32*, _GXSpotFn*) const; - /* 80280DC0 */ void JSGSetAngleAttenuation(f32, _GXSpotFn); - /* 80280DC4 */ void JSGGetPosition(Vec*) const; - /* 80280DC8 */ void JSGSetPosition(Vec const&); - /* 80280DCC */ void JSGGetDirection(Vec*) const; - /* 80280DD0 */ void JSGSetDirection(Vec const&); - }; - - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage6TLightFv(); -extern "C" s32 JSGFGetType__Q26JStage6TLightCFv(); -extern "C" bool JSGGetLightType__Q26JStage6TLightCFv(); -extern "C" void JSGSetLightType__Q26JStage6TLightFQ26JStage7TELight(); -extern "C" void JSGGetColor__Q26JStage6TLightCFv(); -extern "C" void JSGSetColor__Q26JStage6TLightF8_GXColor(); -extern "C" void JSGGetDistanceAttenuation__Q26JStage6TLightCFPfPfP13_GXDistAttnFn(); -extern "C" void JSGSetDistanceAttenuation__Q26JStage6TLightFff13_GXDistAttnFn(); -extern "C" void JSGGetAngleAttenuation__Q26JStage6TLightCFPfP9_GXSpotFn(); -extern "C" void JSGSetAngleAttenuation__Q26JStage6TLightFf9_GXSpotFn(); -extern "C" void JSGGetPosition__Q26JStage6TLightCFP3Vec(); -extern "C" void JSGSetPosition__Q26JStage6TLightFRC3Vec(); -extern "C" void JSGGetDirection__Q26JStage6TLightCFP3Vec(); -extern "C" void JSGSetDirection__Q26JStage6TLightFRC3Vec(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4778-803C47E8 021898 006C+04 1/1 1/1 0/0 .data __vt__Q26JStage6TLight */ -SECTION_DATA extern void* __vt__Q26JStage6TLight[27 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage6TLightCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGGetLightType__Q26JStage6TLightCFv, - (void*)JSGSetLightType__Q26JStage6TLightFQ26JStage7TELight, - (void*)JSGGetPosition__Q26JStage6TLightCFP3Vec, - (void*)JSGSetPosition__Q26JStage6TLightFRC3Vec, - (void*)JSGGetColor__Q26JStage6TLightCFv, - (void*)JSGSetColor__Q26JStage6TLightF8_GXColor, - (void*)JSGGetDistanceAttenuation__Q26JStage6TLightCFPfPfP13_GXDistAttnFn, - (void*)JSGSetDistanceAttenuation__Q26JStage6TLightFff13_GXDistAttnFn, - (void*)JSGGetAngleAttenuation__Q26JStage6TLightCFPfP9_GXSpotFn, - (void*)JSGSetAngleAttenuation__Q26JStage6TLightFf9_GXSpotFn, - (void*)JSGGetDirection__Q26JStage6TLightCFP3Vec, - (void*)JSGSetDirection__Q26JStage6TLightFRC3Vec, - /* padding */ - NULL, -}; /* 80280D28-80280D88 27B668 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage6TLightFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TLight::~TLight() { - nofralloc -#include "asm/JSystem/JStage/JSGLight/__dt__Q26JStage6TLightFv.s" -} -#pragma pop +JStage::TLight::~TLight() {} /* 80280D88-80280D90 27B6C8 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage6TLightCFv */ s32 JStage::TLight::JSGFGetType() const { @@ -152,74 +15,40 @@ bool JStage::TLight::JSGGetLightType() const { /* 80280D98-80280D9C 27B6D8 0004+00 1/0 0/0 0/0 .text * JSGSetLightType__Q26JStage6TLightFQ26JStage7TELight */ -void JStage::TLight::JSGSetLightType(JStage::TELight param_0) { - /* empty function */ -} - -/* ############################################################################################## */ -/* 804553E8-804553F0 0039E8 0004+04 1/1 0/0 0/0 .sdata2 @311 */ -SECTION_SDATA2 static u32 lit_311[1 + 1 /* padding */] = { - 0xFFFFFFFF, - /* padding */ - 0x00000000, -}; +void JStage::TLight::JSGSetLightType(JStage::TELight) {} /* 80280D9C-80280DB0 27B6DC 0014+00 1/0 1/0 0/0 .text JSGGetColor__Q26JStage6TLightCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TLight::JSGGetColor() const { - nofralloc -#include "asm/JSystem/JStage/JSGLight/JSGGetColor__Q26JStage6TLightCFv.s" +GXColor JStage::TLight::JSGGetColor() const { + return (GXColor){255, 255, 255, 255}; } -#pragma pop /* 80280DB0-80280DB4 27B6F0 0004+00 1/0 0/0 0/0 .text JSGSetColor__Q26JStage6TLightF8_GXColor */ -void JStage::TLight::JSGSetColor(_GXColor param_0) { - /* empty function */ -} +void JStage::TLight::JSGSetColor(GXColor) {} /* 80280DB4-80280DB8 27B6F4 0004+00 1/0 1/0 0/0 .text * JSGGetDistanceAttenuation__Q26JStage6TLightCFPfPfP13_GXDistAttnFn */ -void JStage::TLight::JSGGetDistanceAttenuation(f32* param_0, f32* param_1, - _GXDistAttnFn* param_2) const { - /* empty function */ -} +void JStage::TLight::JSGGetDistanceAttenuation(f32*, f32*, GXDistAttnFn*) const {} /* 80280DB8-80280DBC 27B6F8 0004+00 1/0 0/0 0/0 .text * JSGSetDistanceAttenuation__Q26JStage6TLightFff13_GXDistAttnFn */ -void JStage::TLight::JSGSetDistanceAttenuation(f32 param_0, f32 param_1, _GXDistAttnFn param_2) { - /* empty function */ -} +void JStage::TLight::JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn) {} /* 80280DBC-80280DC0 27B6FC 0004+00 1/0 1/0 0/0 .text * JSGGetAngleAttenuation__Q26JStage6TLightCFPfP9_GXSpotFn */ -void JStage::TLight::JSGGetAngleAttenuation(f32* param_0, _GXSpotFn* param_1) const { - /* empty function */ -} +void JStage::TLight::JSGGetAngleAttenuation(f32*, GXSpotFn*) const {} /* 80280DC0-80280DC4 27B700 0004+00 1/0 0/0 0/0 .text * JSGSetAngleAttenuation__Q26JStage6TLightFf9_GXSpotFn */ -void JStage::TLight::JSGSetAngleAttenuation(f32 param_0, _GXSpotFn param_1) { - /* empty function */ -} +void JStage::TLight::JSGSetAngleAttenuation(f32, GXSpotFn) {} /* 80280DC4-80280DC8 27B704 0004+00 1/0 1/0 0/0 .text JSGGetPosition__Q26JStage6TLightCFP3Vec */ -void JStage::TLight::JSGGetPosition(Vec* param_0) const { - /* empty function */ -} +void JStage::TLight::JSGGetPosition(Vec*) const {} /* 80280DC8-80280DCC 27B708 0004+00 1/0 0/0 0/0 .text JSGSetPosition__Q26JStage6TLightFRC3Vec */ -void JStage::TLight::JSGSetPosition(Vec const& param_0) { - /* empty function */ -} +void JStage::TLight::JSGSetPosition(Vec const&) {} /* 80280DCC-80280DD0 27B70C 0004+00 1/0 1/0 0/0 .text JSGGetDirection__Q26JStage6TLightCFP3Vec */ -void JStage::TLight::JSGGetDirection(Vec* param_0) const { - /* empty function */ -} +void JStage::TLight::JSGGetDirection(Vec*) const {} /* 80280DD0-80280DD4 27B710 0004+00 1/0 0/0 0/0 .text JSGSetDirection__Q26JStage6TLightFRC3Vec */ -void JStage::TLight::JSGSetDirection(Vec const& param_0) { - /* empty function */ -} +void JStage::TLight::JSGSetDirection(Vec const&) {} diff --git a/libs/JSystem/JStage/JSGObject.cpp b/libs/JSystem/JStage/JSGObject.cpp index 857a6cf4948..f2be132acbe 100644 --- a/libs/JSystem/JStage/JSGObject.cpp +++ b/libs/JSystem/JStage/JSGObject.cpp @@ -1,102 +1,17 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGObject -// - #include "JSystem/JStage/JSGObject.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct JStage { - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); - -// -// External References: -// - -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C47E8-803C4828 021908 003C+04 1/1 6/6 0/0 .data __vt__Q26JStage7TObject */ -SECTION_DATA extern void* __vt__Q26JStage7TObject[15 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - /* padding */ - NULL, -}; /* 80280DD4-80280E1C 27B714 0048+00 0/0 6/6 0/0 .text __dt__Q26JStage7TObjectFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TObject::~TObject() { - nofralloc -#include "asm/JSystem/JStage/JSGObject/__dt__Q26JStage7TObjectFv.s" -} -#pragma pop +JStage::TObject::~TObject() {} /* 80280E1C-80280E24 27B75C 0008+00 1/0 12/0 0/0 .text JSGGetName__Q26JStage7TObjectCFv */ + bool JStage::TObject::JSGGetName() const { return false; } /* 80280E24-80280E28 27B764 0004+00 1/0 12/0 0/0 .text JSGUpdate__Q26JStage7TObjectFv */ -void JStage::TObject::JSGUpdate() { - /* empty function */ -} +void JStage::TObject::JSGUpdate() {} /* 80280E28-80280E30 27B768 0008+00 1/0 12/0 0/0 .text JSGGetFlag__Q26JStage7TObjectCFv */ @@ -106,58 +21,47 @@ bool JStage::TObject::JSGGetFlag() const { /* 80280E30-80280E34 27B770 0004+00 1/0 12/0 0/0 .text JSGSetFlag__Q26JStage7TObjectFUl */ -void JStage::TObject::JSGSetFlag(u32 param_0) { - /* empty function */ -} +void JStage::TObject::JSGSetFlag(u32) {} /* 80280E34-80280E3C 27B774 0008+00 1/0 12/0 0/0 .text JSGGetData__Q26JStage7TObjectCFUlPvUl */ -bool JStage::TObject::JSGGetData(u32 param_0, void* param_1, u32 param_2) const { +bool JStage::TObject::JSGGetData(u32, void*, u32) const { return false; } /* 80280E3C-80280E40 27B77C 0004+00 1/0 11/0 0/0 .text JSGSetData__Q26JStage7TObjectFUlPCvUl */ -void JStage::TObject::JSGSetData(u32 param_0, void const* param_1, u32 param_2) { - /* empty function */ -} +void JStage::TObject::JSGSetData(u32, void const*, u32) {} /* 80280E40-80280E44 27B780 0004+00 1/0 12/0 0/0 .text * JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl */ -void JStage::TObject::JSGGetParent(JStage::TObject** param_0, u32* param_1) const { - /* empty function */ -} +void JStage::TObject::JSGGetParent(JStage::TObject**, u32*) const {} /* 80280E44-80280E48 27B784 0004+00 1/0 12/0 0/0 .text * JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl */ -void JStage::TObject::JSGSetParent(JStage::TObject* param_0, u32 param_1) { - /* empty function */ -} +void JStage::TObject::JSGSetParent(JStage::TObject*, u32) {} /* 80280E48-80280E4C 27B788 0004+00 1/0 12/0 0/0 .text * JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl */ -void JStage::TObject::JSGSetRelation(bool param_0, JStage::TObject* param_1, u32 param_2) { - /* empty function */ -} +void JStage::TObject::JSGSetRelation(bool, JStage::TObject*, u32) {} /* 80280E4C-80280E54 27B78C 0008+00 1/0 11/0 0/0 .text JSGFindNodeID__Q26JStage7TObjectCFPCc */ -s32 JStage::TObject::JSGFindNodeID(char const* param_0) const { +s32 JStage::TObject::JSGFindNodeID(char const*) const { return -1; } -/* ############################################################################################## */ -/* 804553F0-804553F8 0039F0 0004+04 1/1 0/0 0/0 .sdata2 @338 */ -SECTION_SDATA2 static f32 lit_338[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - /* 80280E54-80280E90 27B794 003C+00 1/0 11/0 0/0 .text * JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JStage::TObject::JSGGetNodeTransformation(u32 param_0, f32 (*param_1)[4]) const { - nofralloc -#include "asm/JSystem/JStage/JSGObject/JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f.s" +int JStage::TObject::JSGGetNodeTransformation(u32, MtxP mtx) const { + mtx[0][0] = 0.0f; + mtx[0][1] = 0.0f; + mtx[0][2] = 0.0f; + mtx[0][3] = 0.0f; + mtx[1][0] = 0.0f; + mtx[1][1] = 0.0f; + mtx[1][2] = 0.0f; + mtx[1][3] = 0.0f; + mtx[2][0] = 0.0f; + mtx[2][1] = 0.0f; + mtx[2][2] = 0.0f; + mtx[2][3] = 0.0f; + return 0; } -#pragma pop diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index 62ae7a01f11..e21642b2e6d 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -1,145 +1,34 @@ -// -// Generated By: dol2asm -// Translation Unit: JSGSystem -// - #include "JSystem/JStage/JSGSystem.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Types: -// - -struct JStage { - struct TObject { - /* 80280DD4 */ ~TObject(); - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; - - struct TEObject {}; - - struct TSystem { - /* 80280E90 */ ~TSystem(); - /* 80280EF0 */ bool JSGFGetType() const; - /* 80280EF8 */ bool JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; - /* 80280F00 */ bool JSGCreateObject(char const*, JStage::TEObject, u32); - /* 80280F08 */ void JSGDestroyObject(JStage::TObject*); - /* 80280F0C */ bool JSGGetSystemData(u32); - /* 80280F14 */ void JSGSetSystemData(u32, u32); - }; -}; - -// -// Forward References: -// - -extern "C" void __dt__Q26JStage7TSystemFv(); -extern "C" bool JSGFGetType__Q26JStage7TSystemCFv(); -extern "C" bool JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject(); -extern "C" bool JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl(); -extern "C" void JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject(); -extern "C" bool JSGGetSystemData__Q26JStage7TSystemFUl(); -extern "C" void JSGSetSystemData__Q26JStage7TSystemFUlUl(); - -// -// External References: -// - -extern "C" void __dt__Q26JStage7TObjectFv(); -extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); -extern "C" void JSGUpdate__Q26JStage7TObjectFv(); -extern "C" bool JSGGetFlag__Q26JStage7TObjectCFv(); -extern "C" void JSGSetFlag__Q26JStage7TObjectFUl(); -extern "C" bool JSGGetData__Q26JStage7TObjectCFUlPvUl(); -extern "C" void JSGSetData__Q26JStage7TObjectFUlPCvUl(); -extern "C" void JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl(); -extern "C" void JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl(); -extern "C" void JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl(); -extern "C" s32 JSGFindNodeID__Q26JStage7TObjectCFPCc(); -extern "C" void JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f(); -extern "C" void __dl__FPv(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C4828-803C4878 021948 0050+00 1/1 1/1 0/0 .data __vt__Q26JStage7TSystem */ -SECTION_DATA extern void* __vt__Q26JStage7TSystem[20] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)NULL, - (void*)JSGFGetType__Q26JStage7TSystemCFv, - (void*)JSGGetName__Q26JStage7TObjectCFv, - (void*)JSGUpdate__Q26JStage7TObjectFv, - (void*)JSGGetFlag__Q26JStage7TObjectCFv, - (void*)JSGSetFlag__Q26JStage7TObjectFUl, - (void*)JSGGetData__Q26JStage7TObjectCFUlPvUl, - (void*)JSGSetData__Q26JStage7TObjectFUlPCvUl, - (void*)JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl, - (void*)JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl, - (void*)JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl, - (void*)JSGFindNodeID__Q26JStage7TObjectCFPCc, - (void*)JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f, - (void*)JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject, - (void*)JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl, - (void*)JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject, - (void*)JSGGetSystemData__Q26JStage7TSystemFUl, - (void*)JSGSetSystemData__Q26JStage7TSystemFUlUl, -}; /* 80280E90-80280EF0 27B7D0 0060+00 0/0 1/1 0/0 .text __dt__Q26JStage7TSystemFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JStage::TSystem::~TSystem() { - nofralloc -#include "asm/JSystem/JStage/JSGSystem/__dt__Q26JStage7TSystemFv.s" -} -#pragma pop +JStage::TSystem::~TSystem() {} /* 80280EF0-80280EF8 27B830 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage7TSystemCFv */ -bool JStage::TSystem::JSGFGetType() const { - return true; +s32 JStage::TSystem::JSGFGetType() const { + return 1; } /* 80280EF8-80280F00 27B838 0008+00 1/0 0/0 0/0 .text * JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ -bool JStage::TSystem::JSGFindObject(JStage::TObject** param_0, char const* param_1, - JStage::TEObject param_2) const { +bool JStage::TSystem::JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const { return true; } /* 80280F00-80280F08 27B840 0008+00 1/0 1/0 0/0 .text * JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl */ -bool JStage::TSystem::JSGCreateObject(char const* param_0, JStage::TEObject param_1, u32 param_2) { +bool JStage::TSystem::JSGCreateObject(char const*, JStage::TEObject, u32) { return false; } /* 80280F08-80280F0C 27B848 0004+00 1/0 1/0 0/0 .text * JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject */ -void JStage::TSystem::JSGDestroyObject(JStage::TObject* param_0) { - /* empty function */ -} +void JStage::TSystem::JSGDestroyObject(JStage::TObject*) {} /* 80280F0C-80280F14 27B84C 0008+00 1/0 1/0 0/0 .text JSGGetSystemData__Q26JStage7TSystemFUl */ -bool JStage::TSystem::JSGGetSystemData(u32 param_0) { +bool JStage::TSystem::JSGGetSystemData(u32) { return false; } /* 80280F14-80280F18 27B854 0004+00 1/0 1/0 0/0 .text JSGSetSystemData__Q26JStage7TSystemFUlUl */ -void JStage::TSystem::JSGSetSystemData(u32 param_0, u32 param_1) { - /* empty function */ -} +void JStage::TSystem::JSGSetSystemData(u32, u32) {} diff --git a/libs/JSystem/JStudio/JStudio/ctb-data.cpp b/libs/JSystem/JStudio/JStudio/ctb-data.cpp index 1b16aed360e..188a30d5111 100644 --- a/libs/JSystem/JStudio/JStudio/ctb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/ctb-data.cpp @@ -1,45 +1,8 @@ -// -// Generated By: dol2asm -// Translation Unit: ctb-data -// - -#include "JSystem/JStudio/JStudio/ctb-data.h" +#include "JSystem/JStudio/JStudio/ctb.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -namespace JStudio { -namespace ctb { -struct data { - static u32 ga4cSignature[1 + 1 /* padding */]; -}; - -}; // namespace ctb - -}; // namespace JStudio - -// -// Forward References: -// - -extern "C" u32 ga4cSignature__Q37JStudio3ctb4data[1 + 1 /* padding */]; - -// -// External References: -// - -// -// Declarations: -// - /* ############################################################################################## */ /* 804553F8-80455400 0039F8 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q37JStudio3ctb4data */ -SECTION_SDATA2 u32 JStudio::ctb::data::ga4cSignature[1 + 1 /* padding */] = { - 0x43544200, - /* padding */ - 0x00000000, -}; +SECTION_SDATA2 u32 JStudio::ctb::data::ga4cSignature = 'CTB\0'; diff --git a/libs/JSystem/JStudio/JStudio/ctb.cpp b/libs/JSystem/JStudio/JStudio/ctb.cpp index 71a7a449474..6d2f7467a54 100644 --- a/libs/JSystem/JStudio/JStudio/ctb.cpp +++ b/libs/JSystem/JStudio/JStudio/ctb.cpp @@ -4,7 +4,6 @@ // #include "JSystem/JStudio/JStudio/ctb.h" -#include "JSystem/JGadget/binary.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -12,76 +11,13 @@ // Types: // -namespace JStudio { -namespace ctb { -struct TObject { - /* 80280F18 */ ~TObject(); -}; - -struct data { - struct TParse_TBlock {}; - - static u32 ga4cSignature[1 + 1 /* padding */]; -}; - -struct TObject_TxyzRy { - /* 80280F60 */ TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const&); - /* 80280FBC */ bool getScheme() const; - /* 80281554 */ ~TObject_TxyzRy(); -}; - -struct TControl { - /* 80280FC4 */ TControl(); - /* 80280FF4 */ ~TControl(); - /* 80281060 */ void appendObject(JStudio::ctb::TObject*); - /* 802810AC */ void removeObject(JStudio::ctb::TObject*); - /* 802810DC */ void destroyObject(JStudio::ctb::TObject*); - /* 8028112C */ void destroyObject_all(); - /* 80281190 */ void getObject(void const*, u32); - /* 80281230 */ void getObject_index(u32); -}; - -struct TFactory { - /* 80281274 */ ~TFactory(); - /* 802812BC */ void create(JStudio::ctb::data::TParse_TBlock const&); - /* 80281320 */ void destroy(JStudio::ctb::TObject*); -}; - -struct TParse { - /* 8028135C */ TParse(JStudio::ctb::TControl*); - /* 8028137C */ ~TParse(); - /* 802813DC */ void parseHeader_next(void const**, u32*, u32); - /* 80281470 */ void parseBlock_next(void const**, u32*, u32); -}; - -}; // namespace ctb - -namespace object { -struct TPRObject_ID_equal {}; - -struct TIDData { - /* 80288988 */ void isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&); -}; -}; // namespace object - -}; // namespace JStudio - -namespace JGadget { -template -struct TLinkList {}; -/* TLinkList */ -struct TLinkList__template0 { - struct iterator {}; -}; -}; // namespace JGadget - namespace std { template void find_if(/* ... */); /* 802815B4 */ /* std::find_if::iterator, JStudio::object::TPRObject_ID_equal> */ -void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator, - JGadget::TLinkList__template0::iterator, JStudio::object::TPRObject_ID_equal); +void func_802815B4(void* _this, JGadget::TLinkList::iterator, + JGadget::TLinkList::iterator, JStudio::object::TPRObject_ID_equal); }; // namespace std // @@ -107,8 +43,8 @@ extern "C" void __dt__Q37JStudio3ctb6TParseFv(); extern "C" void parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl(); extern "C" void parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl(); extern "C" void __dt__Q37JStudio3ctb14TObject_TxyzRyFv(); -extern "C" void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator, - JGadget::TLinkList__template0::iterator, +extern "C" void func_802815B4(void* _this, JGadget::TLinkList::iterator, + JGadget::TLinkList::iterator, JStudio::object::TPRObject_ID_equal); // @@ -222,7 +158,8 @@ asm JStudio::ctb::TControl::TControl() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::ctb::TControl::~TControl() { +// asm JStudio::ctb::TControl::~TControl() { +extern "C" asm void __dt__Q37JStudio3ctb8TControlFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/ctb/__dt__Q37JStudio3ctb8TControlFv.s" } @@ -297,7 +234,8 @@ asm void JStudio::ctb::TControl::getObject_index(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::ctb::TFactory::~TFactory() { +// asm JStudio::ctb::TFactory::~TFactory() { +extern "C" asm void __dt__Q37JStudio3ctb8TFactoryFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/ctb/__dt__Q37JStudio3ctb8TFactoryFv.s" } @@ -340,7 +278,8 @@ asm JStudio::ctb::TParse::TParse(JStudio::ctb::TControl* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::ctb::TParse::~TParse() { +// asm JStudio::ctb::TParse::~TParse() { +extern "C" asm void __dt__Q37JStudio3ctb6TParseFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/ctb/__dt__Q37JStudio3ctb6TParseFv.s" } @@ -372,7 +311,8 @@ asm void JStudio::ctb::TParse::parseBlock_next(void const** param_0, u32* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::ctb::TObject_TxyzRy::~TObject_TxyzRy() { +// asm JStudio::ctb::TObject_TxyzRy::~TObject_TxyzRy() { +extern "C" asm void __dt__Q37JStudio3ctb14TObject_TxyzRyFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/ctb/__dt__Q37JStudio3ctb14TObject_TxyzRyFv.s" } @@ -384,8 +324,8 @@ asm JStudio::ctb::TObject_TxyzRy::~TObject_TxyzRy() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm void func_802815B4(void* _this, JGadget::TLinkList__template0::iterator param_0, - JGadget::TLinkList__template0::iterator param_1, +extern "C" asm void func_802815B4(void* _this, JGadget::TLinkList::iterator param_0, + JGadget::TLinkList::iterator param_1, JStudio::object::TPRObject_ID_equal param_2) { nofralloc #include "asm/JSystem/JStudio/JStudio/ctb/func_802815B4.s" diff --git a/libs/JSystem/JStudio/JStudio/fvb-data.cpp b/libs/JSystem/JStudio/JStudio/fvb-data.cpp index c9f65f94e93..38cafe02de0 100644 --- a/libs/JSystem/JStudio/JStudio/fvb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb-data.cpp @@ -1,7 +1,4 @@ -namespace JStudio { -namespace fvb { -namespace data { -extern const char ga4cSignature[] = "FVB"; -} // namespace data -} // namespace fvb -} // namespace JStudio +#include "JSystem/JStudio/JStudio/fvb-data.h" + +extern const char JStudio::fvb::data::ga4cSignature[4] = "FVB"; + diff --git a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp index 6b9b6c7afe6..5ff653011ae 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -4,74 +4,10 @@ // #include "JSystem/JStudio/JStudio/jstudio-control.h" -#include "JSystem/JGadget/binary.h" -#include "JSystem/JStudio/JStudio/fvb.h" -#include "JSystem/JStudio/JStudio/stb.h" +#include "JSystem/JStudio/JStudio/jstudio-data.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct Vec {}; - -namespace JStudio { -struct TCreateObject { - /* 80285488 */ ~TCreateObject(); -}; - -struct TFactory { - /* 802854D0 */ ~TFactory(); - /* 80285560 */ void appendCreateObject(JStudio::TCreateObject*); - /* 802855AC */ void create(JStudio::stb::data::TParse_TBlock_object const&); -}; - -namespace ctb { -struct TObject {}; - -struct TControl { - /* 80280FC4 */ TControl(); - /* 80280FF4 */ ~TControl(); - /* 80281230 */ void getObject_index(u32); -}; - -struct TFactory { - /* 80281274 */ ~TFactory(); -}; - -struct TParse { - /* 8028135C */ TParse(JStudio::ctb::TControl*); - /* 8028137C */ ~TParse(); -}; - -}; // namespace ctb - -struct TControl { - /* 80285114 */ TControl(); - /* 802851AC */ ~TControl(); - /* 80285228 */ void setFactory(JStudio::TFactory*); - /* 80285250 */ void transformOnSet_setOrigin_TxyzRy(Vec const&, f32); - /* 802852D0 */ void transformOnGet_setOrigin_TxyzRy(Vec const&, f32); - /* 80285368 */ void transform_setOrigin_ctb(JStudio::ctb::TObject const&); - /* 8028543C */ void transform_setOrigin_ctb_index(u32); -}; - -struct TParse { - /* 8028566C */ TParse(JStudio::TControl*); - /* 802856A8 */ ~TParse(); - /* 80285708 */ void parseHeader(JStudio::stb::data::TParse_THeader const&, u32); - /* 802857E4 */ void parseBlock_block(JStudio::stb::data::TParse_TBlock const&, u32); - /* 80285844 */ void parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const&, u32); - /* 802858F0 */ void parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const&, u32); -}; - -struct data { - static u8 ga8cSignature[8]; -}; - -}; // namespace JStudio - // // Forward References: // @@ -125,10 +61,6 @@ extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(); extern "C" void __dt__Q27JGadget13TNodeLinkListFv(); extern "C" void Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXRotRad(); -extern "C" void PSMTXTrans(); -extern "C" void PSMTXTransApply(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); @@ -285,7 +217,8 @@ asm JStudio::TCreateObject::~TCreateObject() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TFactory::~TFactory() { +// asm JStudio::TFactory::~TFactory() { +extern "C" asm void __dt__Q27JStudio8TFactoryFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-control/__dt__Q27JStudio8TFactoryFv.s" } @@ -328,7 +261,8 @@ asm JStudio::TParse::TParse(JStudio::TControl* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TParse::~TParse() { +// asm JStudio::TParse::~TParse() { +extern "C" asm void __dt__Q27JStudio6TParseFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-control/__dt__Q27JStudio6TParseFv.s" } diff --git a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp index efe27e89810..d2581d22625 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp @@ -1,5 +1,3 @@ -namespace JStudio { -namespace data { -extern const char ga8cSignature[] = "jstudio"; -} // namespace data -} // namespace JStudio +#include "JSystem/JStudio/JStudio/jstudio-data.h" + +extern const char JStudio::data::ga8cSignature[8] = "jstudio"; diff --git a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp index e16da8f1724..9e5691230c3 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -7,21 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct Vec {}; - -namespace JStudio { -struct math { - /* 802859DC */ void getRotation_xyz(f32 (*)[4], f32, f32, f32); - /* 80285B44 */ void getTransformation_SRxyzT(f32 (*)[4], Vec const&, Vec const&, Vec const&); - /* 80285BCC */ void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, f32 const (*)[4]); -}; - -}; // namespace JStudio - // // Forward References: // @@ -34,10 +19,6 @@ extern "C" void getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4 // External References: // -extern "C" void PSMTXConcat(); -extern "C" void PSMTXTransApply(); -extern "C" void PSMTXScale(); -extern "C" void PSVECMag(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); @@ -68,7 +49,7 @@ SECTION_SDATA2 static u8 lit_489[4] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JStudio::math::getRotation_xyz(f32 (*param_0)[4], f32 param_1, f32 param_2, f32 param_3) { +asm void JStudio::math::getRotation_xyz(MtxP param_0, f32 param_1, f32 param_2, f32 param_3) { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-math/getRotation_xyz__Q27JStudio4mathFPA4_ffff.s" } @@ -79,7 +60,7 @@ asm void JStudio::math::getRotation_xyz(f32 (*param_0)[4], f32 param_1, f32 para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JStudio::math::getTransformation_SRxyzT(f32 (*param_0)[4], Vec const& param_1, +asm void JStudio::math::getTransformation_SRxyzT(MtxP param_0, Vec const& param_1, Vec const& param_2, Vec const& param_3) { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-math/getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec.s" @@ -117,7 +98,7 @@ SECTION_SDATA2 static f64 lit_628 = 57.29577951308232; #pragma optimization_level 0 #pragma optimizewithasm off asm void JStudio::math::getFromTransformation_SRxyzT(Vec* param_0, Vec* param_1, Vec* param_2, - f32 const (*param_3)[4]) { + CMtxP param_3) { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-math/getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf.s" } diff --git a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp index 3580ce4e508..74c0442859a 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -4,208 +4,9 @@ // #include "JSystem/JStudio/JStudio/jstudio-object.h" -#include "JSystem/JStudio/JStudio/fvb.h" -#include "JSystem/JStudio/JStudio/stb.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct _GXColor {}; - -struct Vec {}; - -namespace JStudio { -struct TControl {}; - -struct data { - struct TEOperationData {}; -}; - -struct TAdaptor { - struct TSetVariableValue_immediate {}; - - /* 80285FD0 */ ~TAdaptor(); - /* 80286018 */ void adaptor_do_prepare(); - /* 8028601C */ void adaptor_do_begin(); - /* 80286020 */ void adaptor_do_end(); - /* 80286024 */ void adaptor_do_update(u32); - /* 80286028 */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 8028602C */ void adaptor_setVariableValue(JStudio::TControl*, u32, - JStudio::data::TEOperationData, void const*, u32); - /* 802860CC */ void adaptor_setVariableValue_n(JStudio::TControl*, u32 const*, u32, - JStudio::data::TEOperationData, void const*, - u32); - /* 802861C0 */ void - adaptor_setVariableValue_immediate(JStudio::TAdaptor::TSetVariableValue_immediate const*); - /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; - /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&); - /* 8028638C */ void adaptor_getVariableValue_GXColor(_GXColor*, u32 const*) const; - /* 802864D8 */ void adaptor_updateVariableValue(JStudio::TControl*, u32); - /* 8028656C */ void adaptor_setVariableValue_VOID_(JStudio::TAdaptor*, JStudio::TControl*, u32, - void const*, u32); - /* 80286584 */ void adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor*, JStudio::TControl*, - u32, void const*, u32); - /* 802865B0 */ void adaptor_setVariableValue_TIME_(JStudio::TAdaptor*, JStudio::TControl*, u32, - void const*, u32); - /* 802865DC */ void adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor*, JStudio::TControl*, - u32, void const*, u32); - /* 80286648 */ void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*, - u32, void const*, u32); -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - struct TOutput_none_ { - /* 80285F6C */ ~TOutput_none_(); - /* 80285FCC */ void operator()(f32, JStudio::TAdaptor*) const; - }; - - /* 80285E54 */ void update(f64, JStudio::TAdaptor*); - /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); - /* 80285ECC */ void update_time_(JStudio::TVariableValue*, f64); - /* 80285F08 */ void update_functionValue_(JStudio::TVariableValue*, f64); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TObject { - /* 802866B0 */ ~TObject(); - /* 80286734 */ void forward_value(u32); - /* 8028679C */ void do_begin(); - /* 802867D4 */ void do_end(); - /* 8028680C */ void do_wait(u32); - /* 8028682C */ void do_data(void const*, u32, void const*, u32); - /* 80286864 */ TObject(JStudio::stb::data::TParse_TBlock_object const&, JStudio::TAdaptor*); -}; - -struct TAdaptor_actor { - /* 802868B0 */ ~TAdaptor_actor(); - - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; -}; - -struct TObject_actor { - /* 80286910 */ TObject_actor(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_actor*); - /* 8028694C */ void do_paragraph(u32, void const*, u32); - /* 802881A4 */ ~TObject_actor(); -}; - -struct TAdaptor_ambientLight { - /* 80286C9C */ ~TAdaptor_ambientLight(); - - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; -}; - -struct TObject_ambientLight { - /* 80286CFC */ TObject_ambientLight(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_ambientLight*); - /* 80286D38 */ void do_paragraph(u32, void const*, u32); - /* 80288144 */ ~TObject_ambientLight(); -}; - -struct TAdaptor_camera { - /* 80286E1C */ ~TAdaptor_camera(); - - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; - static u8 sauVariableValue_2_DISTANCE_NEAR_FAR[8]; -}; - -struct TObject_camera { - /* 80286E7C */ TObject_camera(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_camera*); - /* 80286EB8 */ void do_paragraph(u32, void const*, u32); - /* 802880E4 */ ~TObject_camera(); -}; - -struct TAdaptor_fog { - /* 8028717C */ ~TAdaptor_fog(); - - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 sauVariableValue_2_RANGE_BEGIN_END[8]; -}; - -struct TObject_fog { - /* 802871DC */ TObject_fog(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_fog*); - /* 80287218 */ void do_paragraph(u32, void const*, u32); - /* 80288084 */ ~TObject_fog(); -}; - -struct TAdaptor_light { - /* 80287308 */ ~TAdaptor_light(); - - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; - static u8 sauVariableValue_2_DIRECTION_THETA_PHI[8]; -}; - -struct TObject_light { - /* 80287368 */ TObject_light(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_light*); - /* 802873A4 */ void do_paragraph(u32, void const*, u32); - /* 80288024 */ ~TObject_light(); -}; - -struct TAdaptor_message { - /* 802875E0 */ ~TAdaptor_message(); -}; - -struct TObject_message { - /* 80287640 */ TObject_message(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_message*); - /* 8028767C */ void do_paragraph(u32, void const*, u32); - /* 80287FC4 */ ~TObject_message(); -}; - -struct TAdaptor_particle { - /* 8028770C */ ~TAdaptor_particle(); - - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; - static u8 const sauVariableValue_3_COLOR_RGB[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 const sauVariableValue_3_COLOR1_RGB[12]; - static u8 const sauVariableValue_4_COLOR1_RGBA[16]; -}; - -struct TObject_particle { - /* 8028776C */ TObject_particle(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_particle*); - /* 802877A8 */ void do_paragraph(u32, void const*, u32); - /* 80287F64 */ ~TObject_particle(); -}; - -struct TAdaptor_sound { - /* 80287B3C */ ~TAdaptor_sound(); - - static u8 const sauVariableValue_3_POSITION_XYZ[12]; -}; - -struct TObject_sound { - /* 80287B9C */ TObject_sound(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_sound*); - /* 80287BD8 */ void do_paragraph(u32, void const*, u32); - /* 80287F04 */ ~TObject_sound(); -}; - -}; // namespace JStudio - // // Forward References: // @@ -1596,7 +1397,8 @@ asm JStudio::TAdaptor::~TAdaptor() { #pragma pop /* 80286018-8028601C 280958 0004+00 8/0 2/0 0/0 .text adaptor_do_prepare__Q27JStudio8TAdaptorFv */ -void JStudio::TAdaptor::adaptor_do_prepare() { +// void JStudio::TAdaptor::adaptor_do_prepare() { +extern "C" void adaptor_do_prepare__Q27JStudio8TAdaptorFv() { /* empty function */ } @@ -1692,7 +1494,7 @@ asm void JStudio::TAdaptor::adaptor_getVariableValue_Vec(Vec* param_0, u32 const #pragma optimization_level 0 #pragma optimizewithasm off asm void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* param_0, - _GXColor const& param_1) { + GXColor const& param_1) { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor.s" } @@ -1715,7 +1517,7 @@ SECTION_SDATA2 static f32 lit_1095 = 255.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(_GXColor* param_0, +asm void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_0, u32 const* param_1) const { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl.s" @@ -1830,7 +1632,8 @@ asm void JStudio::TObject::forward_value(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void JStudio::TObject::do_begin() { +// asm void JStudio::TObject::do_begin() { +extern "C" asm void do_begin__Q27JStudio7TObjectFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/do_begin__Q27JStudio7TObjectFv.s" } @@ -2396,7 +2199,8 @@ asm void JStudio::TObject_sound::do_paragraph(u32 param_0, void const* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_sound::~TObject_sound() { +// asm JStudio::TObject_sound::~TObject_sound() { +extern "C" asm void __dt__Q27JStudio13TObject_soundFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio13TObject_soundFv.s" } @@ -2406,7 +2210,8 @@ asm JStudio::TObject_sound::~TObject_sound() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_particle::~TObject_particle() { +// asm JStudio::TObject_particle::~TObject_particle() { +extern "C" asm void __dt__Q27JStudio16TObject_particleFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio16TObject_particleFv.s" } @@ -2417,7 +2222,8 @@ asm JStudio::TObject_particle::~TObject_particle() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_message::~TObject_message() { +// asm JStudio::TObject_message::~TObject_message() { +extern "C" asm void __dt__Q27JStudio15TObject_messageFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio15TObject_messageFv.s" } @@ -2428,7 +2234,8 @@ asm JStudio::TObject_message::~TObject_message() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_light::~TObject_light() { +// asm JStudio::TObject_light::~TObject_light() { +extern "C" asm void __dt__Q27JStudio13TObject_lightFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio13TObject_lightFv.s" } @@ -2438,7 +2245,8 @@ asm JStudio::TObject_light::~TObject_light() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_fog::~TObject_fog() { +// asm JStudio::TObject_fog::~TObject_fog() { +extern "C" asm void __dt__Q27JStudio11TObject_fogFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio11TObject_fogFv.s" } @@ -2449,7 +2257,8 @@ asm JStudio::TObject_fog::~TObject_fog() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_camera::~TObject_camera() { +// asm JStudio::TObject_camera::~TObject_camera() { +extern "C" asm void __dt__Q27JStudio14TObject_cameraFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio14TObject_cameraFv.s" } @@ -2459,7 +2268,8 @@ asm JStudio::TObject_camera::~TObject_camera() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_ambientLight::~TObject_ambientLight() { +// asm JStudio::TObject_ambientLight::~TObject_ambientLight() { +extern "C" asm void __dt__Q27JStudio20TObject_ambientLightFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio20TObject_ambientLightFv.s" } @@ -2470,7 +2280,8 @@ asm JStudio::TObject_ambientLight::~TObject_ambientLight() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio::TObject_actor::~TObject_actor() { +// asm JStudio::TObject_actor::~TObject_actor() { +extern "C" asm void __dt__Q27JStudio13TObject_actorFv() { nofralloc #include "asm/JSystem/JStudio/JStudio/jstudio-object/__dt__Q27JStudio13TObject_actorFv.s" } diff --git a/libs/JSystem/JStudio/JStudio/object-id.cpp b/libs/JSystem/JStudio/JStudio/object-id.cpp index cdd9cbb9daa..783de1b1a5c 100644 --- a/libs/JSystem/JStudio/JStudio/object-id.cpp +++ b/libs/JSystem/JStudio/JStudio/object-id.cpp @@ -7,10 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - // // Forward References: // @@ -18,10 +14,6 @@ extern "C" void isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData(); -// -// External References: -// - // // Declarations: // diff --git a/libs/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/JStudio/JStudio/stb-data.cpp index 8ea69d95d8d..d700169d101 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data.cpp @@ -1,9 +1,6 @@ #include "dolphin/types.h" -namespace JStudio { -namespace stb { -namespace data { -extern const s32 gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40}; -extern const char ga4cSignature[] = "STB"; -} // namespace data -} // namespace stb -} // namespace JStudio +#include "JSystem/JStudio/JStudio/stb-data.h" +#include "dol2asm.h" + +const s32 JStudio::stb::data::gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40}; +SECTION_SDATA2 u32 JStudio::stb::data::ga4cSignature = 'STB\0'; diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp index 4f09284ed72..3ff947cc70b 100644 --- a/libs/JSystem/JStudio/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/JStudio/stb.cpp @@ -397,7 +397,7 @@ asm void TControl::reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void TControl::forward(u32 param_0) { +asm u8 TControl::forward(u32 param_0) { nofralloc #include "asm/JSystem/JStudio/JStudio/stb/forward__Q37JStudio3stb8TControlFUl.s" } diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp index 28a2ddff298..51c0484fb06 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -7,47 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -namespace JStudio { -struct TObject {}; - -namespace stb { -struct data { - struct TParse_TBlock_object {}; -}; - -}; // namespace stb - -struct TCreateObject { - /* 80285488 */ ~TCreateObject(); -}; - -struct TAdaptor_sound {}; - -struct TObject_sound { - /* 80287B9C */ TObject_sound(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_sound*); -}; - -}; // namespace JStudio - -struct JStudio_JAudio2 { - struct TCreateObject { - /* 8028D550 */ ~TCreateObject(); - /* 8028D5B0 */ void create(JStudio::TObject**, - JStudio::stb::data::TParse_TBlock_object const&); - /* 8028D624 */ void createObject_JAI_SOUND_(JStudio::stb::data::TParse_TBlock_object const&, - JStudio_JAudio2::TCreateObject*); - }; - - struct TAdaptor_sound { - /* 8028D828 */ TAdaptor_sound(JStudio_JAudio2::TCreateObject*); - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 3557ff8f3e4..4d46fd661e3 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -6,132 +6,7 @@ #include "JSystem/JStudio/JStudio_JAudio2/object-sound.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct Vec {}; - -struct JStage { - struct TObject {}; -}; - -namespace JStudio { -struct data { - struct TEOperationData {}; -}; - -struct TAdaptor { - struct TSetVariableValue_immediate {}; - - /* 8028601C */ void adaptor_do_begin(); - /* 80286028 */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 802861C0 */ void - adaptor_setVariableValue_immediate(JStudio::TAdaptor::TSetVariableValue_immediate const*); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - /* 8028B568 */ TVariableValue(); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TAdaptor_sound { - /* 80287B3C */ ~TAdaptor_sound(); - - static u8 const sauVariableValue_3_POSITION_XYZ[12]; -}; - -struct TControl { - struct TTransform_position {}; -}; - -}; // namespace JStudio - -struct JStudio_JStage { - /* 8028A290 */ void transform_toGlobalFromLocal(f32 (*)[4], - JStudio::TControl::TTransform_position const&, - JStage::TObject const*, u32); -}; - -struct JStudio_JAudio2 { - struct TCreateObject {}; - - struct TAdaptor_sound { - struct TVVOSetValue_ { - /* 8028DECC */ void operator()(f32, JStudio::TAdaptor*) const; - /* 8028E094 */ ~TVVOSetValue_(); - }; - - /* 8028D828 */ TAdaptor_sound(JStudio_JAudio2::TCreateObject*); - /* 8028D8F4 */ ~TAdaptor_sound(); - /* 8028D9A4 */ void adaptor_do_prepare(); - /* 8028DA74 */ void adaptor_do_end(); - /* 8028DA78 */ void adaptor_do_update(u32); - /* 8028DC20 */ void adaptor_do_SOUND(JStudio::data::TEOperationData, void const*, u32); - /* 8028DC54 */ void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32); - /* 8028DC88 */ void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*, - u32); - /* 8028DCD0 */ void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32); - /* 8028DD00 */ void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*, - u32); - /* 8028DD48 */ void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); - /* 8028DDB4 */ void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028DE34 */ void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028DE50 */ void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32); - /* 8028DE6C */ void adaptor_do_CONTINUOUS(JStudio::data::TEOperationData, void const*, u32); - /* 8028DE88 */ void adaptor_do_LOCATED(JStudio::data::TEOperationData, void const*, u32); - /* 8028DEB0 */ void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, - u32); - /* 8028DF04 */ void prepareSound_(); - /* 8028DFA4 */ void beginSound_fadeIn_(); - /* 8028E054 */ void endSound_fadeOut_(u32); - - static u8 saoVVOSetValue_[72]; - }; -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct JAISoundStatus_ { - /* 802A2220 */ void lockWhenPrepared(); - /* 802A2244 */ void unlockIfLocked(); -}; - -struct JAISoundID {}; - -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - -struct JAISoundStarter { - /* 802A2FEC */ void startLevelSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); -}; - -struct JAISoundParamsMove { - /* 802A2DB4 */ void moveVolume(f32, u32); - /* 802A2E0C */ void movePitch(f32, u32); - /* 802A2E64 */ void moveFxMix(f32, u32); - /* 802A2EBC */ void movePan(f32, u32); -}; - -struct JAISound { - /* 802A2598 */ void stop(); - /* 802A24DC */ void stop(u32); -}; +#include "JSystem/JStudio/JStudio_JAudio2/control.h" // // Forward References: @@ -204,7 +79,6 @@ extern "C" void moveFxMix__18JAISoundParamsMoveFfUl(); extern "C" void movePan__18JAISoundParamsMoveFfUl(); extern "C" void func_802A2FEC(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); diff --git a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp index 625fc80b680..d4bc1e273f3 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -4,66 +4,9 @@ // #include "JSystem/JStudio/JStudio_JParticle/control.h" -#include "JSystem/JStudio/JStudio/stb.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -namespace JStudio { -struct TObject {}; - -struct TCreateObject { - /* 80285488 */ ~TCreateObject(); -}; - -struct TAdaptor_particle {}; - -struct TObject_particle { - /* 8028776C */ TObject_particle(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_particle*); -}; - -}; // namespace JStudio - -struct JPABaseEmitter {}; - -struct JStudio_JParticle { - struct TCreateObject { - /* 8028E3A0 */ ~TCreateObject(); - /* 8028E400 */ void create(JStudio::TObject**, - JStudio::stb::data::TParse_TBlock_object const&); - /* 8028E474 */ void emitter_create(u32); - /* 8028E4E4 */ void emitter_destroy(JPABaseEmitter*); - /* 8028E508 */ void - createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&, - JStudio_JParticle::TCreateObject*); - }; - - struct TAdaptor_particle { - /* 8028E60C */ TAdaptor_particle(JStudio_JParticle::TCreateObject*); - }; -}; - -struct JPAParticleCallBack {}; - -struct JPAEmitterCallBack {}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - -struct JPAEmitterManager { - /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, - JPAEmitterCallBack*, JPAParticleCallBack*); - /* 8027E2D8 */ void forceDeleteEmitter(JPABaseEmitter*); -}; - // // Forward References: // diff --git a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index c054f69ea96..dfaa3d4884e 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -11,107 +11,12 @@ // Types: // -struct _GXColor {}; - -struct Vec {}; - -struct JStage { - struct TObject {}; -}; - -namespace JStudio { -struct data { - struct TEOperationData {}; -}; - -struct TAdaptor { - struct TSetVariableValue_immediate {}; - - /* 8028601C */ void adaptor_do_begin(); - /* 80286028 */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 802861C0 */ void - adaptor_setVariableValue_immediate(JStudio::TAdaptor::TSetVariableValue_immediate const*); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; - /* 8028638C */ void adaptor_getVariableValue_GXColor(_GXColor*, u32 const*) const; -}; - -struct TAdaptor_particle { - /* 8028770C */ ~TAdaptor_particle(); - - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; - static u8 const sauVariableValue_4_COLOR_RGBA[16]; -}; - -struct TControl { - struct TTransform_translation_rotation_scaling {}; -}; - -struct TVariableValue { - /* 8028B568 */ TVariableValue(); -}; - -}; // namespace JStudio - struct JStudio_JStage { /* 8028A1F8 */ void transform_toGlobalFromLocal( f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, JStage::TObject const*, u32); }; -struct JPABaseEmitter {}; - -struct JStudio_JParticle { - struct TCreateObject {}; - - struct TAdaptor_particle { - struct TJPACallback_emitter_ { - /* 8028E700 */ ~TJPACallback_emitter_(); - /* 8028ECC0 */ void execute(JPABaseEmitter*); - /* 8028F060 */ void executeAfter(JPABaseEmitter*); - /* 8028F098 */ void draw(JPABaseEmitter*); - /* 8028F0D0 */ void drawAfter(JPABaseEmitter*); - }; - - /* 8028E60C */ TAdaptor_particle(JStudio_JParticle::TCreateObject*); - /* 8028E760 */ ~TAdaptor_particle(); - /* 8028E850 */ void adaptor_do_prepare(); - /* 8028E97C */ void adaptor_do_end(); - /* 8028E980 */ void adaptor_do_update(u32); - /* 8028EA68 */ void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32); - /* 8028EA7C */ void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32); - /* 8028EAB0 */ void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*, - u32); - /* 8028EAF8 */ void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32); - /* 8028EB24 */ void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*, - u32); - /* 8028EB6C */ void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); - /* 8028EBD8 */ void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028EC58 */ void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028EC74 */ void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, - u32); - /* 8028EC88 */ void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32); - /* 8028ECA4 */ void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*, - u32); - /* 8028F108 */ void beginParticle_fadeIn_(); - /* 8028F1C0 */ void endParticle_fadeOut_(u32); - }; -}; - -struct JPAEmitterCallBack { - /* 8027E6A4 */ ~JPAEmitterCallBack(); -}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - // // Forward References: // @@ -174,7 +79,6 @@ extern "C" void transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl(); extern "C" void __ct__Q27JStudio14TVariableValueFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); extern "C" void __construct_array(); extern "C" void __cvt_fp2unsigned(); extern "C" void _savegpr_28(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/JStudio/JStudio_JStage/control.cpp index f6396849c3f..a2600caeba4 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/control.cpp @@ -7,103 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -namespace JStudio { -struct TObject {}; - -namespace stb { -struct data { - struct TParse_TBlock_object {}; -}; - -}; // namespace stb - -struct TCreateObject { - /* 80285488 */ ~TCreateObject(); -}; - -struct TAdaptor_actor {}; - -struct TObject_actor { - /* 80286910 */ TObject_actor(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_actor*); -}; - -struct TAdaptor_ambientLight {}; - -struct TObject_ambientLight { - /* 80286CFC */ TObject_ambientLight(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_ambientLight*); -}; - -struct TAdaptor_camera {}; - -struct TObject_camera { - /* 80286E7C */ TObject_camera(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_camera*); -}; - -struct TAdaptor_fog {}; - -struct TObject_fog { - /* 802871DC */ TObject_fog(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_fog*); -}; - -struct TAdaptor_light {}; - -struct TObject_light { - /* 80287368 */ TObject_light(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_light*); -}; - -}; // namespace JStudio - -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TAmbientLight {}; - - struct TCamera {}; - - struct TFog {}; - - struct TLight {}; -}; - -struct JStudio_JStage { - struct TCreateObject { - /* 80289B00 */ ~TCreateObject(); - /* 80289B60 */ void create(JStudio::TObject**, - JStudio::stb::data::TParse_TBlock_object const&); - }; - - struct TAdaptor_actor { - /* 8028A5F0 */ TAdaptor_actor(JStage::TSystem const*, JStage::TActor*); - }; - - struct TAdaptor_ambientLight { - /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*); - }; - - struct TAdaptor_camera { - /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); - }; - - struct TAdaptor_fog { - /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*); - }; - - struct TAdaptor_light { - /* 8028CB50 */ TAdaptor_light(JStage::TSystem const*, JStage::TLight*); - }; -}; - // // Forward References: // diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp index e66006efd9e..e031249edcb 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -7,128 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct Vec {}; - -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TObject {}; -}; - -namespace JStudio { -struct data { - struct TEOperationData {}; -}; - -struct TControl { - struct TTransform_translation_rotation_scaling {}; -}; - -struct TAdaptor { - /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); - /* 8028B568 */ TVariableValue(); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TFunctionValue { - /* 80281648 */ void toFunction_outside(int); -}; - -struct math { - /* 80285BCC */ void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, f32 const (*)[4]); -}; - -struct TAdaptor_actor { - /* 802868B0 */ ~TAdaptor_actor(); - - static u8 const sauVariableValue_3_TRANSLATION_XYZ[12]; - static u8 const sauVariableValue_3_ROTATION_XYZ[12]; - static u8 const sauVariableValue_3_SCALING_XYZ[12]; -}; - -}; // namespace JStudio - -struct JStudio_JStage { - struct TAdaptor_actor { - struct TVVOutput_ANIMATION_FRAME_ { - /* 8028B064 */ void operator()(f32, JStudio::TAdaptor*) const; - /* 8028B138 */ ~TVVOutput_ANIMATION_FRAME_(); - }; - - /* 8028A5F0 */ TAdaptor_actor(JStage::TSystem const*, JStage::TActor*); - /* 8028A6B4 */ ~TAdaptor_actor(); - /* 8028A728 */ void adaptor_do_prepare(); - /* 8028A7B4 */ void adaptor_do_begin(); - /* 8028A8D8 */ void adaptor_do_end(); - /* 8028A92C */ void adaptor_do_update(u32); - /* 8028A974 */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 8028A998 */ void adaptor_do_SHAPE(JStudio::data::TEOperationData, void const*, u32); - /* 8028A9F0 */ void adaptor_do_ANIMATION(JStudio::data::TEOperationData, void const*, u32); - /* 8028AA48 */ void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028AA5C */ void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData, - void const*, u32); - /* 8028AAB4 */ void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData, - void const*, u32); - /* 8028AAC8 */ void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); - /* 8028AB0C */ void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028AB68 */ void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028ABF0 */ void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, - u32); - /* 8028AC04 */ void adaptor_do_RELATION(JStudio::data::TEOperationData, void const*, u32); - /* 8028AC48 */ void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028ACA4 */ void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028ACFC */ void setJSG_ID_(void (JStage::TActor::*)(u32), - JStudio::data::TEOperationData, void const*, u32); - /* 8028AD38 */ void setJSG_SRT_(JStudio::TControl const*); - /* 8028AECC */ void getJSG_SRT_(JStudio::TControl const*); - - static u8 saoVVOutput_[64]; - static u8 saoVVOutput_ANIMATION_FRAME_[144 + 4 /* padding */]; - }; - - template - struct TVariableValueOutput_object_ {}; - /* TVariableValueOutput_object_ */ - struct TVariableValueOutput_object___template0 { - /* 8028B580 */ void func_8028B580(void* _this); - /* 8028B5E0 */ void func_8028B5E0(void* _this, f32, JStudio::TAdaptor*) /* const */; - }; - - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - /* 8028A4BC */ void adaptor_object_findJSGObject_(char const*); - /* 8028A50C */ void adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); - }; - - /* 8028A1F8 */ void transform_toGlobalFromLocal( - f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, - JStage::TObject const*, u32); - /* 8028A328 */ void transform_toLocalFromGlobal( - f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, - JStage::TObject const*, u32); -}; - // // Forward References: // @@ -199,7 +77,6 @@ extern "C" void adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_obje extern "C" void adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -386,7 +263,8 @@ asm JStudio_JStage::TAdaptor_actor::TAdaptor_actor(JStage::TSystem const* param_ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_actor::~TAdaptor_actor() { +// asm JStudio_JStage::TAdaptor_actor::~TAdaptor_actor() { +extern "C" asm void __dt__Q214JStudio_JStage14TAdaptor_actorFv() { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-actor/__dt__Q214JStudio_JStage14TAdaptor_actorFv.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp index 2e105b67e50..64b02b20b26 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp @@ -7,52 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct _GXColor {}; - -struct JStage { - struct TSystem {}; - - struct TAmbientLight {}; -}; - -struct JStudio_JStage { - struct TAdaptor_ambientLight { - /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*); - /* 8028B6AC */ ~TAdaptor_ambientLight(); - /* 8028B720 */ void adaptor_do_prepare(); - /* 8028B724 */ void adaptor_do_begin(); - /* 8028B7B0 */ void adaptor_do_end(); - /* 8028B804 */ void adaptor_do_update(u32); - /* 8028B87C */ void adaptor_do_data(void const*, u32, void const*, u32); - }; - - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - }; -}; - -namespace JStudio { -struct TAdaptor { - /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&); - /* 8028638C */ void adaptor_getVariableValue_GXColor(_GXColor*, u32 const*) const; -}; - -struct TAdaptor_ambientLight { - /* 80286C9C */ ~TAdaptor_ambientLight(); - - static u8 const sauVariableValue_4_COLOR_RGBA[16]; -}; - -struct TVariableValue { - /* 8028B568 */ TVariableValue(); -}; - -}; // namespace JStudio - // // Forward References: // diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp index aef4e09a482..25b957dccc7 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -7,106 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct Vec {}; - -namespace JStudio { -struct data { - struct TEOperationData {}; -}; - -struct TControl { - struct TTransform_position {}; -}; - -struct TAdaptor { - /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); - /* 8028B568 */ TVariableValue(); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TAdaptor_camera { - /* 80286E1C */ ~TAdaptor_camera(); - - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; -}; - -}; // namespace JStudio - -struct JStage { - struct TSystem {}; - - struct TCamera {}; - - struct TObject {}; -}; - -struct JStudio_JStage { - struct TAdaptor_camera { - /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); - /* 8028B960 */ ~TAdaptor_camera(); - /* 8028B9D4 */ void adaptor_do_prepare(); - /* 8028BA1C */ void adaptor_do_begin(); - /* 8028BAF8 */ void adaptor_do_end(); - /* 8028BB4C */ void adaptor_do_update(u32); - /* 8028BBAC */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 8028BBD0 */ void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32); - /* 8028BC14 */ void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028BC70 */ void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, - u32); - /* 8028BCEC */ void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*, - u32); - /* 8028BD00 */ void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, void const*, - u32); - /* 8028BD44 */ void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, - void const*, u32); - /* 8028BDA0 */ void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, - void const*, u32); - /* 8028BDBC */ void setJSG_position_(JStudio::TControl const*); - /* 8028BEB8 */ void getJSG_position_(JStudio::TControl const*); - /* 8028BFBC */ void setJSG_targetPosition_(JStudio::TControl const*); - /* 8028C09C */ void getJSG_targetPosition_(JStudio::TControl const*); - - static u8 saoVVOutput_[160 + 4 /* padding */]; - }; - - template - struct TVariableValueOutput_object_ {}; - /* TVariableValueOutput_object_ */ - struct TVariableValueOutput_object___template1 { - /* 8028C4E4 */ void func_8028C4E4(void* _this); - /* 8028C544 */ void func_8028C544(void* _this, f32, JStudio::TAdaptor*) /* const */; - }; - - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - /* 8028A4BC */ void adaptor_object_findJSGObject_(char const*); - /* 8028A50C */ void adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); - }; - - /* 8028A290 */ void transform_toGlobalFromLocal(f32 (*)[4], - JStudio::TControl::TTransform_position const&, - JStage::TObject const*, u32); - /* 8028A3CC */ void transform_toLocalFromGlobal(f32 (*)[4], - JStudio::TControl::TTransform_position const&, - JStage::TObject const*, u32); -}; - // // Forward References: // @@ -160,7 +60,6 @@ extern "C" void adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc(); extern "C" void __ct__Q27JStudio14TVariableValueFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void __ptmf_scall(); @@ -301,7 +200,8 @@ asm JStudio_JStage::TAdaptor_camera::TAdaptor_camera(JStage::TSystem const* para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() { +// asm JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() { +extern "C" asm void __dt__Q214JStudio_JStage15TAdaptor_cameraFv() { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-camera/__dt__Q214JStudio_JStage15TAdaptor_cameraFv.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp index 509df2b4f70..acc0aa56a46 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp @@ -7,69 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct _GXColor {}; - -struct JStage { - struct TSystem {}; - - struct TFog {}; -}; - -namespace JStudio { -struct TAdaptor { - /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&); - /* 8028638C */ void adaptor_getVariableValue_GXColor(_GXColor*, u32 const*) const; -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); - /* 8028B568 */ TVariableValue(); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TAdaptor_fog { - /* 8028717C */ ~TAdaptor_fog(); - - static u8 const sauVariableValue_4_COLOR_RGBA[16]; -}; - -}; // namespace JStudio - -struct JStudio_JStage { - struct TAdaptor_fog { - /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*); - /* 8028C610 */ ~TAdaptor_fog(); - /* 8028C684 */ void adaptor_do_prepare(); - /* 8028C6CC */ void adaptor_do_begin(); - /* 8028C7B4 */ void adaptor_do_end(); - /* 8028C808 */ void adaptor_do_update(u32); - /* 8028C880 */ void adaptor_do_data(void const*, u32, void const*, u32); - - static u8 saoVVOutput_[96 + 4 /* padding */]; - }; - - template - struct TVariableValueOutput_object_ {}; - /* TVariableValueOutput_object_ */ - struct TVariableValueOutput_object___template2 { - /* 8028CAC0 */ void func_8028CAC0(void* _this); - /* 8028CB20 */ void func_8028CB20(void* _this, f32, JStudio::TAdaptor*) /* const */; - }; - - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - }; -}; - // // Forward References: // @@ -183,7 +120,8 @@ asm JStudio_JStage::TAdaptor_fog::TAdaptor_fog(JStage::TSystem const* param_0, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() { +// asm JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() { +extern "C" asm void __dt__Q214JStudio_JStage12TAdaptor_fogFv() { nofralloc #include "asm/JSystem/JStudio/JStudio_JStage/object-fog/__dt__Q214JStudio_JStage12TAdaptor_fogFv.s" } diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index 6fa34ee8701..23119d0c170 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -7,80 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct _GXColor {}; - -struct Vec {}; - -struct JStage { - struct TSystem {}; - - struct TLight {}; -}; - -namespace JStudio { -struct data { - struct TEOperationData {}; -}; - -struct TAdaptor { - /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&); - /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const; - /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, _GXColor const&); - /* 8028638C */ void adaptor_getVariableValue_GXColor(_GXColor*, u32 const*) const; -}; - -struct TVariableValue { - struct TOutput { - /* 80285E0C */ ~TOutput(); - }; - - /* 80285EB8 */ void update_immediate_(JStudio::TVariableValue*, f64); - /* 8028B568 */ TVariableValue(); - - static u8 soOutput_none_[4 + 4 /* padding */]; -}; - -struct TAdaptor_light { - /* 80287308 */ ~TAdaptor_light(); - - static u8 const sauVariableValue_4_COLOR_RGBA[16]; - static u8 const sauVariableValue_3_POSITION_XYZ[12]; - static u8 const sauVariableValue_3_TARGET_POSITION_XYZ[12]; -}; - -}; // namespace JStudio - -struct JStudio_JStage { - struct TAdaptor_light { - struct TVVOutput_direction_ { - /* 8028D24C */ void operator()(f32, JStudio::TAdaptor*) const; - /* 8028D258 */ ~TVVOutput_direction_(); - }; - - /* 8028CB50 */ TAdaptor_light(JStage::TSystem const*, JStage::TLight*); - /* 8028CBF4 */ ~TAdaptor_light(); - /* 8028CC68 */ void adaptor_do_prepare(); - /* 8028CCB0 */ void adaptor_do_begin(); - /* 8028CF68 */ void adaptor_do_end(); - /* 8028CFBC */ void adaptor_do_update(u32); - /* 8028D18C */ void adaptor_do_data(void const*, u32, void const*, u32); - /* 8028D1B0 */ void adaptor_do_FACULTY(JStudio::data::TEOperationData, void const*, u32); - /* 8028D228 */ void adaptor_do_ENABLE(JStudio::data::TEOperationData, void const*, u32); - - static u8 saoVVOutput_direction_[72]; - }; - - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - /* 8028A550 */ void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, - u32); - }; -}; - // // Forward References: // @@ -118,10 +44,6 @@ extern "C" void adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl(); extern "C" void __ct__Q27JStudio14TVariableValueFv(); extern "C" void __dl__FPv(); -extern "C" void PSMTXMultVec(); -extern "C" void PSMTXMultVecSR(); -extern "C" void PSVECAdd(); -extern "C" void PSVECSubtract(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void _savegpr_29(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/JStudio/JStudio_JStage/object.cpp index df2d54a052b..add727038ea 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object.cpp @@ -7,56 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct Vec {}; - -struct JStage { - struct TObject {}; -}; - -namespace JStudio { -struct TControl { - struct TTransform_translation_rotation_scaling {}; - - struct TTransform_position {}; -}; - -struct data { - struct TEOperationData {}; -}; - -struct math { - /* 80285B44 */ void getTransformation_SRxyzT(f32 (*)[4], Vec const&, Vec const&, Vec const&); -}; - -}; // namespace JStudio - -struct JStudio_JStage { - struct TAdaptor_object_ { - /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32); - /* 8028A4BC */ void adaptor_object_findJSGObject_(char const*); - /* 8028A50C */ void adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*); - /* 8028A550 */ void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, - u32); - }; - - /* 8028A1F8 */ void transform_toGlobalFromLocal( - f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, - JStage::TObject const*, u32); - /* 8028A290 */ void transform_toGlobalFromLocal(f32 (*)[4], - JStudio::TControl::TTransform_position const&, - JStage::TObject const*, u32); - /* 8028A328 */ void transform_toLocalFromGlobal( - f32 (*)[4], JStudio::TControl::TTransform_translation_rotation_scaling const&, - JStage::TObject const*, u32); - /* 8028A3CC */ void transform_toLocalFromGlobal(f32 (*)[4], - JStudio::TControl::TTransform_position const&, - JStage::TObject const*, u32); -}; - // // Forward References: // @@ -81,9 +31,6 @@ adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TE // extern "C" void getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec(); -extern "C" void PSMTXConcat(); -extern "C" void PSMTXInverse(); -extern "C" void PSMTXTrans(); // // Declarations: diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp index b1f2a235042..9eef2b2d400 100644 --- a/libs/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/JUtility/JUTCacheFont.cpp @@ -443,7 +443,7 @@ asm u16 JUTResFont::getFontType() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm u16 JUTResFont::getLeading() const { +asm int JUTResFont::getLeading() const { nofralloc #include "asm/JSystem/JUtility/JUTCacheFont/getLeading__10JUTResFontCFv.s" } diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index 02f6d398aed..7c3a5d3dfd6 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -4,10 +4,10 @@ // #include "JSystem/JUtility/JUTConsole.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" -#include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "MSL_C/MSL_Common/Src/printf.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -171,58 +171,25 @@ void JUTConsole::clear() { *getLinePtr(0) = 0; } -/* ############################################################################################## */ -/* 80456118-8045611C 004718 0004+00 1/1 0/0 0/0 .sdata2 @2460 */ -SECTION_SDATA2 static f32 lit_2460 = 2.0f; - -/* 8045611C-80456120 00471C 0004+00 1/1 0/0 0/0 .sdata2 @2461 */ -SECTION_SDATA2 static u8 lit_2461[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - -/* 80456120-80456124 004720 0004+00 1/1 0/0 0/0 .sdata2 @2462 */ -SECTION_SDATA2 static f32 lit_2462 = 640.0f; - -/* 80456124-80456128 004724 0004+00 1/1 0/0 0/0 .sdata2 @2463 */ -SECTION_SDATA2 static f32 lit_2463 = 480.0f; - -/* 80456128-8045612C 004728 0004+00 1/1 0/0 0/0 .sdata2 @2464 */ -SECTION_SDATA2 static f32 lit_2464 = -1.0f; - -/* 8045612C-80456130 00472C 0004+00 1/1 0/0 0/0 .sdata2 @2465 */ -SECTION_SDATA2 static f32 lit_2465 = 1.0f; - -/* 80456130-80456138 004730 0004+04 1/1 0/0 0/0 .sdata2 @2466 */ -SECTION_SDATA2 static f32 lit_2466[1 + 1 /* padding */] = { - 4.0f, - /* padding */ - 0.0f, -}; - -/* 80456138-80456140 004738 0008+00 1/1 0/0 0/0 .sdata2 @2469 */ -SECTION_SDATA2 static f64 lit_2469 = 4503599627370496.0 /* cast u32 to float */; - -/* 80456140-80456148 004740 0008+00 1/1 0/0 0/0 .sdata2 @2471 */ -SECTION_SDATA2 static f64 lit_2471 = 4503601774854144.0 /* cast s32 to float */; - /* 802E7648-802E7BB8 2E1F88 0570+00 2/2 0/0 0/0 .text * doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType */ -#ifdef NONMATCHING void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const { + f32 font_yOffset; + s32 changeLine_1; + s32 changeLine_2; + if (mVisible && (mFont != NULL || consoleType == CONSOLE_TYPE_2)) { if (mHeight != 0) { bool temp_r30 = consoleType == CONSOLE_TYPE_0; - f32 temp_f31 = 2.0f + mFontSizeY; + font_yOffset = 2.0f + mFontSizeY; if (consoleType != CONSOLE_TYPE_2) { if (JUTVideo::getManager() == NULL) { J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); ortho.setPort(); } else { - J2DOrthoGraph ortho(0.0f, 0.0f, JUTVideo::getManager()->getFbWidth(), JUTVideo::getManager()->getEfbHeight(), -1.0f, 1.0f); + J2DOrthoGraph ortho(0.0f, 0.0f, JUTVideo::getManager()->getFbWidth(), + JUTVideo::getManager()->getEfbHeight(), -1.0f, 1.0f); ortho.setPort(); } @@ -233,11 +200,14 @@ void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const { color = &field_0x5c; } - J2DFillBox(mPositionX - 2, (f32)(mPositionY - temp_f31), 4.0f + (mFontSizeX * (f32)field_0x20), temp_f31 * (f32)mHeight, *color); + J2DFillBox(mPositionX - 2, (int)(mPositionY - font_yOffset), + (int)((mFontSizeX * field_0x20) + 4.0f), (int)(font_yOffset * mHeight), + *color); mFont->setGX(); if (temp_r30) { - if ((diffIndex(field_0x30, field_0x38) - mHeight) + 1 <= 1) { + s32 s = (diffIndex(field_0x30, field_0x38) - mHeight) + 1; + if (s <= 0) { mFont->setCharColor(JUtility::TColor(255, 255, 255, 255)); } else if (field_0x30 == field_0x34) { mFont->setCharColor(JUtility::TColor(255, 230, 230, 255)); @@ -248,34 +218,39 @@ void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const { mFont->setCharColor(JUtility::TColor(230, 230, 230, 255)); } } else { - JUTDirectPrint::getManager()->erase(mPositionX - 3, mPositionY - 2, (field_0x20 * 6) + 6, (temp_f31 * mHeight) + 4); + JUTDirectPrint::getManager()->erase(mPositionX - 3, mPositionY - 2, + (field_0x20 * 6) + 6, + (int)(font_yOffset * mHeight) + 4); JUTDirectPrint::getManager()->setCharColor(JUtility::TColor(255, 255, 255, 255)); } - for (int i = 0, j = field_0x30; i > mHeight && j != field_0x34; i++, j = nextIndex(j)) { - char* str = (char*)getLinePtr(j); + char* linePtr; + s32 curLine = field_0x30; + s32 yFactor = 0; - if (str[-1] != 0) { + do { + linePtr = (char*)getLinePtr(curLine); + + if ((u8)linePtr[-1] != NULL) { if (consoleType != CONSOLE_TYPE_2) { - mFont->drawString_scale(mPositionX, (mPositionY + i) * temp_f31, mFontSizeX, mFontSizeY, str, true); + mFont->drawString_scale(mPositionX, ((yFactor * font_yOffset) + mPositionY), + mFontSizeX, mFontSizeY, linePtr, true); } else { - JUTDirectPrint::getManager()->drawString(mPositionX, (mPositionY + i) * temp_f31, str); + JUTDirectPrint::getManager()->drawString( + mPositionX, ((yFactor * font_yOffset) + mPositionY), linePtr); } + + changeLine_1 = curLine + 1; + yFactor += 1; + changeLine_2 = changeLine_1 & ~(-((s32)mMaxLines <= (s32)changeLine_1)); + curLine = changeLine_2; + } else { + break; } - } + } while (yFactor < mHeight && changeLine_2 != field_0x34); } } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTConsole::doDraw(JUTConsole::EConsoleType param_0) const { - nofralloc -#include "asm/JSystem/JUtility/JUTConsole/doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType.s" -} -#pragma pop -#endif /* 802E7BB8-802E7C38 2E24F8 0080+00 0/0 13/13 0/0 .text print_f__10JUTConsoleFPCce */ void JUTConsole::print_f(char const* fmt, ...) { @@ -481,7 +456,8 @@ extern "C" void JUTReportConsole_f_va(const char* fmt, va_list args) { if (JUTGetReportConsole() == NULL) { vsnprintf(buf, sizeof(buf), fmt, args); - } else if (JUTGetReportConsole()->getOutput() & (JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT)) { + } else if (JUTGetReportConsole()->getOutput() & + (JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT)) { vsnprintf(buf, sizeof(buf), fmt, args); JUTGetReportConsole()->print(buf); } diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index b205f8b4474..9df76c790d6 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -47,7 +47,6 @@ extern "C" void _restgpr_25(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" void OSYieldThread(); -extern "C" void OSProtectRange(int, void*, int, int); extern "C" void OSFillFPUContext(OSContext*); extern "C" void print_f__10JUTConsoleFPCce(); extern "C" OSContext* OSGetCurrentContext(); @@ -111,11 +110,11 @@ OSErrorHandler JUTException::sPostUserCallback; /* 802E1D5C-802E1E40 2DC69C 00E4+00 1/1 0/0 0/0 .text __ct__12JUTExceptionFP14JUTDirectPrint */ JUTException::JUTException(JUTDirectPrint* directPrint) : JKRThread(0x1C00 /* 0x4000 in DEBUG */, 0x10, 0), mDirectPrint(directPrint) { - OSSetErrorHandler(OS_ERROR_DSI, errorHandler); - OSSetErrorHandler(OS_ERROR_ISI, errorHandler); - OSSetErrorHandler(OS_ERROR_PROGRAM, errorHandler); - OSSetErrorHandler(OS_ERROR_ALIGNMENT, errorHandler); - OSSetErrorHandler(OS_ERROR_MEMORY_PROTECTION, errorHandler); + OSSetErrorHandler(EXCEPTION_DSI, errorHandler); + OSSetErrorHandler(EXCEPTION_ISI, errorHandler); + OSSetErrorHandler(EXCEPTION_PROGRAM, errorHandler); + OSSetErrorHandler(EXCEPTION_ALIGNMENT, errorHandler); + OSSetErrorHandler(EXCEPTION_MEMORY_PROTECTION, errorHandler); setFPException(0); sPreUserCallback = NULL; @@ -199,7 +198,7 @@ u32 JUTException::fpscr; /* 802E1FCC-802E20C0 2DC90C 00F4+00 2/2 0/0 0/0 .text * errorHandler__12JUTExceptionFUsP9OSContextUlUl */ -void JUTException::errorHandler(u16 error, OSContext* context, u32 param_3, u32 param_4) { +void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, u32 param_4) { msr = PPCMfmsr(); fpscr = context->fpscr; OSFillFPUContext(context); @@ -234,7 +233,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va char buffer[256]; vsnprintf(buffer, sizeof(buffer) - 1, format, args); if (!sErrorManager) { - OSPanic(file, line, buffer); + OSPanic((char*)file, line, buffer); } OSContext* current_context = OSGetCurrentContext(); @@ -274,9 +273,9 @@ void JUTException::panic_f(char const* file, int line, char const* format, ...) void JUTException::setFPException(u32 fpscr_enable_bits) { __OSFpscrEnableBits = fpscr_enable_bits; if (fpscr_enable_bits) { - OSSetErrorHandler(OS_ERROR_FLOATING_POINT_EXCEPTION, errorHandler); + OSSetErrorHandler(EXCEPTION_FLOATING_POINT_EXCEPTION, errorHandler); } else { - OSSetErrorHandler(OS_ERROR_FLOATING_POINT_EXCEPTION, NULL); + OSSetErrorHandler(EXCEPTION_FLOATING_POINT_EXCEPTION, NULL); } } diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 5c8d795c499..97e8e1fff9d 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -87,7 +87,6 @@ extern "C" void __dt__10JSUPtrListFv(); extern "C" void initiate__10JSUPtrListFv(); extern "C" void append__10JSUPtrListFP10JSUPtrLink(); extern "C" void remove__10JSUPtrListFP10JSUPtrLink(); -extern "C" s32 OSGetResetSwitchState(); extern "C" void __register_global_object(); extern "C" void __construct_array(); extern "C" void _savegpr_22(); diff --git a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp index d9abd4d056a..408bf1050af 100644 --- a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp +++ b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp @@ -9,7 +9,7 @@ /* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text __ct__13cBgS_PolyInfoFv */ cBgS_PolyInfo::cBgS_PolyInfo() { - this->ClearPi(); + ClearPi(); } /* 802680B0-802680F8 2629F0 0048+00 1/0 10/10 393/393 .text __dt__13cBgS_PolyInfoFv */ @@ -26,32 +26,32 @@ bool cBgS_PolyInfo::ChkSetInfo() const { /* 80268120-80268148 262A60 0028+00 1/1 11/11 0/0 .text ClearPi__13cBgS_PolyInfoFv */ void cBgS_PolyInfo::ClearPi() { - mPolyIndex = 0xFFFF; + mPolyIndex = -1; mBgIndex = 0x100; unk_0x04 = 0; - unk_0x08 = -1; + mActorId = -1; } /* 80268148-8026816C 262A88 0024+00 0/0 11/11 1/1 .text * SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo */ -void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) { - mPolyIndex = pOther.mPolyIndex; - mBgIndex = pOther.mBgIndex; - unk_0x04 = pOther.unk_0x04; - unk_0x08 = pOther.unk_0x08; +void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& poly) { + mPolyIndex = poly.mPolyIndex; + mBgIndex = poly.mBgIndex; + unk_0x04 = poly.unk_0x04; + mActorId = poly.mActorId; } /* 8026816C-8026817C 262AAC 0010+00 0/0 6/6 0/0 .text SetActorInfo__13cBgS_PolyInfoFiPvUi */ -void cBgS_PolyInfo::SetActorInfo(int param_1, void* param_2, unsigned int param_3) { - mBgIndex = param_1; - unk_0x04 = param_2; - unk_0x08 = param_3; +void cBgS_PolyInfo::SetActorInfo(int bg_index, void* p_data, unsigned int actor_id) { + mBgIndex = bg_index; + unk_0x04 = p_data; + mActorId = actor_id; } /* 8026817C-802681A4 262ABC 0028+00 0/0 1/1 0/0 .text ChkSafe__13cBgS_PolyInfoCFPCvUi */ -bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int param_2) const { - if (unk_0x04 == param_1 && unk_0x08 == param_2) { +bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int actor_id) const { + if (unk_0x04 == param_1 && mActorId == actor_id) { return true; } else { return false; @@ -60,8 +60,8 @@ bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int param_2) const { /* 802681A4-802681AC 262AE4 0008+00 0/0 11/11 0/0 .text SetPolyIndex__13cBgS_PolyInfoFi */ -void cBgS_PolyInfo::SetPolyIndex(int pPolyIndex) { - mPolyIndex = pPolyIndex; +void cBgS_PolyInfo::SetPolyIndex(int poly_index) { + mPolyIndex = poly_index; } /* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text ChkBgIndex__13cBgS_PolyInfoCFv */ diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index 0f237dffefd..07fe1a3b04a 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -8,10 +8,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Declarations: -// - /* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr */ cXyz cCcD_ShapeAttr::m_virtual_center = cXyz::Zero; @@ -25,9 +21,9 @@ void cCcD_DivideInfo::Set(u32 xDivInfo, u32 yDivInfo, u32 zDivInfo) { /* 80263368-802633A8 25DCA8 0040+00 0/0 5/5 0/0 .text Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo */ -bool cCcD_DivideInfo::Chk(cCcD_DivideInfo const& param_0) const { - if ((mXDivInfo & param_0.mXDivInfo) == 0 || (mZDivInfo & param_0.mZDivInfo) == 0 || - (mYDivInfo & param_0.mYDivInfo) == 0) { +bool cCcD_DivideInfo::Chk(cCcD_DivideInfo const& other) const { + if ((mXDivInfo & other.mXDivInfo) == 0 || (mZDivInfo & other.mZDivInfo) == 0 || + (mYDivInfo & other.mYDivInfo) == 0) { return false; } else { return true; @@ -35,18 +31,21 @@ bool cCcD_DivideInfo::Chk(cCcD_DivideInfo const& param_0) const { } /* 802633A8-802634D4 25DCE8 012C+00 0/0 2/2 0/0 .text SetArea__15cCcD_DivideAreaFRC8cM3dGAab */ -void cCcD_DivideArea::SetArea(cM3dGAab const& pM3dGAab) { - Set(&pM3dGAab.mMin, &pM3dGAab.mMax); +void cCcD_DivideArea::SetArea(cM3dGAab const& aab) { + Set(&aab.mMin, &aab.mMax); + mScaledXDiff = 1.0f / 32.0f * (mMax.x - mMin.x); mXDiffIsZero = cM3d_IsZero(mScaledXDiff); if (!mXDiffIsZero) { mInvScaledXDiff = 1.0f / mScaledXDiff; } + mScaledYDiff = 1.0f / 32.0f * (mMax.y - mMin.y); mYDiffIsZero = cM3d_IsZero(mScaledYDiff); if (!mYDiffIsZero) { mInvScaledYDiff = 1.0f / mScaledYDiff; } + mScaledZDiff = 1.0f / 32.0f * (mMax.z - mMin.z); mZDiffIsZero = cM3d_IsZero(mScaledZDiff); if (!mZDiffIsZero) { @@ -65,18 +64,19 @@ static u32 const l_base[32] = { /* 802634D4-802636A0 25DE14 01CC+00 0/0 2/2 0/0 .text * CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */ -void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab const& pM3dGAab, +void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab const& aab, u32 param_2) { if (param_2 != 0) { pDivideInfo->Set(0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF); } else { u32 xDivInfo, yDivInfo, zDivInfo; if (!mXDiffIsZero) { - s32 var1 = mInvScaledXDiff * (pM3dGAab.mMin.x - mMin.x); - s32 var3 = mInvScaledXDiff * (pM3dGAab.mMax.x - mMin.x); - if (0x1F < var3) { - var3 = 0x1F; + s32 var1 = mInvScaledXDiff * (aab.mMin.x - mMin.x); + s32 var3 = mInvScaledXDiff * (aab.mMax.x - mMin.x); + if (31 < var3) { + var3 = 31; } + xDivInfo = l_base[var3]; if (0 < var1) { var1--; @@ -85,12 +85,14 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab cons } else { xDivInfo = 0xFFFFFFFF; } + if (!mYDiffIsZero) { - s32 var1 = mInvScaledYDiff * (pM3dGAab.mMin.y - mMin.y); - s32 var3 = mInvScaledYDiff * (pM3dGAab.mMax.y - mMin.y); - if (0x1F < var3) { - var3 = 0x1F; + s32 var1 = mInvScaledYDiff * (aab.mMin.y - mMin.y); + s32 var3 = mInvScaledYDiff * (aab.mMax.y - mMin.y); + if (31 < var3) { + var3 = 31; } + yDivInfo = l_base[var3]; if (0 < var1) { var1--; @@ -99,12 +101,14 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab cons } else { yDivInfo = 0xFFFFFFFF; } + if (!mZDiffIsZero) { - s32 var1 = mInvScaledZDiff * (pM3dGAab.mMin.z - mMin.z); - s32 var3 = mInvScaledZDiff * (pM3dGAab.mMax.z - mMin.z); - if (0x1F < var3) { - var3 = 0x1F; + s32 var1 = mInvScaledZDiff * (aab.mMin.z - mMin.z); + s32 var3 = mInvScaledZDiff * (aab.mMax.z - mMin.z); + if (31 < var3) { + var3 = 31; } + zDivInfo = l_base[var3]; if (0 < var1) { var1--; @@ -113,6 +117,7 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab cons } else { zDivInfo = 0xFFFFFFFF; } + pDivideInfo->Set(xDivInfo, yDivInfo, zDivInfo); } } @@ -120,16 +125,16 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, cM3dGAab cons /* 802636A0-80263894 25DFE0 01F4+00 0/0 3/3 0/0 .text * CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab */ void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, - cM3dGAab const& pM3dGAab) { + cM3dGAab const& aab) { u32 xDivInfo, yDivInfo, zDivInfo; if (!mXDiffIsZero) { - s32 var1 = mInvScaledXDiff * (pM3dGAab.mMin.x - mMin.x); - s32 var3 = mInvScaledXDiff * (pM3dGAab.mMax.x - mMin.x); - if (var3 < 0 || 0x1F < var1) { + s32 var1 = mInvScaledXDiff * (aab.mMin.x - mMin.x); + s32 var3 = mInvScaledXDiff * (aab.mMax.x - mMin.x); + if (var3 < 0 || 31 < var1) { xDivInfo = 0; } else { - if (0x1F < var3) { - var3 = 0x1F; + if (31 < var3) { + var3 = 31; } xDivInfo = l_base[var3]; if (0 < var1) { @@ -140,14 +145,15 @@ void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, } else { xDivInfo = 0xFFFFFFFF; } + if (!mYDiffIsZero) { - s32 var1 = mInvScaledYDiff * (pM3dGAab.mMin.y - mMin.y); - s32 var3 = mInvScaledYDiff * (pM3dGAab.mMax.y - mMin.y); - if (var3 < 0 || 0x1F < var1) { + s32 var1 = mInvScaledYDiff * (aab.mMin.y - mMin.y); + s32 var3 = mInvScaledYDiff * (aab.mMax.y - mMin.y); + if (var3 < 0 || 31 < var1) { yDivInfo = 0; } else { - if (0x1F < var3) { - var3 = 0x1F; + if (31 < var3) { + var3 = 31; } yDivInfo = l_base[var3]; if (0 < var1) { @@ -158,14 +164,15 @@ void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, } else { yDivInfo = 0xFFFFFFFF; } + if (!mZDiffIsZero) { - s32 var1 = mInvScaledZDiff * (pM3dGAab.mMin.z - mMin.z); - s32 var3 = mInvScaledZDiff * (pM3dGAab.mMax.z - mMin.z); - if (var3 < 0 || 0x1F < var1) { + s32 var1 = mInvScaledZDiff * (aab.mMin.z - mMin.z); + s32 var3 = mInvScaledZDiff * (aab.mMax.z - mMin.z); + if (var3 < 0 || 31 < var1) { zDivInfo = 0; } else { - if (0x1F < var3) { - var3 = 0x1F; + if (31 < var3) { + var3 = 31; } zDivInfo = l_base[var3]; if (0 < var1) { @@ -176,6 +183,7 @@ void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, } else { zDivInfo = 0xFFFFFFFF; } + pDivideInfo->Set(xDivInfo, yDivInfo, zDivInfo); } @@ -191,7 +199,7 @@ cCcD_GStts* cCcD_Stts::GetGStts() { /* 802638A4-80263904 25E1E4 0060+00 0/0 1/1 0/0 .text Init__9cCcD_SttsFiiPvUi */ void cCcD_Stts::Init(int weight, int param_1, void* pActor, unsigned int apid) { - this->Ct(); + Ct(); mWeight = weight; field_0x15 = param_1; mActor = static_cast(pActor); @@ -246,10 +254,10 @@ void cCcD_ObjCommonBase::ct() { /* 802639C4-80263A10 25E304 004C+00 1/1 0/0 0/0 .text Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf */ -void cCcD_ObjHitInf::Set(cCcD_SrcObjHitInf const& pSrc) { - mObjAt.Set(pSrc.mObjAt); - mObjTg.Set(pSrc.mObjTg); - mObjCo.setSPrm(pSrc.mSPrm); +void cCcD_ObjHitInf::Set(cCcD_SrcObjHitInf const& src) { + mObjAt.Set(src.mObjAt); + mObjTg.Set(src.mObjTg); + mObjCo.setSPrm(src.mSPrm); } /* 80263A10-80263A1C 25E350 000C+00 0/0 1/1 0/0 .text ct__8cCcD_ObjFv */ @@ -258,35 +266,35 @@ void cCcD_Obj::ct() { } /* 80263A1C-80263A48 25E35C 002C+00 0/0 1/1 0/0 .text Set__8cCcD_ObjFRC11cCcD_SrcObj */ -void cCcD_Obj::Set(cCcD_SrcObj const& param_0) { - field_0x40 = param_0.field_0x0; - this->cCcD_ObjHitInf::Set(param_0.mSrcObjHitInf); +void cCcD_Obj::Set(cCcD_SrcObj const& src) { + field_0x40 = src.field_0x0; + cCcD_ObjHitInf::Set(src.mSrcObjHitInf); } /* 80263A48-80263A64 25E388 001C+00 0/0 9/9 87/87 .text GetAc__8cCcD_ObjFv */ fopAc_ac_c* cCcD_Obj::GetAc() { - if (this->mStts == NULL) { + if (mStts == NULL) { return NULL; } else { - return this->mStts->GetAc(); + return mStts->GetAc(); } } /* 80263A64-80263A88 25E3A4 0024+00 3/0 2/0 0/0 .text * getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape */ -void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { - shape->_0 = 2; - shape->_14 = 0.0f; - shape->_10 = 0.0f; - shape->_C = 0.0f; - shape->_8 = 0.0f; - shape->_4 = 0.0f; +void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* p_shape) const { + p_shape->_0 = 2; + p_shape->_14 = 0.0f; + p_shape->_10 = 0.0f; + p_shape->_C = 0.0f; + p_shape->_8 = 0.0f; + p_shape->_4 = 0.0f; } /* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz */ -bool cCcD_TriAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* xyz) const { - if (this->cM3dGTri::Cross(cpsAttr, xyz)) { +bool cCcD_TriAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* p_xyz) const { + if (cM3dGTri::Cross(cpsAttr, p_xyz)) { return true; } else { return false; @@ -295,8 +303,8 @@ bool cCcD_TriAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* xyz) const { /* 80263B58-80263B90 25E498 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz */ -bool cCcD_TriAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* xyz) const { - if (this->cM3dGTri::Cross(cylAttr, xyz)) { +bool cCcD_TriAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* p_xyz) const { + if (cM3dGTri::Cross(cylAttr, p_xyz)) { return true; } else { return false; @@ -305,8 +313,8 @@ bool cCcD_TriAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* xyz) const { /* 80263B90-80263BCC 25E4D0 003C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz */ -bool cCcD_TriAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { - if (this->cM3dGTri::Cross(sph, xyz)) { +bool cCcD_TriAttr::CrossAtTg(cCcD_SphAttr const& sphAttr, cXyz* p_xyz) const { + if (cM3dGTri::Cross(sphAttr, p_xyz)) { return true; } else { return false; @@ -315,8 +323,8 @@ bool cCcD_TriAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { /* 80263BCC-80263C04 25E50C 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz */ -bool cCcD_TriAttr::CrossAtTg(cCcD_TriAttr const& other, cXyz* xyz) const { - if (this->cM3dGTri::Cross(other, xyz)) { +bool cCcD_TriAttr::CrossAtTg(cCcD_TriAttr const& other, cXyz* p_xyz) const { + if (cM3dGTri::Cross(other, p_xyz)) { return true; } else { return false; @@ -333,7 +341,7 @@ void cCcD_TriAttr::CalcAabBox() { /* 80263C9C-80263D38 25E5DC 009C+00 1/0 1/0 0/0 .text GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz */ bool cCcD_TriAttr::GetNVec(cXyz const& param_0, cXyz* pOut) const { - if (this->getPlaneFunc(¶m_0) >= 0.0f) { + if (getPlaneFunc(¶m_0) >= 0.0f) { *pOut = mNormal; } else { *pOut = mNormal; @@ -344,8 +352,8 @@ bool cCcD_TriAttr::GetNVec(cXyz const& param_0, cXyz* pOut) const { /* 80263D38-80263D7C 25E678 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz */ -bool cCcD_CpsAttr::CrossAtTg(cCcD_CpsAttr const& other, cXyz* xyz) const { - if (this->cM3dGCps::Cross(&other, xyz)) { +bool cCcD_CpsAttr::CrossAtTg(cCcD_CpsAttr const& other, cXyz* p_xyz) const { + if (cM3dGCps::Cross(&other, p_xyz)) { return true; } else { return false; @@ -354,8 +362,8 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_CpsAttr const& other, cXyz* xyz) const { /* 80263D7C-80263DC0 25E6BC 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz */ -bool cCcD_CpsAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { - if (this->cM3dGCps::Cross(&cyl, xyz)) { +bool cCcD_CpsAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* p_xyz) const { + if (cM3dGCps::Cross(&cylAttr, p_xyz)) { return true; } else { return false; @@ -364,8 +372,8 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { /* 80263DC0-80263E04 25E700 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz */ -bool cCcD_CpsAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { - if (this->cM3dGCps::Cross(&sph, xyz)) { +bool cCcD_CpsAttr::CrossAtTg(cCcD_SphAttr const& sphAttr, cXyz* p_xyz) const { + if (cM3dGCps::Cross(&sphAttr, p_xyz)) { return true; } else { return false; @@ -374,8 +382,8 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { /* 80263E04-80263ED4 25E744 00D0+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz */ -bool cCcD_CpsAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* xyz) const { - if (triAttr.cM3dGTri::Cross(*this, xyz)) { +bool cCcD_CpsAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* p_xyz) const { + if (triAttr.cM3dGTri::Cross(*this, p_xyz)) { return true; } else { return false; @@ -387,7 +395,7 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* xyz) const { bool cCcD_CpsAttr::CrossCo(cCcD_CpsAttr const& other, f32* param_1) const { *param_1 = 0.0f; cXyz xyz; - if (this->cM3dGCps::Cross(&other, &xyz)) { + if (cM3dGCps::Cross(&other, &xyz)) { return true; } else { return false; @@ -396,10 +404,10 @@ bool cCcD_CpsAttr::CrossCo(cCcD_CpsAttr const& other, f32* param_1) const { /* 80263F24-80263F74 25E864 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf */ -bool cCcD_CpsAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { +bool cCcD_CpsAttr::CrossCo(cCcD_CylAttr const& cylAttr, f32* param_1) const { *param_1 = 0.0f; cXyz xyz; - if (this->cM3dGCps::Cross(¶m_0, &xyz)) { + if (cM3dGCps::Cross(&cylAttr, &xyz)) { return true; } else { return false; @@ -408,10 +416,10 @@ bool cCcD_CpsAttr::CrossCo(cCcD_CylAttr const& param_0, f32* param_1) const { /* 80263F74-80263FC4 25E8B4 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf */ -bool cCcD_CpsAttr::CrossCo(cCcD_SphAttr const& sph, f32* param_1) const { +bool cCcD_CpsAttr::CrossCo(cCcD_SphAttr const& sphAttr, f32* param_1) const { *param_1 = 0.0f; cXyz xyz; - if (this->cM3dGCps::Cross(&sph, &xyz)) { + if (cM3dGCps::Cross(&sphAttr, &xyz)) { return true; } else { return false; @@ -431,6 +439,7 @@ bool cCcD_CpsAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { Vec diff; const cXyz& endP = GetEndP(); PSVECSubtract(&endP, &mStart, &diff); + f32 diffLen = PSVECDotProduct(&diff, &diff); if (cM3d_IsZero(diffLen)) { return false; @@ -448,6 +457,7 @@ bool cCcD_CpsAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { PSVECAdd(&diff, &mStart, &vec2); } } + PSVECSubtract(¶m_0, &vec2, param_1); if (cM3d_IsZero(PSVECMag(param_1))) { param_1->set(0.0f, 0.0f, 0.0f); @@ -461,8 +471,8 @@ bool cCcD_CpsAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { /* 8026417C-802641C8 25EABC 004C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz */ -bool cCcD_CylAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { - if (this->cM3dGCyl::Cross(&cps, xyz)) { +bool cCcD_CylAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* p_xyz) const { + if (cM3dGCyl::Cross(&cpsAttr, p_xyz)) { return true; } else { return false; @@ -471,8 +481,8 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { /* 802641C8-8026420C 25EB08 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz */ -bool cCcD_CylAttr::CrossAtTg(cCcD_CylAttr const& other, cXyz* xyz) const { - if (this->cross(&other, xyz)) { +bool cCcD_CylAttr::CrossAtTg(cCcD_CylAttr const& other, cXyz* p_xyz) const { + if (cross(&other, p_xyz)) { return true; } else { return false; @@ -481,8 +491,8 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_CylAttr const& other, cXyz* xyz) const { /* 8026420C-80264250 25EB4C 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz */ -bool cCcD_CylAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { - if (this->cross(&sph, xyz)) { +bool cCcD_CylAttr::CrossAtTg(cCcD_SphAttr const& sphAttr, cXyz* p_xyz) const { + if (cross(&sphAttr, p_xyz)) { return true; } else { return false; @@ -491,8 +501,8 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { /* 80264250-80264288 25EB90 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz */ -bool cCcD_CylAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { - if (this->cM3dGCyl::Cross(tri, xyz)) { +bool cCcD_CylAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* p_xyz) const { + if (cM3dGCyl::Cross(triAttr, p_xyz)) { return true; } else { return false; @@ -502,7 +512,7 @@ bool cCcD_CylAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { /* 80264288-802642CC 25EBC8 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf */ bool cCcD_CylAttr::CrossCo(cCcD_CylAttr const& other, f32* f) const { - if (this->cM3dGCyl::Cross(&other, f)) { + if (cM3dGCyl::Cross(&other, f)) { return true; } else { return false; @@ -511,8 +521,8 @@ bool cCcD_CylAttr::CrossCo(cCcD_CylAttr const& other, f32* f) const { /* 802642CC-80264310 25EC0C 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf */ -bool cCcD_CylAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { - if (this->cM3dGCyl::Cross(&sph, f)) { +bool cCcD_CylAttr::CrossCo(cCcD_SphAttr const& sphAttr, f32* f) const { + if (cM3dGCyl::Cross(&sphAttr, f)) { return true; } else { return false; @@ -521,10 +531,10 @@ bool cCcD_CylAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { /* 80264310-80264368 25EC50 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf */ -bool cCcD_CylAttr::CrossCo(cCcD_CpsAttr const& cps, f32* f) const { +bool cCcD_CylAttr::CrossCo(cCcD_CpsAttr const& cpsAttr, f32* f) const { *f = 0.0f; cXyz xyz; - if (this->cM3dGCyl::Cross(&cps, &xyz)) { + if (cM3dGCyl::Cross(&cpsAttr, &xyz)) { return true; } else { return false; @@ -560,6 +570,7 @@ bool cCcD_CylAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { vec.y = param_0.y; } } + PSVECSubtract(¶m_0, &vec, param_1); if (cM3d_IsZero(PSVECMag(param_1))) { param_1->set(0.0f, 0.0f, 0.0f); @@ -573,23 +584,23 @@ bool cCcD_CylAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { /* 802644B8-802644EC 25EDF8 0034+00 1/0 1/0 0/0 .text * getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape */ -void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { - shape->_0 = 1; - shape->_4 = mCenter.x; - shape->_8 = mCenter.y; - shape->_C = mCenter.z; - shape->_10 = mRadius; - shape->_14 = mHeight; +void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* p_shape) const { + p_shape->_0 = 1; + p_shape->_4 = mCenter.x; + p_shape->_8 = mCenter.y; + p_shape->_C = mCenter.z; + p_shape->_10 = mRadius; + p_shape->_14 = mHeight; } -inline bool inlineCross(cM3dGSph const& sph, cM3dGCps const* cps, cXyz* xyz) { - return cM3d_Cross_CpsSph(*cps, sph, xyz); +inline bool inlineCross(cM3dGSph const& sph, cM3dGCps const* p_cps, cXyz* p_xyz) { + return cM3d_Cross_CpsSph(*p_cps, sph, p_xyz); } /* 802644EC-80264538 25EE2C 004C+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz */ -bool cCcD_SphAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { - if (inlineCross(*this, &cps, xyz)) { +bool cCcD_SphAttr::CrossAtTg(cCcD_CpsAttr const& cpsAttr, cXyz* p_xyz) const { + if (inlineCross(*this, &cpsAttr, p_xyz)) { return true; } else { return false; @@ -598,8 +609,8 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_CpsAttr const& cps, cXyz* xyz) const { /* 80264538-8026457C 25EE78 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz */ -bool cCcD_SphAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { - if (this->cross(&cyl, xyz)) { +bool cCcD_SphAttr::CrossAtTg(cCcD_CylAttr const& cylAttr, cXyz* p_xyz) const { + if (cross(&cylAttr, p_xyz)) { return true; } else { return false; @@ -608,8 +619,8 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_CylAttr const& cyl, cXyz* xyz) const { /* 8026457C-802645C0 25EEBC 0044+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz */ -bool cCcD_SphAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { - if (this->cross(&sph, xyz)) { +bool cCcD_SphAttr::CrossAtTg(cCcD_SphAttr const& sphAttr, cXyz* p_xyz) const { + if (cross(&sphAttr, p_xyz)) { return true; } else { return false; @@ -618,8 +629,8 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_SphAttr const& sph, cXyz* xyz) const { /* 802645C0-802645F8 25EF00 0038+00 1/0 1/0 0/0 .text * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz */ -bool cCcD_SphAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { - if (tri.cM3dGTri::Cross(*this, xyz)) { +bool cCcD_SphAttr::CrossAtTg(cCcD_TriAttr const& triAttr, cXyz* p_xyz) const { + if (triAttr.cM3dGTri::Cross(*this, p_xyz)) { return true; } else { return false; @@ -628,8 +639,8 @@ bool cCcD_SphAttr::CrossAtTg(cCcD_TriAttr const& tri, cXyz* xyz) const { /* 802645F8-80264644 25EF38 004C+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf */ -bool cCcD_SphAttr::CrossCo(cCcD_CylAttr const& cyl, f32* f) const { - if (this->cM3dGSph::Cross(&cyl, f)) { +bool cCcD_SphAttr::CrossCo(cCcD_CylAttr const& cylAttr, f32* f) const { + if (cM3dGSph::Cross(&cylAttr, f)) { return true; } else { return false; @@ -638,8 +649,8 @@ bool cCcD_SphAttr::CrossCo(cCcD_CylAttr const& cyl, f32* f) const { /* 80264644-80264688 25EF84 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf */ -bool cCcD_SphAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { - if (this->cM3dGSph::Cross(&sph, f)) { +bool cCcD_SphAttr::CrossCo(cCcD_SphAttr const& sphAttr, f32* f) const { + if (cM3dGSph::Cross(&sphAttr, f)) { return true; } else { return false; @@ -648,10 +659,10 @@ bool cCcD_SphAttr::CrossCo(cCcD_SphAttr const& sph, f32* f) const { /* 80264688-802646E0 25EFC8 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf */ -bool cCcD_SphAttr::CrossCo(cCcD_CpsAttr const& cps, f32* f) const { +bool cCcD_SphAttr::CrossCo(cCcD_CpsAttr const& cpsAttr, f32* f) const { *f = 0.0f; cXyz xyz; - if (this->cM3dGSph::Cross(&cps, &xyz)) { + if (cM3dGSph::Cross(&cpsAttr, &xyz)) { return true; } else { return false; @@ -696,13 +707,13 @@ bool cCcD_SphAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const { /* 80264808-8026483C 25F148 0034+00 1/0 1/0 0/0 .text * getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape */ -void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* shape) const { - shape->_0 = 0; - shape->_4 = mCenter.x; - shape->_8 = mCenter.y; - shape->_C = mCenter.z; - shape->_10 = mRadius; - shape->_14 = 0.0f; +void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* p_shape) const { + p_shape->_0 = 0; + p_shape->_4 = mCenter.x; + p_shape->_8 = mCenter.y; + p_shape->_C = mCenter.z; + p_shape->_10 = mRadius; + p_shape->_14 = 0.0f; } /* 8026483C-8026484C 25F17C 0010+00 0/0 1/1 0/0 .text SetHit__10cCcD_ObjAtFP8cCcD_Obj */ @@ -713,10 +724,10 @@ void cCcD_ObjAt::SetHit(cCcD_Obj* pObj) { /* 8026484C-80264868 25F18C 001C+00 1/1 0/0 0/0 .text Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt */ -void cCcD_ObjAt::Set(cCcD_SrcObjAt const& pSrc) { - mSPrm = pSrc.mSPrm; - mType = pSrc.mType; - mAtp = pSrc.mAtp; +void cCcD_ObjAt::Set(cCcD_SrcObjAt const& src) { + mSPrm = src.mSPrm; + mType = src.mType; + mAtp = src.mAtp; } /* 80264868-80264880 25F1A8 0018+00 0/0 2/2 0/0 .text ClrHit__10cCcD_ObjAtFv */ @@ -727,9 +738,9 @@ void cCcD_ObjAt::ClrHit() { /* 80264880-80264894 25F1C0 0014+00 1/1 0/0 0/0 .text Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg */ -void cCcD_ObjTg::Set(cCcD_SrcObjTg const& pSrc) { - mSPrm = pSrc.mSPrm; - mType = pSrc.mType; +void cCcD_ObjTg::Set(cCcD_SrcObjTg const& src) { + mSPrm = src.mSPrm; + mType = src.mType; } /* 80264894-802648B0 25F1D4 001C+00 0/0 0/0 2/2 .text SetGrp__10cCcD_ObjTgFUl */ diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index 30a36b666c0..791f2f31465 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -223,7 +223,7 @@ void cCcS::SetAtTgCommonHitInf(cCcD_Obj* obj1, cCcD_Obj* obj2, cXyz* pXyz) { obj1->SetAtHit(obj2); } bool tmp = !(obj1->ChkAtNoTgHitInfSet() || - (obj1->ChkAtType(0x80) && obj2->ChkTgNoSlingHitInfSet())); + (obj1->ChkAtType(AT_TYPE_SLINGSHOT) && obj2->ChkTgNoSlingHitInfSet())); if (tmp) { obj2->SetTgHit(obj1); this->CalcTgPlusDmg(obj1, obj2, obj1Stts, obj2Stts); diff --git a/libs/dolphin/gx/GXDisplayList.cpp b/libs/dolphin/gx/GXDisplayList.cpp index db3eaf7417a..a04d3196dae 100644 --- a/libs/dolphin/gx/GXDisplayList.cpp +++ b/libs/dolphin/gx/GXDisplayList.cpp @@ -1,30 +1,19 @@ -// -// Generated By: dol2asm -// Translation Unit: GXDisplayList -// - #include "dolphin/gx/GXDisplayList.h" +#include "dolphin/gx/GX.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// External References: -// - -extern "C" void __GXSetDirtyState(); -extern "C" void __GXSendFlushPrim(); -extern "C" extern void* __GXData; - -// -// Declarations: -// - /* 8035FEF0-8035FF60 35A830 0070+00 0/0 20/20 4/4 .text GXCallDisplayList */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void GXCallDisplayList(const void* pDL, u32 size) { - nofralloc -#include "asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s" +void GXCallDisplayList(void* list, u32 nbytes) { + if (__GXData->field_0x5ac != 0) { + __GXSetDirtyState(); + } + + if (*(u32*)__GXData == 0) { + __GXSendFlushPrim(); + } + + GFX_FIFO(u8) = 0x40; + GFX_FIFO(u32) = (u32)list; + GFX_FIFO(u32) = nbytes; } -#pragma pop diff --git a/libs/dolphin/gx/GXFifo.cpp b/libs/dolphin/gx/GXFifo.cpp index 12d256dc561..d170807548f 100644 --- a/libs/dolphin/gx/GXFifo.cpp +++ b/libs/dolphin/gx/GXFifo.cpp @@ -4,6 +4,8 @@ // #include "dolphin/gx/GXFifo.h" +#include "dolphin/gx/GX.h" +#include "dolphin/os/OS.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -11,48 +13,29 @@ // Forward References: // -extern "C" static void GXCPInterruptHandler(); -extern "C" void GXInitFifoBase(); -extern "C" void GXInitFifoPtrs(); -extern "C" static void GXInitFifoLimits(); -extern "C" void GXSetCPUFifo(); -extern "C" void GXSetGPFifo(); -extern "C" void GXSaveCPUFifo(); -extern "C" void __GXSaveCPUFifoAux(); -extern "C" void GXGetGPStatus(); -extern "C" void GXGetFifoBase(); -extern "C" void GXGetFifoSize(); -extern "C" void GXSetBreakPtCallback(); -extern "C" void __GXFifoInit(); -extern "C" void __GXFifoReadEnable(); -extern "C" void __GXFifoReadDisable(); -extern "C" void __GXFifoLink(); -extern "C" void __GXWriteFifoIntEnable(); -extern "C" void __GXWriteFifoIntReset(); -extern "C" void __GXCleanGPFifo(); -extern "C" void GXSetCurrentGXThread(); -extern "C" u32 GXGetCurrentGXThread(); -extern "C" u32 GXGetCPUFifo(); -extern "C" u32 GXGetGPFifo(); +extern "C" static void GXCPInterruptHandler(OSInterrupt, OSContext* ctx); +extern "C" static void GXInitFifoLimits(void); +extern "C" void GXSetCPUFifo(void); +extern "C" void GXSetGPFifo(void); +extern "C" void __GXSaveCPUFifoAux(void); +extern "C" void GXSetBreakPtCallback(void); +extern "C" void __GXFifoInit(void); +extern "C" void __GXFifoReadEnable(void); +extern "C" void __GXFifoReadDisable(void); +extern "C" void __GXFifoLink(u8); +extern "C" void __GXWriteFifoIntEnable(u8, u8); +extern "C" void __GXWriteFifoIntReset(u8, u8); +extern "C" void __GXCleanGPFifo(void); +extern "C" u32 GXGetGPFifo(void); // // External References: // -extern "C" void PPCSync(); -extern "C" void OSSetCurrentContext(); -extern "C" void OSClearContext(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void __OSSetInterruptHandler(); -extern "C" void __OSUnmaskInterrupts(); -extern "C" void OSGetCurrentThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSuspendThread(); -extern "C" void GXFlush(); -extern "C" extern u8 __piReg[4]; -extern "C" extern u8 __cpReg[4]; -extern "C" extern void* __GXData; +extern "C" void PPCSync(void); +extern "C" void OSSetCurrentContext(OSContext*); +extern "C" void OSClearContext(OSContext*); +extern "C" void GXFlush(void); // // Declarations: @@ -60,41 +43,74 @@ extern "C" extern void* __GXData; /* ############################################################################################## */ /* 80451948-8045194C 000E48 0004+00 4/3 0/0 0/0 .sbss CPUFifo */ -static u8 CPUFifo[4]; +static GXFifoObj* CPUFifo; /* 8045194C-80451950 000E4C 0004+00 4/3 0/0 0/0 .sbss GPFifo */ -static u8 GPFifo[4]; +static GXFifoObj* GPFifo; /* 80451950-80451954 000E50 0004+00 4/3 0/0 0/0 .sbss __GXCurrentThread */ -static u8 __GXCurrentThread[4]; +static OSThread* __GXCurrentThread; /* 80451954-80451958 000E54 0004+00 3/3 0/0 0/0 .sbss None */ static u8 data_80451954[4]; /* 80451958-8045195C 000E58 0004+00 2/2 0/0 0/0 .sbss GXOverflowSuspendInProgress */ -static u8 GXOverflowSuspendInProgress[4]; +static u32 GXOverflowSuspendInProgress; /* 8045195C-80451960 000E5C 0004+00 2/2 0/0 0/0 .sbss BreakPointCB */ -static u8 BreakPointCB[4]; +static void (*BreakPointCB)(void); /* 80451960-80451968 000E60 0004+04 1/1 0/0 0/0 .sbss __GXOverflowCount */ -static u8 __GXOverflowCount[4 + 4 /* padding */]; +static u32 __GXOverflowCount; /* 8035A5A8-8035A6DC 354EE8 0134+00 1/1 0/0 0/0 .text GXCPInterruptHandler */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void GXCPInterruptHandler() { +static asm void GXCPInterruptHandler(OSInterrupt, OSContext* ctx) { nofralloc #include "asm/dolphin/gx/GXFifo/GXCPInterruptHandler.s" } #pragma pop +/* static void GXCPInterruptHandler(__OSInterrupt, OSContext* ctx) { + OSContext sp10; + + __GXData->field_0xc = __cpReg[0]; + if (((__GXData->field_0x8 >> 3) & 1) && ((__GXData->field_0xc >> 1) & 1)) { + OSResumeThread(__GXCurrentThread); + GXOverflowSuspendInProgress = 0; + __GXWriteFifoIntReset(1, 1); + __GXWriteFifoIntEnable(1, 0); + } + + if (((__GXData->field_0x8 >> 2) & 1) && (__GXData->field_0xc & 1)) { + __GXOverflowCount++; + __GXWriteFifoIntEnable(0, 1); + __GXWriteFifoIntReset(1, 0); + GXOverflowSuspendInProgress = 1; + OSSuspendThread(__GXCurrentThread); + } + + if (((__GXData->field_0x8 >> 5) & 1) && ((__GXData->field_0xc >> 4) & 1)) { + __GXData->field_0x8 = __GXData->field_0x8 & ~(1 << 5); + __cpReg[1] = __GXData->field_0x8; + + if (BreakPointCB != NULL) { + OSClearContext(&sp10); + OSSetCurrentContext(&sp10); + BreakPointCB(); + OSClearContext(&sp10); + OSSetCurrentContext(ctx); + } + } +} */ + /* 8035A6DC-8035A748 35501C 006C+00 0/0 2/2 0/0 .text GXInitFifoBase */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXInitFifoBase() { +asm void GXInitFifoBase(GXFifoObj*, void*, u32) { nofralloc #include "asm/dolphin/gx/GXFifo/GXInitFifoBase.s" } @@ -104,7 +120,7 @@ asm void GXInitFifoBase() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXInitFifoPtrs() { +asm void GXInitFifoPtrs(GXFifoObj*, void*, void*) { nofralloc #include "asm/dolphin/gx/GXFifo/GXInitFifoPtrs.s" } @@ -114,7 +130,7 @@ asm void GXInitFifoPtrs() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void GXInitFifoLimits() { +static asm void GXInitFifoLimits(void) { nofralloc #include "asm/dolphin/gx/GXFifo/GXInitFifoLimits.s" } @@ -124,7 +140,7 @@ static asm void GXInitFifoLimits() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSetCPUFifo() { +asm void GXSetCPUFifo(void) { nofralloc #include "asm/dolphin/gx/GXFifo/GXSetCPUFifo.s" } @@ -134,7 +150,7 @@ asm void GXSetCPUFifo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSetGPFifo() { +asm void GXSetGPFifo(void) { nofralloc #include "asm/dolphin/gx/GXFifo/GXSetGPFifo.s" } @@ -144,7 +160,7 @@ asm void GXSetGPFifo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSaveCPUFifo() { +asm void GXSaveCPUFifo(GXFifoObj*) { nofralloc #include "asm/dolphin/gx/GXFifo/GXSaveCPUFifo.s" } @@ -154,7 +170,7 @@ asm void GXSaveCPUFifo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXSaveCPUFifoAux() { +asm void __GXSaveCPUFifoAux(void) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXSaveCPUFifoAux.s" } @@ -164,7 +180,7 @@ asm void __GXSaveCPUFifoAux() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXGetGPStatus() { +asm void GXGetGPStatus(GXBool*, GXBool*, GXBool*, GXBool*, GXBool*) { nofralloc #include "asm/dolphin/gx/GXFifo/GXGetGPStatus.s" } @@ -174,7 +190,7 @@ asm void GXGetGPStatus() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXGetFifoBase() { +asm void* GXGetFifoBase(GXFifoObj*) { nofralloc #include "asm/dolphin/gx/GXFifo/GXGetFifoBase.s" } @@ -184,7 +200,7 @@ asm void GXGetFifoBase() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXGetFifoSize() { +asm u32 GXGetFifoSize(GXFifoObj*) { nofralloc #include "asm/dolphin/gx/GXFifo/GXGetFifoSize.s" } @@ -194,7 +210,7 @@ asm void GXGetFifoSize() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSetBreakPtCallback() { +asm void GXSetBreakPtCallback(void) { nofralloc #include "asm/dolphin/gx/GXFifo/GXSetBreakPtCallback.s" } @@ -204,7 +220,7 @@ asm void GXSetBreakPtCallback() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXFifoInit() { +asm void __GXFifoInit(void) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXFifoInit.s" } @@ -214,7 +230,7 @@ asm void __GXFifoInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXFifoReadEnable() { +asm void __GXFifoReadEnable(void) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXFifoReadEnable.s" } @@ -224,7 +240,7 @@ asm void __GXFifoReadEnable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXFifoReadDisable() { +asm void __GXFifoReadDisable(void) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXFifoReadDisable.s" } @@ -234,7 +250,7 @@ asm void __GXFifoReadDisable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXFifoLink() { +asm void __GXFifoLink(u8) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXFifoLink.s" } @@ -244,7 +260,7 @@ asm void __GXFifoLink() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXWriteFifoIntEnable() { +asm void __GXWriteFifoIntEnable(u8, u8) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXWriteFifoIntEnable.s" } @@ -254,7 +270,7 @@ asm void __GXWriteFifoIntEnable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXWriteFifoIntReset() { +asm void __GXWriteFifoIntReset(u8, u8) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXWriteFifoIntReset.s" } @@ -264,7 +280,7 @@ asm void __GXWriteFifoIntReset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __GXCleanGPFifo() { +asm void __GXCleanGPFifo(void) { nofralloc #include "asm/dolphin/gx/GXFifo/__GXCleanGPFifo.s" } @@ -274,23 +290,23 @@ asm void __GXCleanGPFifo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXSetCurrentGXThread() { +asm OSThread* GXSetCurrentGXThread(void) { nofralloc #include "asm/dolphin/gx/GXFifo/GXSetCurrentGXThread.s" } #pragma pop /* 8035AEA0-8035AEA8 -00001 0008+00 0/0 0/0 0/0 .text GXGetCurrentGXThread */ -u32 GXGetCurrentGXThread() { - return *(u32*)(&__GXCurrentThread); +OSThread* GXGetCurrentGXThread(void) { + return *(OSThread**)(&__GXCurrentThread); } /* 8035AEA8-8035AEB0 -00001 0008+00 0/0 0/0 0/0 .text GXGetCPUFifo */ -u32 GXGetCPUFifo() { - return *(u32*)(&CPUFifo); +GXFifoObj* GXGetCPUFifo(void) { + return *(GXFifoObj**)(&CPUFifo); } /* 8035AEB0-8035AEB8 -00001 0008+00 0/0 0/0 0/0 .text GXGetGPFifo */ -u32 GXGetGPFifo() { +u32 GXGetGPFifo(void) { return *(u32*)(&GPFifo); } diff --git a/libs/dolphin/gx/GXInit.cpp b/libs/dolphin/gx/GXInit.cpp index 8e64d0e4dbb..609b8eeba36 100644 --- a/libs/dolphin/gx/GXInit.cpp +++ b/libs/dolphin/gx/GXInit.cpp @@ -4,6 +4,7 @@ // #include "dolphin/gx/GXInit.h" +#include "dolphin/gx/GX.h" #include "dol2asm.h" #include "dolphin/types.h" @@ -15,7 +16,6 @@ extern "C" void __GXDefaultTexRegionCallback(); extern "C" void __GXDefaultTlutRegionCallback(); extern "C" void __GXShutdown(); extern "C" void __GXInitRevisionBits(); -extern "C" void GXInit(); extern "C" void __GXInitGX(); // @@ -30,18 +30,13 @@ extern "C" void OSRegisterVersion(); extern "C" void OSRegisterResetFunction(); extern "C" void OSGetTime(); extern "C" void VIGetTvFormat(); -extern "C" void GXInitFifoBase(); extern "C" void GXSetCPUFifo(); extern "C" void GXSetGPFifo(); extern "C" void GXSetBreakPtCallback(); extern "C" void __GXFifoInit(); extern "C" void GXClearVtxDesc(); extern "C" void GXSetVtxAttrFmtv(); -extern "C" void GXSetArray(); extern "C" void GXInvalidateVtxCache(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXSetMisc(); extern "C" void __GXAbort(); extern "C" void GXPokeAlphaMode(); extern "C" void GXPokeAlphaRead(); @@ -52,71 +47,22 @@ extern "C" void GXPokeDstAlpha(); extern "C" void GXPokeDither(); extern "C" void GXPokeZMode(); extern "C" void GXSetDrawSyncCallback(); -extern "C" void GXSetDrawDoneCallback(); extern "C" void __GXPEInit(); -extern "C" void GXSetLineWidth(); -extern "C" void GXSetPointSize(); -extern "C" void GXEnableTexOffsets(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetCoPlanar(); -extern "C" void GXSetDispCopySrc(); -extern "C" void GXSetDispCopyDst(); extern "C" void GXSetDispCopyFrame2Field(); -extern "C" void GXSetCopyClamp(); -extern "C" void GXSetDispCopyYScale(); -extern "C" void GXSetCopyClear(); -extern "C" void GXSetCopyFilter(); -extern "C" void GXSetDispCopyGamma(); extern "C" void GXClearBoundingBox(); -extern "C" void GXSetChanAmbColor(); -extern "C" void GXSetChanMatColor(); -extern "C" void GXSetNumChans(); -extern "C" void GXSetChanCtrl(); -extern "C" void GXInitTexObj(); extern "C" void GXGetTexObjFmt(); extern "C" void GXGetTexObjMipMap(); -extern "C" void GXLoadTexObj(); -extern "C" void GXInitTexCacheRegion(); extern "C" void GXInitTlutRegion(); extern "C" void GXInvalidateTexAll(); extern "C" void GXSetTexRegionCallback(); extern "C" void GXSetTlutRegionCallback(); extern "C" void __GXSetTmemConfig(); -extern "C" void GXSetIndTexCoordScale(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevDirect(); extern "C" void __GXSetIndirectMask(); extern "C" void __GXFlushTextureState(); -extern "C" void GXSetTevOp(); -extern "C" void GXSetTevKColorSel(); -extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevSwapMode(); -extern "C" void GXSetTevSwapModeTable(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetZTexture(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetFogRangeAdj(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetColorUpdate(); -extern "C" void GXSetAlphaUpdate(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetPixelFmt(); -extern "C" void GXSetDither(); -extern "C" void GXSetDstAlpha(); extern "C" void GXSetFieldMask(); extern "C" void GXSetFieldMode(); extern "C" void GXSetProjectionv(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXLoadNrmMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXLoadTexMtxImm(); -extern "C" void GXSetViewport(); -extern "C" void GXSetScissor(); extern "C" void GXSetScissorBoxOffset(); -extern "C" void GXSetClipMode(); extern "C" void GXSetGPMetric(); extern "C" void GXClearGPMetric(); extern "C" extern u8 GXNtsc480IntDf[60]; @@ -130,13 +76,13 @@ extern "C" extern u8 GXEurgb60Hz480IntDf[60 + 4 /* padding */]; /* ############################################################################################## */ /* 8044CE00-8044CE80 079B20 0080+00 1/1 0/0 0/0 .bss FifoObj */ -static u8 FifoObj[128]; +static GXFifoObj FifoObj; /* 8044CE80-8044D430 079BA0 05B0+00 1/0 0/0 0/0 .bss gxData */ -static u8 gxData[1456]; +static GXData gxData; /* 80456580-80456584 -00001 0004+00 6/6 108/108 0/0 .sdata2 __GXData */ -SECTION_SDATA2 extern void* __GXData = (void*)&gxData; +SECTION_SDATA2 extern GXData* __GXData = &gxData; /* 8035921C-80359318 353B5C 00FC+00 1/1 0/0 0/0 .text __GXDefaultTexRegionCallback */ #pragma push @@ -160,12 +106,10 @@ asm void __GXDefaultTlutRegionCallback() { /* ############################################################################################## */ /* 80451920-80451924 000E20 0004+00 1/1 2/2 0/0 .sbss __piReg */ -extern u8 __piReg[4]; -u8 __piReg[4]; +u32* __piReg; /* 80451924-80451928 000E24 0004+00 2/2 12/12 0/0 .sbss __cpReg */ -extern u8 __cpReg[4]; -u8 __cpReg[4]; +u16* __cpReg; /* 80451928-8045192C 000E28 0004+00 1/1 11/11 0/0 .sbss __peReg */ extern u8 __peReg[4]; @@ -209,110 +153,12 @@ asm void __GXInitRevisionBits() { /* ############################################################################################## */ /* 803D2040-803D20A0 02F160 0044+1C 2/1 0/0 0/0 .data @1 */ -SECTION_DATA static u8 lit_1[68 + 28 /* padding */] = { - 0x3C, - 0x3C, - 0x20, - 0x44, - 0x6F, - 0x6C, - 0x70, - 0x68, - 0x69, - 0x6E, - 0x20, - 0x53, - 0x44, - 0x4B, - 0x20, - 0x2D, - 0x20, - 0x47, - 0x58, - 0x09, - 0x72, - 0x65, - 0x6C, - 0x65, - 0x61, - 0x73, - 0x65, - 0x20, - 0x62, - 0x75, - 0x69, - 0x6C, - 0x64, - 0x3A, - 0x20, - 0x4E, - 0x6F, - 0x76, - 0x20, - 0x31, - 0x30, - 0x20, - 0x32, - 0x30, - 0x30, - 0x34, - 0x20, - 0x30, - 0x36, - 0x3A, - 0x32, - 0x37, - 0x3A, - 0x31, - 0x32, - 0x20, - 0x28, - 0x30, - 0x78, - 0x32, - 0x33, - 0x30, - 0x31, - 0x29, - 0x20, - 0x3E, - 0x3E, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_1[] = "<< Dolphin SDK - GX release build: Nov 10 2004 06:27:12 (0x2301) >>"; /* 803D20A0-803D20C0 02F1C0 0020+00 0/1 0/0 0/0 .data DefaultTexData */ #pragma push #pragma force_active on -SECTION_DATA static u8 DefaultTexData[32] = { +SECTION_DATA static u8 DefaultTexData[32] ALIGN_DECL(32) = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, }; @@ -374,11 +220,7 @@ SECTION_DATA static void* GXResetFuncInfo[4 + 1 /* padding */] = { }; /* 80450A78-80450A80 -00001 0004+04 1/1 0/0 0/0 .sdata __GXVersion */ -SECTION_SDATA static void* __GXVersion[1 + 1 /* padding */] = { - (void*)&lit_1, - /* padding */ - NULL, -}; +SECTION_SDATA static const char* __GXVersion = lit_1; /* 80451944-80451948 000E44 0004+00 1/1 0/0 0/0 .sbss resetFuncRegistered$145 */ static u8 resetFuncRegistered[4]; @@ -398,7 +240,7 @@ SECTION_SDATA2 static u8 lit_268[4] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXInit() { +asm GXFifoObj* GXInit(void*, u32) { nofralloc #include "asm/dolphin/gx/GXInit/GXInit.s" } diff --git a/libs/dolphin/gx/Makefile b/libs/dolphin/gx/Makefile index 9b34fdb414c..0b972d775e2 100644 --- a/libs/dolphin/gx/Makefile +++ b/libs/dolphin/gx/Makefile @@ -35,6 +35,7 @@ LIBGX_A_O_FILES := \ $(BUILD_DIR)/libs/dolphin/gx/GXPerf.o \ LIBGX_A_CFLAGS := \ + -O4,p \ LIBGX_A_LDFLAGS := \ -nodefaults \ @@ -51,5 +52,5 @@ $(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.cpp @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBGX_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBGX_A_CFLAGS) -c -o $@ $(basename $@).cpp diff --git a/libs/dolphin/os/Makefile b/libs/dolphin/os/Makefile index 0b83385b86c..0899b99d027 100644 --- a/libs/dolphin/os/Makefile +++ b/libs/dolphin/os/Makefile @@ -53,6 +53,7 @@ LIBOS_A_O_FILES := \ $(BUILD_DIR)/libs/dolphin/os/__ppc_eabi_init.o \ LIBOS_A_CFLAGS := \ + -O4,p \ LIBOS_A_LDFLAGS := \ -nodefaults \ @@ -69,5 +70,5 @@ $(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.cpp @mkdir -p $(@D) @echo building... $< @$(ICONV) -f UTF-8 -t CP932 < $< > $(basename $@).cpp - @$(CC) $(CFLAGS) $(LIBOS_A_CFLAGS) -c -o $@ $(basename $@).cpp + @$(WINE) tools/mwcc_compiler/1.2.5/mwcceppc.exe $(CFLAGS) $(LIBOS_A_CFLAGS) -c -o $@ $(basename $@).cpp diff --git a/libs/dolphin/os/OS.cpp b/libs/dolphin/os/OS.cpp index f9272dcc787..9d93ce9f8d5 100644 --- a/libs/dolphin/os/OS.cpp +++ b/libs/dolphin/os/OS.cpp @@ -7,37 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct dBgW {}; - -struct daBgObj_c { - /* 80459BB4 */ void regist(dBgW*); -}; - -// -// Forward References: -// - -extern "C" void __OSFPRInit(); -extern "C" static void InquiryCallback(); -extern "C" void OSInit(); -extern "C" static void OSExceptionInit(); -extern "C" void __OSDBIntegrator(); -extern "C" void __OSDBJump(); -extern "C" void __OSSetExceptionHandler(); -extern "C" void __OSGetExceptionHandler(); -extern "C" static void OSExceptionVector(); -extern "C" void __DBVECTOR(); -extern "C" void __OSEVSetNumber(); -extern "C" void __OSEVEnd(); -extern "C" static void OSDefaultExceptionHandler(); -extern "C" void __OSPSInit(); -extern "C" void __OSGetDIConfig(); -extern "C" void OSRegisterVersion(); - // // External References: // @@ -56,15 +25,8 @@ extern "C" void PPCDisableSpeculation(); extern "C" void PPCSetFpNonIEEEMode(); extern "C" void OSInitAlarm(); extern "C" void __OSInitAudioSystem(); -extern "C" void DCInvalidateRange(); -extern "C" void DCFlushRangeNoSync(); -extern "C" void ICInvalidateRange(); -extern "C" void ICFlashInvalidate(); extern "C" void __OSCacheInit(); extern "C" void __OSContextInit(); -extern "C" void __OSUnhandledException(); -extern "C" void __OSGetExecParams(); -extern "C" void __OSSetInterruptHandler(); extern "C" void __OSInterruptInit(); extern "C" void __OSModuleInit(); extern "C" void __OSInitMemoryProtection(); @@ -72,7 +34,6 @@ extern "C" void __OSResetSWInterruptHandler(); extern "C" void __OSInitSram(); extern "C" void __OSInitSystemCall(); extern "C" void __OSThreadInit(); -extern "C" void __OSGetSystemTime(); extern "C" void EXIInit(); extern "C" void SIInit(); extern "C" void __DBIsExceptionMarked(); @@ -113,7 +74,7 @@ static u8 ZeroPS[8]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSFPRInit() { +asm void __OSFPRInit(void) { nofralloc #include "asm/dolphin/os/OS/__OSFPRInit.s" } @@ -123,7 +84,7 @@ asm void __OSFPRInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm s32 OSGetConsoleType() { +asm u32 OSGetConsoleType(void) { nofralloc #include "asm/dolphin/os/OS/OSGetConsoleType.s" } @@ -137,7 +98,7 @@ static u8 DriveInfo[32]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void InquiryCallback() { +static asm void InquiryCallback(u32 param_0, void* param_1) { nofralloc #include "asm/dolphin/os/OS/InquiryCallback.s" } @@ -145,312 +106,84 @@ static asm void InquiryCallback() { /* ############################################################################################## */ /* 803CF288-803CF2CC 02C3A8 0044+00 3/2 0/0 0/0 .data @1 */ -SECTION_DATA static u8 lit_1[68] = { - 0x3C, 0x3C, 0x20, 0x44, 0x6F, 0x6C, 0x70, 0x68, 0x69, 0x6E, 0x20, 0x53, 0x44, 0x4B, - 0x20, 0x2D, 0x20, 0x4F, 0x53, 0x09, 0x72, 0x65, 0x6C, 0x65, 0x61, 0x73, 0x65, 0x20, - 0x62, 0x75, 0x69, 0x6C, 0x64, 0x3A, 0x20, 0x4E, 0x6F, 0x76, 0x20, 0x31, 0x30, 0x20, - 0x32, 0x30, 0x30, 0x34, 0x20, 0x30, 0x36, 0x3A, 0x32, 0x36, 0x3A, 0x34, 0x31, 0x20, - 0x28, 0x30, 0x78, 0x32, 0x33, 0x30, 0x31, 0x29, 0x20, 0x3E, 0x3E, 0x00, -}; +SECTION_DATA static char lit_1[68] = "<< Dolphin SDK - OS release build: Nov 10 2004 06:26:41 (0x2301) >>"; /* 803CF2CC-803CF2DC 02C3EC 000D+03 0/1 0/0 0/0 .data @105 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_105[13 + 3 /* padding */] = { - 0x0A, - 0x44, - 0x6F, - 0x6C, - 0x70, - 0x68, - 0x69, - 0x6E, - 0x20, - 0x4F, - 0x53, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_105[13] = "\nDolphin OS\n"; #pragma pop /* 803CF2DC-803CF2F4 02C3FC 0016+02 0/1 0/0 0/0 .data @106 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_106[22 + 2 /* padding */] = { - 0x4B, - 0x65, - 0x72, - 0x6E, - 0x65, - 0x6C, - 0x20, - 0x62, - 0x75, - 0x69, - 0x6C, - 0x74, - 0x20, - 0x3A, - 0x20, - 0x25, - 0x73, - 0x20, - 0x25, - 0x73, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static char lit_106[22] = "Kernel built : %s %s\n"; #pragma pop /* 803CF2F4-803CF300 02C414 000C+00 0/1 0/0 0/0 .data @107 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_107[12] = { - 0x4E, 0x6F, 0x76, 0x20, 0x31, 0x30, 0x20, 0x32, 0x30, 0x30, 0x34, 0x00, -}; +SECTION_DATA static char lit_107[12] = "Nov 10 2004"; #pragma pop /* 803CF300-803CF30C 02C420 0009+03 0/1 0/0 0/0 .data @108 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_108[9 + 3 /* padding */] = { - 0x30, - 0x36, - 0x3A, - 0x32, - 0x36, - 0x3A, - 0x34, - 0x31, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_108[9] = "06:26:41"; #pragma pop /* 803CF30C-803CF31C 02C42C 0010+00 0/1 0/0 0/0 .data @109 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_109[16] = { - 0x43, 0x6F, 0x6E, 0x73, 0x6F, 0x6C, 0x65, 0x20, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3A, 0x20, 0x00, -}; +SECTION_DATA static char lit_109[16] = "Console Type : "; #pragma pop /* 803CF31C-803CF328 02C43C 000B+01 0/1 0/0 0/0 .data @110 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_110[11 + 1 /* padding */] = { - 0x52, - 0x65, - 0x74, - 0x61, - 0x69, - 0x6C, - 0x20, - 0x25, - 0x64, - 0x0A, - 0x00, - /* padding */ - 0x00, -}; +SECTION_DATA static char lit_110[11] = "Retail %d\n"; #pragma pop /* 803CF328-803CF338 02C448 000E+02 0/1 0/0 0/0 .data @111 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_111[14 + 2 /* padding */] = { - 0x4D, - 0x61, - 0x63, - 0x20, - 0x45, - 0x6D, - 0x75, - 0x6C, - 0x61, - 0x74, - 0x6F, - 0x72, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static char lit_111[14] = "Mac Emulator\n"; #pragma pop /* 803CF338-803CF348 02C458 000D+03 0/1 0/0 0/0 .data @112 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_112[13 + 3 /* padding */] = { - 0x50, - 0x43, - 0x20, - 0x45, - 0x6D, - 0x75, - 0x6C, - 0x61, - 0x74, - 0x6F, - 0x72, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_112[13] = "PC Emulator\n"; #pragma pop /* 803CF348-803CF358 02C468 000D+03 0/1 0/0 0/0 .data @113 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_113[13 + 3 /* padding */] = { - 0x45, - 0x50, - 0x50, - 0x43, - 0x20, - 0x41, - 0x72, - 0x74, - 0x68, - 0x75, - 0x72, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_113[13] = "EPPC Arthur\n"; #pragma pop /* 803CF358-803CF368 02C478 000D+03 0/1 0/0 0/0 .data @114 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_114[13 + 3 /* padding */] = { - 0x45, - 0x50, - 0x50, - 0x43, - 0x20, - 0x4D, - 0x69, - 0x6E, - 0x6E, - 0x6F, - 0x77, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_114[13] = "EPPC Minnow\n"; #pragma pop /* 803CF368-803CF384 02C488 0019+03 0/1 0/0 0/0 .data @115 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_115[25 + 3 /* padding */] = { - 0x44, - 0x65, - 0x76, - 0x65, - 0x6C, - 0x6F, - 0x70, - 0x6D, - 0x65, - 0x6E, - 0x74, - 0x20, - 0x48, - 0x57, - 0x25, - 0x64, - 0x20, - 0x28, - 0x25, - 0x30, - 0x38, - 0x78, - 0x29, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_115[25] = "Development HW%d (%08x)\n"; #pragma pop /* 803CF384-803CF394 02C4A4 000E+02 0/1 0/0 0/0 .data @117 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_117[14 + 2 /* padding */] = { - 0x4D, - 0x65, - 0x6D, - 0x6F, - 0x72, - 0x79, - 0x20, - 0x25, - 0x64, - 0x20, - 0x4D, - 0x42, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static char lit_117[14] = "Memory %d MB\n"; #pragma pop /* 803CF394-803CF3AC 02C4B4 0015+03 0/1 0/0 0/0 .data @118 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_118[21 + 3 /* padding */] = { - 0x41, - 0x72, - 0x65, - 0x6E, - 0x61, - 0x20, - 0x3A, - 0x20, - 0x30, - 0x78, - 0x25, - 0x78, - 0x20, - 0x2D, - 0x20, - 0x30, - 0x78, - 0x25, - 0x78, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static char lit_118[21] = "Arena : 0x%x - 0x%x\n"; #pragma pop /* 8044BA80-8044BAB0 0787A0 0030+00 0/1 0/0 0/0 .bss DriveBlock */ @@ -467,17 +200,7 @@ u8 __OSRebootParams[28 + 4 /* padding */]; SECTION_SDATA static void* __OSVersion = (void*)&lit_1; /* 80450984-8045098C 000404 0006+02 1/1 0/0 0/0 .sdata @116 */ -SECTION_SDATA static u8 lit_116[6 + 2 /* padding */] = { - 0x25, - 0x30, - 0x38, - 0x78, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_SDATA static char lit_116[6] = "%08x\n"; /* 80451620-80451624 000B20 0004+00 1/1 0/0 0/0 .sbss AreWeInitialized */ static u8 AreWeInitialized[4]; @@ -504,7 +227,7 @@ extern void* _stack_end; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInit() { +asm void OSInit(void) { nofralloc #include "asm/dolphin/os/OS/OSInit.s" } @@ -525,192 +248,32 @@ SECTION_DATA static u8 __OSExceptionLocations[60] = { /* 803CF3E8-803CF404 02C508 001B+01 0/1 0/0 0/0 .data @152 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_152[27 + 1 /* padding */] = { - 0x49, - 0x6E, - 0x73, - 0x74, - 0x61, - 0x6C, - 0x6C, - 0x69, - 0x6E, - 0x67, - 0x20, - 0x4F, - 0x53, - 0x44, - 0x42, - 0x49, - 0x6E, - 0x74, - 0x65, - 0x67, - 0x72, - 0x61, - 0x74, - 0x6F, - 0x72, - 0x0A, - 0x00, - /* padding */ - 0x00, -}; +SECTION_DATA static char lit_152[27] = "Installing OSDBIntegrator\n"; #pragma pop /* 803CF404-803CF434 02C524 002E+02 0/1 0/0 0/0 .data @153 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_153[46 + 2 /* padding */] = { - 0x3E, - 0x3E, - 0x3E, - 0x20, - 0x4F, - 0x53, - 0x49, - 0x4E, - 0x49, - 0x54, - 0x3A, - 0x20, - 0x65, - 0x78, - 0x63, - 0x65, - 0x70, - 0x74, - 0x69, - 0x6F, - 0x6E, - 0x20, - 0x25, - 0x64, - 0x20, - 0x63, - 0x6F, - 0x6D, - 0x6D, - 0x61, - 0x6E, - 0x64, - 0x65, - 0x65, - 0x72, - 0x65, - 0x64, - 0x20, - 0x62, - 0x79, - 0x20, - 0x54, - 0x52, - 0x4B, - 0x0A, - 0x00, - /* padding */ - 0x00, - 0x00, -}; +SECTION_DATA static char lit_153[46] = ">>> OSINIT: exception %d commandeered by TRK\n"; #pragma pop /* 803CF434-803CF464 02C554 002F+01 0/1 0/0 0/0 .data @154 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_154[47 + 1 /* padding */] = { - 0x3E, - 0x3E, - 0x3E, - 0x20, - 0x4F, - 0x53, - 0x49, - 0x4E, - 0x49, - 0x54, - 0x3A, - 0x20, - 0x65, - 0x78, - 0x63, - 0x65, - 0x70, - 0x74, - 0x69, - 0x6F, - 0x6E, - 0x20, - 0x25, - 0x64, - 0x20, - 0x76, - 0x65, - 0x63, - 0x74, - 0x6F, - 0x72, - 0x65, - 0x64, - 0x20, - 0x74, - 0x6F, - 0x20, - 0x64, - 0x65, - 0x62, - 0x75, - 0x67, - 0x67, - 0x65, - 0x72, - 0x0A, - 0x00, - /* padding */ - 0x00, -}; +SECTION_DATA static char lit_154[47] = ">>> OSINIT: exception %d vectored to debugger\n"; #pragma pop /* 803CF464-803CF480 02C584 001B+01 0/1 0/0 0/0 .data @155 */ #pragma push #pragma force_active on -SECTION_DATA static u8 lit_155[27 + 1 /* padding */] = { - 0x45, - 0x78, - 0x63, - 0x65, - 0x70, - 0x74, - 0x69, - 0x6F, - 0x6E, - 0x73, - 0x20, - 0x69, - 0x6E, - 0x69, - 0x74, - 0x69, - 0x61, - 0x6C, - 0x69, - 0x7A, - 0x65, - 0x64, - 0x2E, - 0x2E, - 0x2E, - 0x0A, - 0x00, - /* padding */ - 0x00, -}; +SECTION_DATA static char lit_155[27] = "Exceptions initialized...\n"; #pragma pop /* 8033A440-8033A6C0 334D80 0280+00 1/1 0/0 0/0 .text OSExceptionInit */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSExceptionInit() { +static asm void OSExceptionInit(void) { nofralloc #include "asm/dolphin/os/OS/OSExceptionInit.s" } @@ -720,7 +283,7 @@ static asm void OSExceptionInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSDBIntegrator() { +asm void __OSDBIntegrator(void) { nofralloc #include "asm/dolphin/os/OS/__OSDBIntegrator.s" } @@ -730,7 +293,7 @@ asm void __OSDBIntegrator() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSDBJump() { +asm void __OSDBJump(void) { nofralloc #include "asm/dolphin/os/OS/__OSDBJump.s" } @@ -740,7 +303,7 @@ asm void __OSDBJump() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSSetExceptionHandler() { +asm OSExceptionHandler __OSSetExceptionHandler(OSException exception, OSExceptionHandler handler) { nofralloc #include "asm/dolphin/os/OS/__OSSetExceptionHandler.s" } @@ -750,7 +313,7 @@ asm void __OSSetExceptionHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetExceptionHandler() { +asm OSExceptionHandler __OSGetExceptionHandler(OSException exception) { nofralloc #include "asm/dolphin/os/OS/__OSGetExceptionHandler.s" } @@ -760,12 +323,13 @@ asm void __OSGetExceptionHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSExceptionVector() { +static asm void OSExceptionVector(void) { nofralloc #include "asm/dolphin/os/OS/OSExceptionVector.s" } #pragma pop +// fake function? /* 8033A770-8033A780 3350B0 0010+00 1/1 0/0 0/0 .text __DBVECTOR */ #pragma push #pragma optimization_level 0 @@ -776,6 +340,7 @@ asm void __DBVECTOR() { } #pragma pop +// fake function? /* 8033A780-8033A7B0 3350C0 0030+00 1/1 0/0 0/0 .text __OSEVSetNumber */ #pragma push #pragma optimization_level 0 @@ -796,11 +361,12 @@ asm void __OSEVEnd() { } #pragma pop +// fake function? /* 8033A7B4-8033A80C 3350F4 0058+00 2/2 0/0 0/0 .text OSDefaultExceptionHandler */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSDefaultExceptionHandler() { +static asm void OSDefaultExceptionHandler(OSException exception, OSContext* context) { nofralloc #include "asm/dolphin/os/OS/OSDefaultExceptionHandler.s" } @@ -810,7 +376,7 @@ static asm void OSDefaultExceptionHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSPSInit() { +asm void __OSPSInit(void) { nofralloc #include "asm/dolphin/os/OS/__OSPSInit.s" } @@ -820,7 +386,7 @@ asm void __OSPSInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetDIConfig() { +asm void __OSGetDIConfig(void) { nofralloc #include "asm/dolphin/os/OS/__OSGetDIConfig.s" } @@ -828,13 +394,13 @@ asm void __OSGetDIConfig() { /* ############################################################################################## */ /* 8045098C-80450990 00040C 0004+00 1/1 0/0 0/0 .sdata @163 */ -SECTION_SDATA static u32 lit_163 = 0x25730A00; +SECTION_SDATA static char lit_163[4] = "%s\n"; /* 8033A874-8033A8A0 3351B4 002C+00 1/1 11/11 0/0 .text OSRegisterVersion */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSRegisterVersion() { +asm void OSRegisterVersion(char* version) { nofralloc #include "asm/dolphin/os/OS/OSRegisterVersion.s" } diff --git a/libs/dolphin/os/OSAlarm.cpp b/libs/dolphin/os/OSAlarm.cpp index 0e8170bfefe..bccb9a21ba1 100644 --- a/libs/dolphin/os/OSAlarm.cpp +++ b/libs/dolphin/os/OSAlarm.cpp @@ -7,20 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSInitAlarm(); -extern "C" void OSCreateAlarm(); -extern "C" static void InsertAlarm(); -extern "C" void OSSetAlarm(); -extern "C" void OSSetPeriodicAlarm(); -extern "C" void OSCancelAlarm(); -extern "C" static void DecrementerExceptionCallback(); -extern "C" static void DecrementerExceptionHandler(); -extern "C" static void OnReset(); - // // External References: // @@ -37,8 +23,6 @@ extern "C" void OSRegisterResetFunction(); extern "C" void OSDisableScheduler(); extern "C" void OSEnableScheduler(); extern "C" void __OSReschedule(); -extern "C" void __OSGetSystemTime(); -extern "C" void __OSTimeToSystemTime(); extern "C" void __DVDTestAlarm(); extern "C" void __div2i(); @@ -62,7 +46,7 @@ static u8 AlarmQueue[8]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitAlarm() { +asm void OSInitAlarm(void) { nofralloc #include "asm/dolphin/os/OSAlarm/OSInitAlarm.s" } @@ -72,7 +56,7 @@ asm void OSInitAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCreateAlarm() { +asm void OSCreateAlarm(OSAlarm* alarm) { nofralloc #include "asm/dolphin/os/OSAlarm/OSCreateAlarm.s" } @@ -82,7 +66,7 @@ asm void OSCreateAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void InsertAlarm() { +static asm void InsertAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler* handler) { nofralloc #include "asm/dolphin/os/OSAlarm/InsertAlarm.s" } @@ -92,7 +76,7 @@ static asm void InsertAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetAlarm() { +asm void OSSetAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler* handler) { nofralloc #include "asm/dolphin/os/OSAlarm/OSSetAlarm.s" } @@ -102,7 +86,7 @@ asm void OSSetAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetPeriodicAlarm() { +asm void OSSetPeriodicAlarm(OSAlarm* alarm, s64 start, s64 period, OSAlarmHandler* handler) { nofralloc #include "asm/dolphin/os/OSAlarm/OSSetPeriodicAlarm.s" } @@ -112,7 +96,7 @@ asm void OSSetPeriodicAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCancelAlarm() { +asm void OSCancelAlarm(OSAlarm* alarm) { nofralloc #include "asm/dolphin/os/OSAlarm/OSCancelAlarm.s" } @@ -122,7 +106,7 @@ asm void OSCancelAlarm() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void DecrementerExceptionCallback() { +static asm void DecrementerExceptionCallback(OSException* exception, struct OSContext* context) { nofralloc #include "asm/dolphin/os/OSAlarm/DecrementerExceptionCallback.s" } @@ -132,7 +116,7 @@ static asm void DecrementerExceptionCallback() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void DecrementerExceptionHandler() { +static asm void DecrementerExceptionHandler(OSException* exception, struct OSContext* context) { nofralloc #include "asm/dolphin/os/OSAlarm/DecrementerExceptionHandler.s" } @@ -142,7 +126,7 @@ static asm void DecrementerExceptionHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OnReset() { +static asm s32 OnReset(s32 param_0) { nofralloc #include "asm/dolphin/os/OSAlarm/OnReset.s" } diff --git a/libs/dolphin/os/OSAlloc.cpp b/libs/dolphin/os/OSAlloc.cpp index bfcf3438905..0083e26f353 100644 --- a/libs/dolphin/os/OSAlloc.cpp +++ b/libs/dolphin/os/OSAlloc.cpp @@ -7,20 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void DLInsert(); -extern "C" void OSFreeToHeap(); -extern "C" void OSSetCurrentHeap(); -extern "C" void OSInitAlloc(); -extern "C" void OSCreateHeap(); - -// -// External References: -// - // // Declarations: // @@ -29,7 +15,7 @@ extern "C" void OSCreateHeap(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void DLInsert() { +static asm void* DLInsert(void* param_0, void* param_1) { nofralloc #include "asm/dolphin/os/OSAlloc/DLInsert.s" } @@ -43,7 +29,7 @@ static u8 HeapArray[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSFreeToHeap() { +asm void OSFreeToHeap(OSHeapHandle heap, void* ptr) { nofralloc #include "asm/dolphin/os/OSAlloc/OSFreeToHeap.s" } @@ -61,7 +47,7 @@ SECTION_SDATA extern u32 __OSCurrHeap[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetCurrentHeap() { +asm void OSSetCurrentHeap(OSHeapHandle heap) { nofralloc #include "asm/dolphin/os/OSAlloc/OSSetCurrentHeap.s" } @@ -81,7 +67,7 @@ static u8 ArenaEnd[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitAlloc() { +asm void* OSInitAlloc(void* lo, void* hi, s32 maxHeaps) { nofralloc #include "asm/dolphin/os/OSAlloc/OSInitAlloc.s" } @@ -91,7 +77,7 @@ asm void OSInitAlloc() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCreateHeap() { +asm OSHeapHandle OSCreateHeap(void* start, void* end) { nofralloc #include "asm/dolphin/os/OSAlloc/OSCreateHeap.s" } diff --git a/libs/dolphin/os/OSArena.cpp b/libs/dolphin/os/OSArena.cpp index 3c659d76c07..1baf49fa839 100644 --- a/libs/dolphin/os/OSArena.cpp +++ b/libs/dolphin/os/OSArena.cpp @@ -7,51 +7,33 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" u32 OSGetArenaHi(); -extern "C" u32 OSGetArenaLo(); -extern "C" void OSSetArenaHi(); -extern "C" void OSSetArenaLo(); -extern "C" void OSAllocFromArenaLo(); - -// -// External References: -// - // // Declarations: // /* ############################################################################################## */ /* 80451650-80451658 000B50 0004+04 2/1 0/0 0/0 .sbss __OSArenaHi */ -static u8 __OSArenaHi[4 + 4 /* padding */]; +static void* __OSArenaHi; /* 8033B28C-8033B294 -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaHi */ -u32 OSGetArenaHi() { - return *(u32*)(&__OSArenaHi); +void* OSGetArenaHi(void) { + return &*(u32*)__OSArenaHi; } /* ############################################################################################## */ /* 80450998-804509A0 000418 0004+04 3/2 0/0 0/0 .sdata __OSArenaLo */ -SECTION_SDATA static u32 __OSArenaLo[1 + 1 /* padding */] = { - 0xFFFFFFFF, - /* padding */ - 0x00000000, -}; +SECTION_SDATA static u32 __OSArenaLo = 0xFFFFFFFF; /* 8033B294-8033B29C -00001 0008+00 0/0 0/0 0/0 .text OSGetArenaLo */ -u32 OSGetArenaLo() { - return *(u32*)(&__OSArenaLo); +void* OSGetArenaLo(void) { + return &*(u32*)__OSArenaLo; } /* 8033B29C-8033B2A4 335BDC 0008+00 0/0 5/5 0/0 .text OSSetArenaHi */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetArenaHi() { +asm void OSSetArenaHi(void* hi) { nofralloc #include "asm/dolphin/os/OSArena/OSSetArenaHi.s" } @@ -61,7 +43,7 @@ asm void OSSetArenaHi() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetArenaLo() { +asm void OSSetArenaLo(void* lo) { nofralloc #include "asm/dolphin/os/OSArena/OSSetArenaLo.s" } @@ -71,7 +53,7 @@ asm void OSSetArenaLo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSAllocFromArenaLo() { +asm void* OSAllocFromArenaLo(u32 size, s32 alignment) { nofralloc #include "asm/dolphin/os/OSArena/OSAllocFromArenaLo.s" } diff --git a/libs/dolphin/os/OSAudioSystem.cpp b/libs/dolphin/os/OSAudioSystem.cpp index 01697b4e6fd..b72088fa954 100644 --- a/libs/dolphin/os/OSAudioSystem.cpp +++ b/libs/dolphin/os/OSAudioSystem.cpp @@ -7,13 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __OSInitAudioSystem(); -extern "C" void __OSStopAudioSystem(); - // // External References: // @@ -44,7 +37,7 @@ SECTION_DATA static u8 DSPInitCode[128] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSInitAudioSystem() { +asm void __OSInitAudioSystem(void) { nofralloc #include "asm/dolphin/os/OSAudioSystem/__OSInitAudioSystem.s" } @@ -54,7 +47,7 @@ asm void __OSInitAudioSystem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSStopAudioSystem() { +asm void __OSStopAudioSystem(void) { nofralloc #include "asm/dolphin/os/OSAudioSystem/__OSStopAudioSystem.s" } diff --git a/libs/dolphin/os/OSCache.cpp b/libs/dolphin/os/OSCache.cpp index 13fe954b3c5..44defbaca43 100644 --- a/libs/dolphin/os/OSCache.cpp +++ b/libs/dolphin/os/OSCache.cpp @@ -8,27 +8,6 @@ #include "dolphin/os/OSError.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void DCEnable(); -extern "C" void DCFlushRange(); -extern "C" void DCFlushRangeNoSync(); -extern "C" void DCZeroRange(); -extern "C" void ICInvalidateRange(); -extern "C" void ICFlashInvalidate(); -extern "C" static void ICEnable(); -extern "C" void __LCEnable(); -extern "C" void LCEnable(); -extern "C" void LCDisable(); -extern "C" static void LCStoreBlocks(); -extern "C" void LCStoreData(); -extern "C" void LCQueueWait(); -extern "C" static void L2GlobalInvalidate(); -extern "C" static void DMAErrorHandler(); -extern "C" void __OSCacheInit(); - // // External References: // @@ -55,7 +34,7 @@ extern "C" void DBPrintf(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void DCEnable() { +static asm void DCEnable(void) { nofralloc #include "asm/dolphin/os/OSCache/DCEnable.s" } @@ -65,7 +44,7 @@ static asm void DCEnable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCInvalidateRange(void*, u32) { +asm void DCInvalidateRange(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCInvalidateRange.s" } @@ -75,7 +54,7 @@ asm void DCInvalidateRange(void*, u32) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCFlushRange() { +asm void DCFlushRange(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCFlushRange.s" } @@ -85,7 +64,7 @@ asm void DCFlushRange() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCStoreRange(void*, u32) { +asm void DCStoreRange(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCStoreRange.s" } @@ -95,7 +74,7 @@ asm void DCStoreRange(void*, u32) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCFlushRangeNoSync() { +asm void DCFlushRangeNoSync(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCFlushRangeNoSync.s" } @@ -105,7 +84,7 @@ asm void DCFlushRangeNoSync() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCStoreRangeNoSync(void*, u32) { +asm void DCStoreRangeNoSync(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCStoreRangeNoSync.s" } @@ -115,7 +94,7 @@ asm void DCStoreRangeNoSync(void*, u32) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void DCZeroRange() { +asm void DCZeroRange(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/DCZeroRange.s" } @@ -125,7 +104,7 @@ asm void DCZeroRange() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void ICInvalidateRange() { +asm void ICInvalidateRange(void* start, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/ICInvalidateRange.s" } @@ -135,7 +114,7 @@ asm void ICInvalidateRange() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void ICFlashInvalidate() { +asm void ICFlashInvalidate(void) { nofralloc #include "asm/dolphin/os/OSCache/ICFlashInvalidate.s" } @@ -145,7 +124,7 @@ asm void ICFlashInvalidate() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void ICEnable() { +static asm void ICEnable(void) { nofralloc #include "asm/dolphin/os/OSCache/ICEnable.s" } @@ -155,7 +134,7 @@ static asm void ICEnable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __LCEnable() { +asm void __LCEnable(void) { nofralloc #include "asm/dolphin/os/OSCache/__LCEnable.s" } @@ -175,7 +154,7 @@ asm void LCEnable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void LCDisable() { +asm void LCDisable(void) { nofralloc #include "asm/dolphin/os/OSCache/LCDisable.s" } @@ -185,7 +164,7 @@ asm void LCDisable() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void LCStoreBlocks() { +static asm void LCStoreBlocks(void* destAddr, void* srcAddr, u32 blockNum) { nofralloc #include "asm/dolphin/os/OSCache/LCStoreBlocks.s" } @@ -195,7 +174,7 @@ static asm void LCStoreBlocks() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void LCStoreData() { +asm u32 LCStoreData(void* destAddr, void* srcAddr, u32 nBytes) { nofralloc #include "asm/dolphin/os/OSCache/LCStoreData.s" } @@ -205,7 +184,7 @@ asm void LCStoreData() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void LCQueueWait() { +asm void LCQueueWait(u32 len) { nofralloc #include "asm/dolphin/os/OSCache/LCQueueWait.s" } @@ -265,7 +244,7 @@ SECTION_DATA static u8 lit_63[41 + 3 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void L2GlobalInvalidate() { +static asm void L2GlobalInvalidate(void) { nofralloc #include "asm/dolphin/os/OSCache/L2GlobalInvalidate.s" } @@ -606,7 +585,7 @@ SECTION_DATA static u8 lit_92[25 + 3 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void DMAErrorHandler() { +static asm void DMAErrorHandler(s32 error, OSContext* context) { nofralloc #include "asm/dolphin/os/OSCache/DMAErrorHandler.s" } @@ -781,7 +760,7 @@ SECTION_DATA static u8 lit_107[46 + 6 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSCacheInit() { +asm void __OSCacheInit(void) { nofralloc #include "asm/dolphin/os/OSCache/__OSCacheInit.s" } diff --git a/libs/dolphin/os/OSContext.cpp b/libs/dolphin/os/OSContext.cpp index e51185d4003..3cc5f31414d 100644 --- a/libs/dolphin/os/OSContext.cpp +++ b/libs/dolphin/os/OSContext.cpp @@ -4,37 +4,16 @@ // #include "dolphin/os/OSContext.h" +#include "dolphin/os/OSInterrupt.h" +#include "dolphin/os/OS.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __OSLoadFPUContext(); -extern "C" void __OSSaveFPUContext(); -extern "C" void OSSaveFPUContext(); -extern "C" void OSSetCurrentContext(); -extern "C" void OSGetCurrentContext(); -extern "C" void OSSaveContext(); -extern "C" void OSLoadContext(); -extern "C" void OSGetStackPointer(); -extern "C" void OSClearContext(); -extern "C" void OSInitContext(); -extern "C" void OSDumpContext(); -extern "C" static void OSSwitchFPUContext(); -extern "C" void __OSContextInit(); -extern "C" void OSFillFPUContext(); - // // External References: // -extern "C" void OSReport(); -extern "C" void __OSSetExceptionHandler(); -extern "C" void OSDisableInterrupts(); extern "C" void __RAS_OSDisableInterrupts_end(); -extern "C" void OSRestoreInterrupts(); extern "C" void DBPrintf(); extern "C" void __cvt_fp2unsigned(); @@ -46,7 +25,7 @@ extern "C" void __cvt_fp2unsigned(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSLoadFPUContext() { +asm void __OSLoadFPUContext(void) { nofralloc #include "asm/dolphin/os/OSContext/__OSLoadFPUContext.s" } @@ -56,7 +35,7 @@ asm void __OSLoadFPUContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSSaveFPUContext() { +asm void __OSSaveFPUContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/__OSSaveFPUContext.s" } @@ -66,7 +45,7 @@ asm void __OSSaveFPUContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSaveFPUContext() { +asm void OSSaveFPUContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSSaveFPUContext.s" } @@ -76,7 +55,7 @@ asm void OSSaveFPUContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetCurrentContext() { +asm void OSSetCurrentContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSSetCurrentContext.s" } @@ -86,7 +65,7 @@ asm void OSSetCurrentContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetCurrentContext() { +asm OSContext* OSGetCurrentContext(void) { nofralloc #include "asm/dolphin/os/OSContext/OSGetCurrentContext.s" } @@ -96,7 +75,7 @@ asm void OSGetCurrentContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSaveContext() { +asm void OSSaveContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSSaveContext.s" } @@ -106,7 +85,7 @@ asm void OSSaveContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSLoadContext() { +asm void OSLoadContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSLoadContext.s" } @@ -116,7 +95,7 @@ asm void OSLoadContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetStackPointer() { +asm u8* OSGetStackPointer(void) { nofralloc #include "asm/dolphin/os/OSContext/OSGetStackPointer.s" } @@ -126,7 +105,7 @@ asm void OSGetStackPointer() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSClearContext() { +asm void OSClearContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSClearContext.s" } @@ -136,7 +115,7 @@ asm void OSClearContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitContext() { +asm void OSInitContext(OSContext* context, u32 pc, u32 lr) { nofralloc #include "asm/dolphin/os/OSContext/OSInitContext.s" } @@ -539,7 +518,7 @@ SECTION_DATA static u8 lit_72[28] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSDumpContext() { +asm void OSDumpContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSDumpContext.s" } @@ -549,7 +528,7 @@ asm void OSDumpContext() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSSwitchFPUContext() { +static asm void OSSwitchFPUContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSSwitchFPUContext.s" } @@ -601,7 +580,7 @@ SECTION_DATA static u8 lit_76[35 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSContextInit() { +asm void __OSContextInit(void) { nofralloc #include "asm/dolphin/os/OSContext/__OSContextInit.s" } @@ -611,7 +590,7 @@ asm void __OSContextInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSFillFPUContext() { +asm void OSFillFPUContext(OSContext* context) { nofralloc #include "asm/dolphin/os/OSContext/OSFillFPUContext.s" } diff --git a/libs/dolphin/os/OSError.cpp b/libs/dolphin/os/OSError.cpp index 0904e5d800f..950c2c5160b 100644 --- a/libs/dolphin/os/OSError.cpp +++ b/libs/dolphin/os/OSError.cpp @@ -7,12 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __OSUnhandledException(); - // // External References: // @@ -53,7 +47,7 @@ SECTION_SDATA extern u32 __OSFpscrEnableBits = 0x000000F8; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetErrorHandler(OSError, OSErrorHandler) { +asm OSErrorHandler OSSetErrorHandler(OSError error, OSErrorHandler handler) { nofralloc #include "asm/dolphin/os/OSError/OSSetErrorHandler.s" } @@ -645,7 +639,7 @@ SECTION_SDATA static u16 lit_76[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSUnhandledException() { +asm void __OSUnhandledException(OSException exception, OSContext* context, u32 dsisr, u32 dar) { nofralloc #include "asm/dolphin/os/OSError/__OSUnhandledException.s" } diff --git a/libs/dolphin/os/OSExec.cpp b/libs/dolphin/os/OSExec.cpp index 9331f8f54b3..877c7257c56 100644 --- a/libs/dolphin/os/OSExec.cpp +++ b/libs/dolphin/os/OSExec.cpp @@ -7,19 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void PackArgs(); -extern "C" static void Run(); -extern "C" static void ReadDisc(); -extern "C" static void Callback(); -extern "C" void __OSGetExecParams(); -extern "C" static void GetApploaderPosition(); -extern "C" void __OSBootDolSimple(); -extern "C" void __OSBootDol(); - // // External References: // @@ -63,7 +50,7 @@ extern "C" extern u8 __OSIsGcam[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void PackArgs() { +static asm s32 PackArgs(void* param_0, u32 param_1, void* param_2) { nofralloc #include "asm/dolphin/os/OSExec/PackArgs.s" } @@ -73,7 +60,7 @@ static asm void PackArgs() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Run() { +static asm void Run(void) { nofralloc #include "asm/dolphin/os/OSExec/Run.s" } @@ -83,7 +70,7 @@ static asm void Run() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void ReadDisc() { +static asm void ReadDisc(void* param_0, s32 param_1, s32 param_2) { nofralloc #include "asm/dolphin/os/OSExec/ReadDisc.s" } @@ -97,7 +84,7 @@ static u8 Prepared[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Callback() { +static asm void Callback(void) { nofralloc #include "asm/dolphin/os/OSExec/Callback.s" } @@ -107,7 +94,7 @@ static asm void Callback() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetExecParams() { +asm void __OSGetExecParams(void* param_0) { nofralloc #include "asm/dolphin/os/OSExec/__OSGetExecParams.s" } @@ -121,7 +108,7 @@ static u8 apploaderPosition[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void GetApploaderPosition() { +static asm void GetApploaderPosition(void) { nofralloc #include "asm/dolphin/os/OSExec/GetApploaderPosition.s" } @@ -153,7 +140,7 @@ SECTION_DATA static u8 lit_115[11 + 5 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSBootDolSimple() { +asm void __OSBootDolSimple(u32 param_0, u32 param_1, void* param_2, void* param_3, s32 param_4, u32 param_5, void* param_6) { nofralloc #include "asm/dolphin/os/OSExec/__OSBootDolSimple.s" } @@ -177,7 +164,7 @@ SECTION_SDATA static u8 lit_213[3 + 5 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSBootDol() { +asm void __OSBootDol(s32 param_0, u32 param_1, s32 param_2) { nofralloc #include "asm/dolphin/os/OSExec/__OSBootDol.s" } diff --git a/libs/dolphin/os/OSFont.cpp b/libs/dolphin/os/OSFont.cpp index 22f5edf2d89..830e3fca6a9 100644 --- a/libs/dolphin/os/OSFont.cpp +++ b/libs/dolphin/os/OSFont.cpp @@ -7,18 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void GetFontCode(); -extern "C" void OSGetFontEncode(); -extern "C" static void ParseStringS(); - -// -// External References: -// - // // Declarations: // @@ -2509,7 +2497,7 @@ SECTION_DATA static u8 Zenkaku2Code[2442 + 6 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void GetFontCode() { +static asm u32 GetFontCode(s16 param_0, u32 param_1) { nofralloc #include "asm/dolphin/os/OSFont/GetFontCode.s" } @@ -2538,7 +2526,7 @@ static u8 ParseString[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetFontEncode() { +asm u16 OSGetFontEncode(void) { nofralloc #include "asm/dolphin/os/OSFont/OSGetFontEncode.s" } @@ -2548,7 +2536,7 @@ asm void OSGetFontEncode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void ParseStringS() { +static asm char* ParseStringS(s16 param_0, char* param_1, void* param_2, u32* param_3, u32 param_4, void* param_5) { nofralloc #include "asm/dolphin/os/OSFont/ParseStringS.s" } diff --git a/libs/dolphin/os/OSInterrupt.cpp b/libs/dolphin/os/OSInterrupt.cpp index f698e6bc9a5..7af70988f5d 100644 --- a/libs/dolphin/os/OSInterrupt.cpp +++ b/libs/dolphin/os/OSInterrupt.cpp @@ -7,23 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSDisableInterrupts(); -extern "C" void __RAS_OSDisableInterrupts_end(); -extern "C" void OSEnableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void __OSSetInterruptHandler(); -extern "C" void __OSGetInterruptHandler(); -extern "C" void __OSInterruptInit(); -extern "C" static void SetInterruptMask(); -extern "C" void __OSMaskInterrupts(); -extern "C" void __OSUnmaskInterrupts(); -extern "C" void __OSDispatchInterrupt(); -extern "C" static void ExternalInterruptHandler(); - // // External References: // @@ -44,7 +27,7 @@ extern "C" void OSGetTime(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSDisableInterrupts() { +asm BOOL OSDisableInterrupts(void) { nofralloc #include "asm/dolphin/os/OSInterrupt/OSDisableInterrupts.s" } @@ -54,7 +37,7 @@ asm void OSDisableInterrupts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __RAS_OSDisableInterrupts_end() { +asm void __RAS_OSDisableInterrupts_end(void) { nofralloc #include "asm/dolphin/os/OSInterrupt/__RAS_OSDisableInterrupts_end.s" } @@ -64,7 +47,7 @@ asm void __RAS_OSDisableInterrupts_end() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSEnableInterrupts() { +asm BOOL OSEnableInterrupts(void) { nofralloc #include "asm/dolphin/os/OSInterrupt/OSEnableInterrupts.s" } @@ -74,7 +57,7 @@ asm void OSEnableInterrupts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSRestoreInterrupts() { +asm BOOL OSRestoreInterrupts(BOOL enable) { nofralloc #include "asm/dolphin/os/OSInterrupt/OSRestoreInterrupts.s" } @@ -88,7 +71,7 @@ static u8 InterruptHandlerTable[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSSetInterruptHandler() { +asm OSInterruptHandler __OSSetInterruptHandler(OSInterrupt interrupt, OSInterruptHandler handler) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSSetInterruptHandler.s" } @@ -98,7 +81,7 @@ asm void __OSSetInterruptHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetInterruptHandler() { +asm OSInterruptHandler __OSGetInterruptHandler(s16 index) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSGetInterruptHandler.s" } @@ -108,7 +91,7 @@ asm void __OSGetInterruptHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSInterruptInit() { +asm void __OSInterruptInit(void) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSInterruptInit.s" } @@ -118,7 +101,7 @@ asm void __OSInterruptInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void SetInterruptMask() { +static asm OSInterruptMask SetInterruptMask(OSInterruptMask param_0, OSInterruptMask param_1) { nofralloc #include "asm/dolphin/os/OSInterrupt/SetInterruptMask.s" } @@ -128,7 +111,7 @@ static asm void SetInterruptMask() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSMaskInterrupts() { +asm OSInterruptMask __OSMaskInterrupts(OSInterruptMask mask) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSMaskInterrupts.s" } @@ -138,7 +121,7 @@ asm void __OSMaskInterrupts() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSUnmaskInterrupts() { +asm OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSUnmaskInterrupts.s" } @@ -218,7 +201,7 @@ u8 data_80451684[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSDispatchInterrupt() { +asm void __OSDispatchInterrupt(OSInterrupt interrupt, struct OSContext* context) { nofralloc #include "asm/dolphin/os/OSInterrupt/__OSDispatchInterrupt.s" } @@ -228,7 +211,7 @@ asm void __OSDispatchInterrupt() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void ExternalInterruptHandler() { +static asm void ExternalInterruptHandler(OSInterrupt interrupt, struct OSContext* context) { nofralloc #include "asm/dolphin/os/OSInterrupt/ExternalInterruptHandler.s" } diff --git a/libs/dolphin/os/OSLink.cpp b/libs/dolphin/os/OSLink.cpp index 1bdb0b2283b..b9e6f5a7278 100644 --- a/libs/dolphin/os/OSLink.cpp +++ b/libs/dolphin/os/OSLink.cpp @@ -7,18 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void OSNotifyLink(); -extern "C" static void OSNotifyUnlink(); -extern "C" void OSSetStringTable(); -extern "C" static void Relocate(); -extern "C" static void Link(); -extern "C" static void Undo(); -extern "C" void __OSModuleInit(); - // // External References: // @@ -33,12 +21,12 @@ extern "C" void ICInvalidateRange(); // /* 8033DF60-8033DF64 3388A0 0004+00 1/1 0/0 0/0 .text OSNotifyLink */ -static void OSNotifyLink() { +static void OSNotifyLink(void) { /* empty function */ } /* 8033DF64-8033DF68 3388A4 0004+00 1/1 0/0 0/0 .text OSNotifyUnlink */ -static void OSNotifyUnlink() { +static void OSNotifyUnlink(void) { /* empty function */ } @@ -46,7 +34,7 @@ static void OSNotifyUnlink() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetStringTable() { +asm void OSSetStringTable(void* string_table) { nofralloc #include "asm/dolphin/os/OSLink/OSSetStringTable.s" } @@ -102,7 +90,7 @@ SECTION_DATA static u8 lit_62[37 + 3 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Relocate() { +static asm BOOL Relocate(OSModuleInfo* param_0, OSModuleInfo* param_1) { nofralloc #include "asm/dolphin/os/OSLink/Relocate.s" } @@ -112,7 +100,7 @@ static asm void Relocate() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Link() { +static asm BOOL Link(OSModuleInfo* module, u32 param_1) { nofralloc #include "asm/dolphin/os/OSLink/Link.s" } @@ -122,7 +110,7 @@ static asm void Link() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm BOOL OSLink(OSModuleInfo* info) { +asm BOOL OSLink(OSModuleInfo* module) { nofralloc #include "asm/dolphin/os/OSLink/OSLink.s" } @@ -132,7 +120,7 @@ extern "C" asm BOOL OSLink(OSModuleInfo* info) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm BOOL OSLinkFixed(OSModuleInfo* info, u32 unk) { +asm BOOL OSLinkFixed(OSModuleInfo* module, u32 param_1) { nofralloc #include "asm/dolphin/os/OSLink/OSLinkFixed.s" } @@ -188,7 +176,7 @@ SECTION_DATA static u8 lit_189[39 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Undo() { +static asm BOOL Undo(OSModuleInfo* param_0, OSModuleInfo* param_1) { nofralloc #include "asm/dolphin/os/OSLink/Undo.s" } @@ -198,7 +186,7 @@ static asm void Undo() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -extern "C" asm BOOL OSUnlink(OSModuleInfo* info) { +asm BOOL OSUnlink(OSModuleInfo* module) { nofralloc #include "asm/dolphin/os/OSLink/OSUnlink.s" } @@ -208,7 +196,7 @@ extern "C" asm BOOL OSUnlink(OSModuleInfo* info) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSModuleInit() { +asm void __OSModuleInit(void) { nofralloc #include "asm/dolphin/os/OSLink/__OSModuleInit.s" } diff --git a/libs/dolphin/os/OSMemory.cpp b/libs/dolphin/os/OSMemory.cpp index b0fa3bbf027..193581d506a 100644 --- a/libs/dolphin/os/OSMemory.cpp +++ b/libs/dolphin/os/OSMemory.cpp @@ -7,18 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void OnReset(); -extern "C" static void MEMIntrruptHandler(); -extern "C" void OSProtectRange(); -extern "C" static void Config24MB(); -extern "C" static void Config48MB(); -extern "C" static void RealMode(); -extern "C" void __OSInitMemoryProtection(); - // // External References: // @@ -26,11 +14,6 @@ extern "C" void __OSInitMemoryProtection(); extern "C" void DCInvalidateRange(); extern "C" void DCFlushRange(); extern "C" void __OSUnhandledException(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void __OSSetInterruptHandler(); -extern "C" void __OSMaskInterrupts(); -extern "C" void __OSUnmaskInterrupts(); extern "C" void OSRegisterResetFunction(); extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; @@ -42,7 +25,7 @@ extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OnReset() { +static asm s32 OnReset(s32 param_0) { nofralloc #include "asm/dolphin/os/OSMemory/OnReset.s" } @@ -52,7 +35,7 @@ static asm void OnReset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void MEMIntrruptHandler() { +static asm void MEMIntrruptHandler(OSInterrupt interrupt, struct OSContext* context) { nofralloc #include "asm/dolphin/os/OSMemory/MEMIntrruptHandler.s" } @@ -62,7 +45,7 @@ static asm void MEMIntrruptHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSProtectRange() { +asm void OSProtectRange(u32 channel, void* address, u32 nBytes, u32 control) { nofralloc #include "asm/dolphin/os/OSMemory/OSProtectRange.s" } @@ -72,7 +55,7 @@ asm void OSProtectRange() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Config24MB() { +static asm void Config24MB(void) { nofralloc #include "asm/dolphin/os/OSMemory/Config24MB.s" } @@ -82,7 +65,7 @@ static asm void Config24MB() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Config48MB() { +static asm void Config48MB(void) { nofralloc #include "asm/dolphin/os/OSMemory/Config48MB.s" } @@ -92,7 +75,7 @@ static asm void Config48MB() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void RealMode() { +static asm void RealMode(void) { nofralloc #include "asm/dolphin/os/OSMemory/RealMode.s" } @@ -111,7 +94,7 @@ SECTION_DATA static void* ResetFunctionInfo[4] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSInitMemoryProtection() { +asm void __OSInitMemoryProtection(void) { nofralloc #include "asm/dolphin/os/OSMemory/__OSInitMemoryProtection.s" } diff --git a/libs/dolphin/os/OSMessage.cpp b/libs/dolphin/os/OSMessage.cpp index 2a425fdf3e5..162fc8a4897 100644 --- a/libs/dolphin/os/OSMessage.cpp +++ b/libs/dolphin/os/OSMessage.cpp @@ -7,24 +7,12 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSInitMessageQueue(); -extern "C" void OSSendMessage(); -extern "C" void OSReceiveMessage(); -extern "C" void OSJamMessage(); - // // External References: // extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); -extern "C" void OSInitThreadQueue(); -extern "C" void OSSleepThread(); -extern "C" void OSWakeupThread(); // // Declarations: @@ -34,7 +22,7 @@ extern "C" void OSWakeupThread(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitMessageQueue() { +asm void OSInitMessageQueue(OSMessageQueue* queue, OSMessage* msgArray, s32 msgCount) { nofralloc #include "asm/dolphin/os/OSMessage/OSInitMessageQueue.s" } @@ -44,7 +32,7 @@ asm void OSInitMessageQueue() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSendMessage() { +asm BOOL OSSendMessage(OSMessageQueue* queue, OSMessage msg, s32 flags) { nofralloc #include "asm/dolphin/os/OSMessage/OSSendMessage.s" } @@ -54,7 +42,7 @@ asm void OSSendMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSReceiveMessage() { +asm BOOL OSReceiveMessage(OSMessageQueue* queue, OSMessage* msg, s32 flags) { nofralloc #include "asm/dolphin/os/OSMessage/OSReceiveMessage.s" } @@ -64,7 +52,7 @@ asm void OSReceiveMessage() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSJamMessage() { +asm BOOL OSJamMessage(OSMessageQueue* queue, OSMessage msg, s32 flags) { nofralloc #include "asm/dolphin/os/OSMessage/OSJamMessage.s" } diff --git a/libs/dolphin/os/OSMutex.cpp b/libs/dolphin/os/OSMutex.cpp index 08f316a640f..a6126138d53 100644 --- a/libs/dolphin/os/OSMutex.cpp +++ b/libs/dolphin/os/OSMutex.cpp @@ -7,36 +7,12 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSInitMutex(); -extern "C" void OSLockMutex(); -extern "C" void OSUnlockMutex(); -extern "C" void __OSUnlockAllMutex(); -extern "C" void OSTryLockMutex(); -extern "C" void OSInitCond(); -extern "C" void OSWaitCond(); -extern "C" void OSSignalCond(); -extern "C" void __OSCheckMutex(); -extern "C" void __OSCheckDeadLock(); -extern "C" void __OSCheckMutexes(); - // // External References: // extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); -extern "C" void OSInitThreadQueue(); -extern "C" void OSGetCurrentThread(); -extern "C" void OSDisableScheduler(); -extern "C" void OSEnableScheduler(); -extern "C" void __OSGetEffectivePriority(); -extern "C" void __OSPromoteThread(); -extern "C" void OSSleepThread(); -extern "C" void OSWakeupThread(); // // Declarations: @@ -46,7 +22,7 @@ extern "C" void OSWakeupThread(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitMutex() { +asm void OSInitMutex(struct OSMutex* mutex) { nofralloc #include "asm/dolphin/os/OSMutex/OSInitMutex.s" } @@ -56,7 +32,7 @@ asm void OSInitMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSLockMutex() { +asm void OSLockMutex(struct OSMutex* mutex) { nofralloc #include "asm/dolphin/os/OSMutex/OSLockMutex.s" } @@ -66,7 +42,7 @@ asm void OSLockMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSUnlockMutex() { +asm void OSUnlockMutex(struct OSMutex* mutex) { nofralloc #include "asm/dolphin/os/OSMutex/OSUnlockMutex.s" } @@ -76,7 +52,7 @@ asm void OSUnlockMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSUnlockAllMutex() { +asm void __OSUnlockAllMutex(struct OSThread* thread) { nofralloc #include "asm/dolphin/os/OSMutex/__OSUnlockAllMutex.s" } @@ -86,7 +62,7 @@ asm void __OSUnlockAllMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSTryLockMutex() { +asm s32 OSTryLockMutex(struct OSMutex* mutex) { nofralloc #include "asm/dolphin/os/OSMutex/OSTryLockMutex.s" } @@ -96,7 +72,7 @@ asm void OSTryLockMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitCond() { +asm void OSInitCond(struct OSCond* cond) { nofralloc #include "asm/dolphin/os/OSMutex/OSInitCond.s" } @@ -106,7 +82,7 @@ asm void OSInitCond() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSWaitCond() { +asm void OSWaitCond(struct OSCond* cond, struct OSMutex* mutex) { nofralloc #include "asm/dolphin/os/OSMutex/OSWaitCond.s" } @@ -116,7 +92,7 @@ asm void OSWaitCond() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSignalCond() { +asm void OSSignalCond(struct OSCond* con) { nofralloc #include "asm/dolphin/os/OSMutex/OSSignalCond.s" } @@ -126,7 +102,7 @@ asm void OSSignalCond() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSCheckMutex() { +asm s32 __OSCheckMutex(struct OSThread* thread) { nofralloc #include "asm/dolphin/os/OSMutex/__OSCheckMutex.s" } @@ -136,7 +112,7 @@ asm void __OSCheckMutex() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSCheckDeadLock() { +asm BOOL __OSCheckDeadLock(struct OSThread* thread) { nofralloc #include "asm/dolphin/os/OSMutex/__OSCheckDeadLock.s" } @@ -146,7 +122,7 @@ asm void __OSCheckDeadLock() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSCheckMutexes() { +asm BOOL __OSCheckMutexes(struct OSThread* thread) { nofralloc #include "asm/dolphin/os/OSMutex/__OSCheckMutexes.s" } diff --git a/libs/dolphin/os/OSReboot.cpp b/libs/dolphin/os/OSReboot.cpp index 269f9ff7156..6088530534a 100644 --- a/libs/dolphin/os/OSReboot.cpp +++ b/libs/dolphin/os/OSReboot.cpp @@ -7,14 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __OSReboot(); -extern "C" void OSSetSaveRegion(); -extern "C" void OSGetSaveRegion(); - // // External References: // @@ -34,7 +26,7 @@ extern "C" void OSDisableInterrupts(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSReboot() { +asm void __OSReboot(u32 param_0, u32 param_1) { nofralloc #include "asm/dolphin/os/OSReboot/__OSReboot.s" } @@ -51,7 +43,7 @@ static u8 SaveEnd[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetSaveRegion() { +asm void OSSetSaveRegion(void* start, void* end) { nofralloc #include "asm/dolphin/os/OSReboot/OSSetSaveRegion.s" } @@ -61,7 +53,7 @@ asm void OSSetSaveRegion() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetSaveRegion() { +asm void OSGetSaveRegion(void* start, void* end) { nofralloc #include "asm/dolphin/os/OSReboot/OSGetSaveRegion.s" } diff --git a/libs/dolphin/os/OSReset.cpp b/libs/dolphin/os/OSReset.cpp index fb253da24df..af54cf94a26 100644 --- a/libs/dolphin/os/OSReset.cpp +++ b/libs/dolphin/os/OSReset.cpp @@ -7,18 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSRegisterResetFunction(); -extern "C" void __OSCallResetFunctions(); -extern "C" static void Reset(); -extern "C" static void KillThreads(); -extern "C" void __OSDoHotReset(); -extern "C" void OSResetSystem(); -extern "C" void OSGetResetCode(); - // // External References: // @@ -51,7 +39,7 @@ static u8 ResetFunctionQueue[8]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSRegisterResetFunction() { +asm void OSRegisterResetFunction(OSResetFunctionInfo* info) { nofralloc #include "asm/dolphin/os/OSReset/OSRegisterResetFunction.s" } @@ -61,7 +49,7 @@ asm void OSRegisterResetFunction() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSCallResetFunctions() { +asm BOOL __OSCallResetFunctions(s32 param_0) { nofralloc #include "asm/dolphin/os/OSReset/__OSCallResetFunctions.s" } @@ -71,7 +59,7 @@ asm void __OSCallResetFunctions() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void Reset() { +static asm void Reset(s32 param_0) { nofralloc #include "asm/dolphin/os/OSReset/Reset.s" } @@ -81,7 +69,7 @@ static asm void Reset() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void KillThreads() { +static asm void KillThreads(void) { nofralloc #include "asm/dolphin/os/OSReset/KillThreads.s" } @@ -91,7 +79,7 @@ static asm void KillThreads() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSDoHotReset() { +asm void __OSDoHotReset(s32 param_0) { nofralloc #include "asm/dolphin/os/OSReset/__OSDoHotReset.s" } @@ -190,7 +178,7 @@ static u8 bootThisDol[4 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSResetSystem() { +asm void OSResetSystem(s32 reset, u32 resetCode, BOOL forceMenu) { nofralloc #include "asm/dolphin/os/OSReset/OSResetSystem.s" } @@ -200,7 +188,7 @@ asm void OSResetSystem() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetResetCode() { +asm u32 OSGetResetCode(void) { nofralloc #include "asm/dolphin/os/OSReset/OSGetResetCode.s" } diff --git a/libs/dolphin/os/OSResetSW.cpp b/libs/dolphin/os/OSResetSW.cpp index bacdb9b5046..00cd383eabb 100644 --- a/libs/dolphin/os/OSResetSW.cpp +++ b/libs/dolphin/os/OSResetSW.cpp @@ -7,14 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void __OSResetSWInterruptHandler(); -extern "C" static void OSGetResetButtonState(); -extern "C" void OSGetResetSwitchState(); - // // External References: // @@ -57,7 +49,7 @@ static u8 data_804516BC[4]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSResetSWInterruptHandler() { +asm void __OSResetSWInterruptHandler(void) { nofralloc #include "asm/dolphin/os/OSResetSW/__OSResetSWInterruptHandler.s" } @@ -67,7 +59,7 @@ asm void __OSResetSWInterruptHandler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSGetResetButtonState() { +static asm BOOL OSGetResetButtonState(void) { nofralloc #include "asm/dolphin/os/OSResetSW/OSGetResetButtonState.s" } @@ -77,7 +69,7 @@ static asm void OSGetResetButtonState() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetResetSwitchState() { +asm BOOL OSGetResetSwitchState(void) { nofralloc #include "asm/dolphin/os/OSResetSW/OSGetResetSwitchState.s" } diff --git a/libs/dolphin/os/OSRtc.cpp b/libs/dolphin/os/OSRtc.cpp index 4b6c6aa0264..aa3e393e92c 100644 --- a/libs/dolphin/os/OSRtc.cpp +++ b/libs/dolphin/os/OSRtc.cpp @@ -7,28 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void WriteSramCallback(); -extern "C" static void WriteSram(); -extern "C" void __OSInitSram(); -extern "C" void __OSLockSram(); -extern "C" void __OSLockSramEx(); -extern "C" static void UnlockSram(); -extern "C" void __OSUnlockSram(); -extern "C" void __OSUnlockSramEx(); -extern "C" void __OSSyncSram(); -extern "C" void OSGetSoundMode(); -extern "C" void OSSetSoundMode(); -extern "C" void OSGetProgressiveMode(); -extern "C" void OSSetProgressiveMode(); -extern "C" void OSGetWirelessID(); -extern "C" void OSSetWirelessID(); -extern "C" static void OSGetGbsMode(); -extern "C" static void OSSetGbsMode(); - // // External References: // @@ -57,7 +35,7 @@ static u8 Scb[84 + 4 /* padding */]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void WriteSramCallback() { +static asm void WriteSramCallback(void) { nofralloc #include "asm/dolphin/os/OSRtc/WriteSramCallback.s" } @@ -67,7 +45,7 @@ static asm void WriteSramCallback() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void WriteSram() { +static asm u8 WriteSram(u8* param_0, u32 param_1, u32 param_2) { nofralloc #include "asm/dolphin/os/OSRtc/WriteSram.s" } @@ -77,7 +55,7 @@ static asm void WriteSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSInitSram() { +asm void __OSInitSram(void) { nofralloc #include "asm/dolphin/os/OSRtc/__OSInitSram.s" } @@ -87,7 +65,7 @@ asm void __OSInitSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSLockSram() { +asm u16* __OSLockSram(void) { nofralloc #include "asm/dolphin/os/OSRtc/__OSLockSram.s" } @@ -97,7 +75,7 @@ asm void __OSLockSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSLockSramEx() { +asm u16* __OSLockSramEx(void) { nofralloc #include "asm/dolphin/os/OSRtc/__OSLockSramEx.s" } @@ -107,7 +85,7 @@ asm void __OSLockSramEx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void UnlockSram() { +static asm u32 UnlockSram(s32 param_0, u32 param_1) { nofralloc #include "asm/dolphin/os/OSRtc/UnlockSram.s" } @@ -117,7 +95,7 @@ static asm void UnlockSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSUnlockSram() { +asm u32 __OSUnlockSram(s32 param_0) { nofralloc #include "asm/dolphin/os/OSRtc/__OSUnlockSram.s" } @@ -127,7 +105,7 @@ asm void __OSUnlockSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSUnlockSramEx() { +asm u32 __OSUnlockSramEx(s32 param_0) { nofralloc #include "asm/dolphin/os/OSRtc/__OSUnlockSramEx.s" } @@ -137,7 +115,7 @@ asm void __OSUnlockSramEx() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSSyncSram() { +asm u32 __OSSyncSram(void) { nofralloc #include "asm/dolphin/os/OSRtc/__OSSyncSram.s" } @@ -147,7 +125,7 @@ asm void __OSSyncSram() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetSoundMode() { +asm u32 OSGetSoundMode(void) { nofralloc #include "asm/dolphin/os/OSRtc/OSGetSoundMode.s" } @@ -157,7 +135,7 @@ asm void OSGetSoundMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetSoundMode() { +asm void OSSetSoundMode(OSSoundMode mode) { nofralloc #include "asm/dolphin/os/OSRtc/OSSetSoundMode.s" } @@ -167,7 +145,7 @@ asm void OSSetSoundMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetProgressiveMode() { +asm u32 OSGetProgressiveMode(void) { nofralloc #include "asm/dolphin/os/OSRtc/OSGetProgressiveMode.s" } @@ -177,7 +155,7 @@ asm void OSGetProgressiveMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetProgressiveMode() { +asm void OSSetProgressiveMode(u32 mode) { nofralloc #include "asm/dolphin/os/OSRtc/OSSetProgressiveMode.s" } @@ -187,7 +165,7 @@ asm void OSSetProgressiveMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetWirelessID() { +asm u16 OSGetWirelessID(s32 index) { nofralloc #include "asm/dolphin/os/OSRtc/OSGetWirelessID.s" } @@ -197,7 +175,7 @@ asm void OSGetWirelessID() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetWirelessID() { +asm void OSSetWirelessID(s32 index, u16 id) { nofralloc #include "asm/dolphin/os/OSRtc/OSSetWirelessID.s" } @@ -207,7 +185,7 @@ asm void OSSetWirelessID() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSGetGbsMode() { +static asm u16 OSGetGbsMode(void) { nofralloc #include "asm/dolphin/os/OSRtc/OSGetGbsMode.s" } @@ -217,7 +195,7 @@ static asm void OSGetGbsMode() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSSetGbsMode() { +static asm void OSSetGbsMode(u16 mode) { nofralloc #include "asm/dolphin/os/OSRtc/OSSetGbsMode.s" } diff --git a/libs/dolphin/os/OSSync.cpp b/libs/dolphin/os/OSSync.cpp index e002ebf7d10..e0d3042d3f2 100644 --- a/libs/dolphin/os/OSSync.cpp +++ b/libs/dolphin/os/OSSync.cpp @@ -7,14 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void SystemCallVector(); -extern "C" void __OSSystemCallVectorEnd(); -extern "C" void __OSInitSystemCall(); - // // External References: // @@ -31,17 +23,18 @@ extern "C" void ICInvalidateRange(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void SystemCallVector() { +static asm void SystemCallVector(void) { nofralloc #include "asm/dolphin/os/OSSync/SystemCallVector.s" } #pragma pop +// fake function? /* 80340A3C-80340A40 33B37C 0004+00 1/1 0/0 0/0 .text __OSSystemCallVectorEnd */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSSystemCallVectorEnd() { +asm void __OSSystemCallVectorEnd(void) { nofralloc #include "asm/dolphin/os/OSSync/__OSSystemCallVectorEnd.s" } @@ -51,7 +44,7 @@ asm void __OSSystemCallVectorEnd() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSInitSystemCall() { +asm void __OSInitSystemCall(void) { nofralloc #include "asm/dolphin/os/OSSync/__OSInitSystemCall.s" } diff --git a/libs/dolphin/os/OSThread.cpp b/libs/dolphin/os/OSThread.cpp index 19b72d3afa8..72965e74239 100644 --- a/libs/dolphin/os/OSThread.cpp +++ b/libs/dolphin/os/OSThread.cpp @@ -7,59 +7,16 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" static void DefaultSwitchThreadCallback(); -extern "C" void OSSetSwitchThreadCallback(); -extern "C" void __OSThreadInit(); -extern "C" void OSInitThreadQueue(); -extern "C" void OSGetCurrentThread(); -extern "C" void OSIsThreadTerminated(); -extern "C" void OSDisableScheduler(); -extern "C" void OSEnableScheduler(); -extern "C" static void UnsetRun(); -extern "C" void __OSGetEffectivePriority(); -extern "C" static void SetEffectivePriority(); -extern "C" void __OSPromoteThread(); -extern "C" static void SelectThread(); -extern "C" void __OSReschedule(); -extern "C" void OSYieldThread(); -extern "C" void OSCreateThread(); -extern "C" void OSExitThread(); -extern "C" void OSCancelThread(); -extern "C" void OSDetachThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSuspendThread(); -extern "C" void OSSleepThread(); -extern "C" void OSWakeupThread(); -extern "C" void OSSetThreadPriority(); -extern "C" void OSGetThreadPriority(); -extern "C" static void CheckThreadQueue(); -extern "C" void OSCheckActiveThreads(); -extern "C" static void OSClearStack(); -extern "C" extern u8 data_804516D0[8]; - // // External References: // extern "C" void OSReport(); extern "C" void OSPanic(); -extern "C" void OSSetCurrentContext(); -extern "C" void OSGetCurrentContext(); -extern "C" void OSSaveContext(); -extern "C" void OSLoadContext(); extern "C" void OSGetStackPointer(); -extern "C" void OSClearContext(); -extern "C" void OSInitContext(); extern "C" void OSDisableInterrupts(); extern "C" void OSEnableInterrupts(); extern "C" void OSRestoreInterrupts(); -extern "C" void __OSUnlockAllMutex(); -extern "C" void __OSCheckDeadLock(); -extern "C" void __OSCheckMutexes(); extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; extern "C" extern u32 __OSFpscrEnableBits; extern "C" void _epilog(); @@ -69,7 +26,7 @@ extern "C" void _epilog(); // /* 80340AA4-80340AA8 33B3E4 0004+00 2/1 0/0 0/0 .text DefaultSwitchThreadCallback */ -static void DefaultSwitchThreadCallback() { +static void DefaultSwitchThreadCallback(OSThread* from, OSThread* to) { /* empty function */ } @@ -81,7 +38,7 @@ SECTION_SDATA static void* SwitchThreadCallback = (void*)DefaultSwitchThreadCall #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetSwitchThreadCallback() { +asm OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback func) { nofralloc #include "asm/dolphin/os/OSThread/OSSetSwitchThreadCallback.s" } @@ -125,7 +82,7 @@ extern void* _stack_end; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSThreadInit() { +asm void __OSThreadInit(void) { nofralloc #include "asm/dolphin/os/OSThread/__OSThreadInit.s" } @@ -135,7 +92,7 @@ asm void __OSThreadInit() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSInitThreadQueue() { +asm void OSInitThreadQueue(OSThreadQueue* queue) { nofralloc #include "asm/dolphin/os/OSThread/OSInitThreadQueue.s" } @@ -145,7 +102,7 @@ asm void OSInitThreadQueue() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetCurrentThread() { +asm OSThread* OSGetCurrentThread(void) { nofralloc #include "asm/dolphin/os/OSThread/OSGetCurrentThread.s" } @@ -155,7 +112,7 @@ asm void OSGetCurrentThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSIsThreadTerminated() { +asm BOOL OSIsThreadTerminated(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSIsThreadTerminated.s" } @@ -165,7 +122,7 @@ asm void OSIsThreadTerminated() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSDisableScheduler() { +asm s32 OSDisableScheduler(void) { nofralloc #include "asm/dolphin/os/OSThread/OSDisableScheduler.s" } @@ -175,7 +132,7 @@ asm void OSDisableScheduler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSEnableScheduler() { +asm s32 OSEnableScheduler(void) { nofralloc #include "asm/dolphin/os/OSThread/OSEnableScheduler.s" } @@ -185,7 +142,7 @@ asm void OSEnableScheduler() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void UnsetRun() { +static asm void UnsetRun(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/UnsetRun.s" } @@ -195,7 +152,7 @@ static asm void UnsetRun() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetEffectivePriority() { +asm s32 __OSGetEffectivePriority(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/__OSGetEffectivePriority.s" } @@ -205,7 +162,7 @@ asm void __OSGetEffectivePriority() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void SetEffectivePriority() { +static asm void SetEffectivePriority(OSThread* thread, s32 priority) { nofralloc #include "asm/dolphin/os/OSThread/SetEffectivePriority.s" } @@ -215,7 +172,7 @@ static asm void SetEffectivePriority() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSPromoteThread() { +asm void __OSPromoteThread(OSThread* thread, s32 priority) { nofralloc #include "asm/dolphin/os/OSThread/__OSPromoteThread.s" } @@ -225,7 +182,7 @@ asm void __OSPromoteThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void SelectThread() { +static asm void SelectThread(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/SelectThread.s" } @@ -235,7 +192,7 @@ static asm void SelectThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSReschedule() { +asm void __OSReschedule(void) { nofralloc #include "asm/dolphin/os/OSThread/__OSReschedule.s" } @@ -245,7 +202,7 @@ asm void __OSReschedule() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSYieldThread() { +asm void OSYieldThread(void) { nofralloc #include "asm/dolphin/os/OSThread/OSYieldThread.s" } @@ -255,7 +212,8 @@ asm void OSYieldThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCreateThread() { +asm BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stackBase, + u32 stackSize, s32 priority, u16 attribute) { nofralloc #include "asm/dolphin/os/OSThread/OSCreateThread.s" } @@ -265,7 +223,7 @@ asm void OSCreateThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSExitThread() { +asm void OSExitThread(void* exitValue) { nofralloc #include "asm/dolphin/os/OSThread/OSExitThread.s" } @@ -275,7 +233,7 @@ asm void OSExitThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCancelThread() { +asm void OSCancelThread(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSCancelThread.s" } @@ -285,7 +243,7 @@ asm void OSCancelThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSDetachThread() { +asm void OSDetachThread(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSDetachThread.s" } @@ -295,7 +253,7 @@ asm void OSDetachThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSResumeThread() { +asm s32 OSResumeThread(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSResumeThread.s" } @@ -305,7 +263,7 @@ asm void OSResumeThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSuspendThread() { +asm s32 OSSuspendThread(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSSuspendThread.s" } @@ -315,7 +273,7 @@ asm void OSSuspendThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSleepThread() { +asm void OSSleepThread(OSThreadQueue* queue) { nofralloc #include "asm/dolphin/os/OSThread/OSSleepThread.s" } @@ -325,7 +283,7 @@ asm void OSSleepThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSWakeupThread() { +asm void OSWakeupThread(OSThreadQueue* queue) { nofralloc #include "asm/dolphin/os/OSThread/OSWakeupThread.s" } @@ -335,7 +293,7 @@ asm void OSWakeupThread() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSSetThreadPriority() { +asm s32 OSSetThreadPriority(OSThread* thread, s32 priority) { nofralloc #include "asm/dolphin/os/OSThread/OSSetThreadPriority.s" } @@ -345,7 +303,7 @@ asm void OSSetThreadPriority() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetThreadPriority() { +asm s32 OSGetThreadPriority(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/OSGetThreadPriority.s" } @@ -355,7 +313,7 @@ asm void OSGetThreadPriority() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void CheckThreadQueue() { +static asm s32 CheckThreadQueue(OSThread* thread) { nofralloc #include "asm/dolphin/os/OSThread/CheckThreadQueue.s" } @@ -2508,7 +2466,7 @@ SECTION_SDATA static u8 lit_833[1 + 3 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSCheckActiveThreads() { +asm s32 OSCheckActiveThreads(void) { nofralloc #include "asm/dolphin/os/OSThread/OSCheckActiveThreads.s" } @@ -2518,7 +2476,7 @@ asm void OSCheckActiveThreads() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void OSClearStack() { +static asm void OSClearStack(u32 value) { nofralloc #include "asm/dolphin/os/OSThread/OSClearStack.s" } diff --git a/libs/dolphin/os/OSTime.cpp b/libs/dolphin/os/OSTime.cpp index 9c45ff7e3b0..470cd3e6778 100644 --- a/libs/dolphin/os/OSTime.cpp +++ b/libs/dolphin/os/OSTime.cpp @@ -7,17 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void OSGetTime(); -extern "C" void OSGetTick(); -extern "C" void __OSGetSystemTime(); -extern "C" void __OSTimeToSystemTime(); -extern "C" static void GetDates(); -extern "C" void OSTicksToCalendarTime(); - // // External References: // @@ -35,14 +24,14 @@ extern "C" void __mod2i(); #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSGetTime() { +asm OSTime OSGetTime(void) { nofralloc #include "asm/dolphin/os/OSTime/OSGetTime.s" } #pragma pop /* 80342714-8034271C -00001 0008+00 0/0 0/0 0/0 .text OSGetTick */ -asm void OSGetTick() { +asm OSTick OSGetTick(void) { // clang-format off nofralloc mftb r3, 0x10c @@ -54,7 +43,7 @@ asm void OSGetTick() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSGetSystemTime() { +asm OSTime __OSGetSystemTime(void) { nofralloc #include "asm/dolphin/os/OSTime/__OSGetSystemTime.s" } @@ -64,7 +53,7 @@ asm void __OSGetSystemTime() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __OSTimeToSystemTime() { +asm OSTime __OSTimeToSystemTime(OSTime time) { nofralloc #include "asm/dolphin/os/OSTime/__OSTimeToSystemTime.s" } @@ -89,7 +78,7 @@ SECTION_DATA static u8 LeapYearDays[48] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void GetDates() { +asm void GetDates(OSTime ticks, OSCalendarTime* ct) { nofralloc #include "asm/dolphin/os/OSTime/GetDates.s" } @@ -99,7 +88,7 @@ static asm void GetDates() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSTicksToCalendarTime() { +asm void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* ct) { nofralloc #include "asm/dolphin/os/OSTime/OSTicksToCalendarTime.s" } diff --git a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp index e3a621e4c66..89ddc342360 100644 --- a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp +++ b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_b_zant // -#include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h" +// #include "rel/d/a/b/d_a_b_zant/d_a_b_zant.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index 6cc02b802d3..404daa344f7 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -18,28 +18,6 @@ struct mDoGph_gInf_c { /* 80878D10 */ void setFrameRate(u16); }; -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); -}; - -struct daMP_c { - /* 80031A78 */ void daMP_c_Get_MovieRestFrame(); - /* 80031AA4 */ void daMP_c_Set_PercentMovieVolume(f32); - /* 80878BB8 */ void daMP_c_Get_arg_demoNo(); - /* 80878C04 */ void daMP_c_Get_arg_movieNo(); - /* 80878C28 */ void daMP_c_Init(); - /* 80878D64 */ void daMP_c_Finish(); - /* 80878D94 */ void daMP_c_Main(); - /* 80878DD8 */ void daMP_c_Draw(); - /* 80878E60 */ void daMP_c_Callback_Init(fopAc_ac_c*); - /* 80878ED4 */ daMP_c(); - /* 80878F18 */ void daMP_c_Callback_Finish(daMP_c*); - /* 80878F38 */ void daMP_c_Callback_Main(daMP_c*); - /* 80878F70 */ void daMP_c_Callback_Draw(daMP_c*); - - static u8 m_myObj[4]; -}; - struct daMP_THPReadBuffer {}; struct daMP_Dlst_base_c { @@ -65,8 +43,6 @@ struct dComIfG_play_c { /* 80878A64 */ void getEvent(); }; -struct _GXRenderModeObj {}; - struct THPVideoInfo {}; struct THPAudioInfo {}; @@ -78,11 +54,6 @@ struct JUTVideo { static u8 sManager[4]; }; -struct JKRHeap { - /* 802CE4D4 */ void alloc(u32, int); - /* 802CE500 */ void free(void*, JKRHeap*); -}; - struct JFWDisplay { /* 80878D44 */ void setFrameRate(u16); /* 80878D54 */ void getManager(); @@ -92,10 +63,6 @@ struct JFWDisplay { struct JASMixMode {}; -struct JASDriver { - /* 8029C9DC */ void registerMixCallback(s16* (*)(s32), JASMixMode); -}; - // // Forward References: // @@ -126,8 +93,8 @@ extern "C" void __THPHuffDecodeDCTCompY(); extern "C" void __THPHuffDecodeTab(); extern "C" void __THPHuffDecodeDCTCompU(); extern "C" void __THPHuffDecodeDCTCompV(); -extern "C" static void THPInit(); extern "C" static void OSInitFastCast(); +extern "C" static void THPInit(); extern "C" static void daMP_PopReadedBuffer__Fv(); extern "C" static void daMP_PushReadedBuffer__FPv(); extern "C" static void daMP_PopFreeReadBuffer__Fv(); @@ -163,9 +130,7 @@ extern "C" static void daMP_THPGXRestore__Fv(); extern "C" static void daMP_THPGXYuv2RgbSetup__FPC16_GXRenderModeObj(); extern "C" static void GXSetTexCoordGen(); extern "C" static void daMP_THPGXYuv2RgbDraw__FPUcPUcPUcssssss(); -extern "C" static void GXEnd(); extern "C" static void GXTexCoord2u16(); -extern "C" static void GXPosition3s16(); extern "C" static void daMP_MixAudio__FPsPsUl(); extern "C" static void daMP_audioCallbackWithMSound__Fl(); extern "C" static void daMP_audioInitWithMSound__Fv(); @@ -243,7 +208,6 @@ extern "C" extern char const* const d_a_movie_player__stringBase0; SECTION_INIT void memset(); SECTION_INIT void memcpy(); -extern "C" void OSReport(); extern "C" void fadeOut__13mDoGph_gInf_cFf(); extern "C" void mDoExt_getArchiveHeap__Fv(); extern "C" void __ct__10fopAc_ac_cFv(); @@ -258,76 +222,18 @@ extern "C" void getOutputMode__9JASDriverFv(); extern "C" void alloc__7JKRHeapFUli(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); extern "C" void PPCMfhid2(); -extern "C" void DCInvalidateRange(); -extern "C" void DCStoreRange(); -extern "C" void DCZeroRange(); extern "C" void LCEnable(); extern "C" void LCDisable(); -extern "C" void LCStoreData(); -extern "C" void LCQueueWait(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSEnableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void OSInitMessageQueue(); -extern "C" void OSSendMessage(); -extern "C" void OSReceiveMessage(); -extern "C" void OSCreateThread(); -extern "C" void OSCancelThread(); -extern "C" void OSResumeThread(); -extern "C" void OSSuspendThread(); -extern "C" void OSGetTick(); -extern "C" void PSMTXIdentity(); -extern "C" void C_MTXOrtho(); -extern "C" void DVDOpen(); -extern "C" void DVDClose(); -extern "C" void DVDReadPrio(); extern "C" void DVDCancel(); extern "C" void VISetPostRetraceCallback(); extern "C" void VIGetNextField(); extern "C" void VIGetTvFormat(); extern "C" void AIGetDSPSampleRate(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); extern "C" void GXDrawDone(); -extern "C" void GXBegin(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetNumChans(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); extern "C" void GXInvalidateTexAll(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevOp(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColorS10(); -extern "C" void GXSetTevKColor(); -extern "C" void GXSetTevKColorSel(); -extern "C" void GXSetTevKAlphaSel(); -extern "C" void GXSetTevSwapMode(); -extern "C" void GXSetTevSwapModeTable(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetFogRangeAdj(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetColorUpdate(); -extern "C" void GXSetAlphaUpdate(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetPixelFmt(); -extern "C" void GXSetDither(); -extern "C" void GXSetProjection(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); -extern "C" void GXSetViewport(); -extern "C" void GXSetScissor(); +extern "C" static void GXEnd(); +extern "C" static void GXPosition3s16(); extern "C" void _savegpr_21(); extern "C" void _savegpr_22(); extern "C" void _savegpr_23(); @@ -346,7 +252,6 @@ extern "C" void __div2i(); extern "C" void sprintf(); extern "C" void strcmp(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_clearColor[4]; extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; @@ -2248,7 +2153,7 @@ asm daMP_c::daMP_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void* operator new(u32 param_0, void* param_1) { +extern "C" static asm void* __nw__FUlPv() { nofralloc #include "asm/rel/d/a/d_a_movie_player/d_a_movie_player/__nw__FUlPv.s" } diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp index 8481cbf1eaf..43e4f2f187c 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_spinner // -#include "rel/d/a/d_a_spinner/d_a_spinner.h" +// #include "rel/d/a/d_a_spinner/d_a_spinner.h" #include "dol2asm.h" #include "dolphin/types.h" diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index 15e808fac3c..cb5a3fc0af8 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -11,11 +11,6 @@ // Types: // -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - struct daPy_py_c { static u8 m_midnaActor[4]; }; @@ -33,14 +28,6 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); - /* 8024A528 */ void getEventId(int*); -}; - struct dEvt_control_c { /* 80042468 */ void reset(); }; @@ -54,18 +41,6 @@ struct dAttHint_c { /* 800738FC */ void request(fopAc_ac_c*, int); }; -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - // // Forward References: // @@ -112,7 +87,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" void strcmp(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index dd4d6db2105..afa6f25aac0 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -11,11 +11,6 @@ // Types: // -struct fopAc_ac_c { - /* 80018B64 */ fopAc_ac_c(); - /* 80018C8C */ ~fopAc_ac_c(); -}; - struct daPy_py_c { static u8 m_midnaActor[4]; }; @@ -32,35 +27,11 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F48 */ ~dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); - /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); -}; - struct dEvt_control_c { /* 80042468 */ void reset(); /* 80042518 */ void reset(void*); }; -struct csXyz {}; - -struct cXyz {}; - -struct JAISoundID {}; - -struct Vec {}; - -struct Z2SeMgr { - /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); - /* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8); -}; - -struct Z2AudioMgr { - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - // // Forward References: // @@ -101,13 +72,11 @@ extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); extern "C" void __dl__FPv(); -extern "C" void PSVECSquareDistance(); extern "C" void _savegpr_28(); extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 2f1dda8bd91..47be52c1c15 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -220,7 +220,7 @@ bool DynamicModuleControl::do_load() { s32 i = 0; while (true) { if (mModule != NULL) { - JKRFree(mModule); + i_JKRFree(mModule); mModule = NULL; } char buffer[64]; @@ -338,7 +338,7 @@ BOOL DynamicModuleControl::do_load_async() { */ bool DynamicModuleControl::do_unload() { if (mModule != NULL) { - JKRFree(mModule); + i_JKRFree(mModule); mModule = NULL; } return true; @@ -467,7 +467,7 @@ bool DynamicModuleControl::do_unlink() { } sAllocBytes = sAllocBytes - getModuleSize(); if (mBss != NULL) { - JKRFree(mBss); + i_JKRFree(mBss); mBss = NULL; } do_unload(); diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 7be119fe418..756fa665827 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -13,19 +13,20 @@ #include "d/a/d_a_horse_static.h" #include "d/com/d_com_inf_game.h" #include "d/d_bomb.h" -#include "d/d_procname.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "d/d_item.h" #include "d/d_path.h" +#include "d/d_procname.h" +#include "d/msg/d_msg_object.h" +#include "dol2asm.h" +#include "dolphin/types.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include "rel/d/a/d_a_crod/d_a_crod.h" #include "rel/d/a/d_a_horse/d_a_horse.h" -#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h" +#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h" #include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h" // @@ -73,227 +74,6 @@ struct dDemo_actor_c { /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; -struct daAlinkHIO_wolf_c { - /* 80140B98 */ ~daAlinkHIO_wolf_c(); -}; - -struct daAlinkHIO_wlAtDown_c0 { - static u8 const m[156]; -}; - -struct daAlinkHIO_wlAtCjump_c0 { - static u8 const m[100]; -}; - -struct daAlinkHIO_wlAtBite_c0 { - static u8 const m[92]; -}; - -struct daAlinkHIO_wallHang_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_wallFall_c0 { - static u8 const m[40]; -}; - -struct daAlinkHIO_wallCatch_c0 { - static u8 const m[84]; -}; - -struct daAlinkHIO_smallJump_c0 { - static u8 const m[72]; -}; - -struct daAlinkHIO_roofHang_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_pushpull_c0 { - static u8 const m[60]; -}; - -struct daAlinkHIO_pickUp_c0 { - static u8 const m[48]; -}; - -struct daAlinkHIO_noActAtnMove_c0 { - static u8 const m[84]; -}; - -struct daAlinkHIO_kandelaar_c0 { - static u8 const m[80]; -}; - -struct daAlinkHIO_ironBall_c0 { - static u8 const m[140]; -}; - -struct daAlinkHIO_huLight_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_hoCutRB_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_hoCutRA_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_hoCutLB_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_hoCutLA_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_hoCutCharge_c0 { - static u8 const m[84]; -}; - -struct daAlinkHIO_guard_c0 { - static u8 const m[128]; -}; - -struct daAlinkHIO_grab_c0 { - static u8 const m[228]; -}; - -struct daAlinkHIO_gAtPush_c0 { - static u8 const m[36]; -}; - -struct daAlinkHIO_gAtKick_c0 { - static u8 const m[36]; -}; - -struct daAlinkHIO_fmChain_c0 { - static u8 const m[40]; -}; - -struct daAlinkHIO_damage_c0 { - static u8 const m[88]; -}; - -struct daAlinkHIO_damSwim_c0 { - static u8 const m[140]; -}; - -struct daAlinkHIO_damNormal_c0 { - static u8 const m[100]; -}; - -struct daAlinkHIO_damLarge_c0 { - static u8 const m[188]; -}; - -struct daAlinkHIO_damHuge_c0 { - static u8 const m[188]; -}; - -struct daAlinkHIO_damHorse_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_damFall_c0 { - static u8 const m[72]; -}; - -struct daAlinkHIO_damCaught_c0 { - static u8 const m[36]; -}; - -struct daAlinkHIO_cut_c { - /* 80140BD4 */ ~daAlinkHIO_cut_c(); -}; - -struct daAlinkHIO_cutTurn_c0 { - static u8 const m[152]; -}; - -struct daAlinkHIO_cutNmV_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_cutNmSR_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_cutNmSL_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_cutNmR_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_cutNmL_c0 { - static u8 const m[32]; -}; - -struct daAlinkHIO_cutHead_c0 { - static u8 const m[96]; -}; - -struct daAlinkHIO_cutFnV_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnSm_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnSl_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnS_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnR_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnL_c0 { - static u8 const m[44]; -}; - -struct daAlinkHIO_cutFnJU_c0 { - static u8 const m[84]; -}; - -struct daAlinkHIO_cutDown_c0 { - static u8 const m[116]; -}; - -struct daAlinkHIO_cutDaR_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_cutDaL_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_cutDaCharge_c0 { - static u8 const m[28]; -}; - -struct daAlinkHIO_crouch_c0 { - static u8 const m[76]; -}; - -struct daAlinkHIO_canoe_c0 { - static u8 const m[72]; -}; - -struct daAlinkHIO_c { - /* 80140B88 */ daAlinkHIO_c(); - /* 80140C10 */ ~daAlinkHIO_c(); -}; - struct dPaPoF_c { /* 800512E8 */ void setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*, cXyz const*, cXyz const*, cXyz const*, cXyz const*, @@ -3511,7 +3291,7 @@ bool daAlink_c::checkStageName(const char* stage) { /* 8009DA98-8009DB64 0983D8 00CC+00 1/1 0/0 0/0 .text * tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf */ void daAlink_c::tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, dCcD_GObjInf* param_2) { - if (param_2->ChkAtType(0x40000)) { + if (param_2->ChkAtType(AT_TYPE_SPINNER)) { field_0x369c = *param_2->GetAtVecP(); for (int i = 0; i < 3; i++) { if (param_1 == &field_0x850[i]) { @@ -4765,9 +4545,7 @@ SECTION_SDATA2 static u8 smokeID[8] = { }; /* 804531E8-804531F0 0017E8 0008+00 1/1 0/0 0/0 .sdata2 waterColor$53845 */ -SECTION_SDATA2 static u8 waterColor[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static GXColorS10 waterColor = {0, 0, 0, 0}; /* 804531F0-804531F4 0017F0 0004+00 1/1 0/0 0/0 .sdata2 @55047 */ SECTION_SDATA2 static f32 lit_55047 = 77.0f; @@ -4845,660 +4623,7 @@ SECTION_RODATA static u8 const lit_3757[12] = { }; COMPILER_STRIP_GATE(0x8038D658, &lit_3757); -/* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata m__19daAlinkHIO_basic_c0 */ -daAlinkHIO_basic_c1 const daAlinkHIO_basic_c0::m = { - false, 20000, -10000, 8000, 1, 30, 400, 600, 16384, 1.0f, 4.0f, 0.7f, 3.0f, - 60.0f, 85.0f, 300.0f, 200.0f, 20.0f, 30.0f, 23.0f, 41.0f, 0.7f, 0.5f, 0.7f, 400.0f, 5000.0f}; - -/* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata m__18daAlinkHIO_move_c0 */ -daAlinkHIO_move_c1 const daAlinkHIO_move_c0::m = {{11, 0.7f, 3.0f, 4.0f, 12.0f}, - 4500, - 100, - 5, - 1.0f, - 0.75f, - 1.5f, - 0.4f, - 0.8f, - 23.0f, - 1.9f, - 2.2f, - 0.6f, - 1.1f, - 1.5f, - 0.99f, - 3.0f, - 0.7f, - 0.4f}; - -/* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata m__21daAlinkHIO_atnMove_c0 */ -daAlinkHIO_atnMove_c1 const daAlinkHIO_atnMove_c0::m = { - 3000, 2000, 6, 1.2f, 1.1f, 1.5f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, - 0.7f, 1.4f, 0.25f, 0.7f, 15.0f, 2.5f, 8.0f, 0.5f, 0.4f, 1.0f, 1.3f}; - -/* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata m__26daAlinkHIO_noActAtnMove_c0 */ -SECTION_RODATA u8 const daAlinkHIO_noActAtnMove_c0::m[84] = { - 0x0B, 0xB8, 0x07, 0xD0, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x8C, - 0xCC, 0xCD, 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, - 0x41, 0x50, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xF0, 0x00, 0x00, 0x3F, 0x33, - 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x3E, 0x80, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, - 0x41, 0x50, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x3E, 0xB3, - 0x33, 0x33, 0x3E, 0xCC, 0xCC, 0xCD, 0x3D, 0xCC, 0xCC, 0xCD, 0x40, 0x13, 0x33, 0x33, -}; -COMPILER_STRIP_GATE(0x8038D768, &daAlinkHIO_noActAtnMove_c0::m); - -/* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */ -daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = { - {29, 1.1f, 0.0f, 3.0f, 22.0f}, - {29, 0.8f, 3.0f, 2.0f, 25.0f}, - {33, 1.2f, 0.0f, 1.0f, 25.0f}, - 10000, - 5, - 1000, - 100, - 3.0f, - 1.3f, - 25.0f, - 10.0f, - 3.0f, - 15.0f, - 10.0f, - 12.0f, - 9.0f, - 19.0f, - 60.0f, -}; - -/* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */ -daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = { - {9, 0.7f, 0.0f, 2.0f, 12.0f}, {17, 1.0f, 2.0f, 2.0f, 3.0f}, 24.0f, 10.0f, 100.0f, 10.0f, -}; - -/* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */ -daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = { - {5, 1.1f, 1.0f, 3.0f, 6.0f}, - {9, 1.0f, 0.0f, 3.0f, 2.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {9, 1.1f, 0.0f, 3.0f, 4.0f}, - 28.0f, - 22.0f, - 25.0f, - 20.0f, - 100.0f, - 10.0f, -}; - -/* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */ -daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = { - {14, 0.75f, 0.0f, 5.0f, 15.0f}, - {6, 0.9f, 0.0f, 3.0f, 7.0f}, - {15, 1.0f, 0.0f, 3.0f, 9.0f}, - {20, 1.0f, 0.0f, 3.0f, 16.0f}, - 40.0f, - 3.0f, - 50.0f, - 27.0f, - 0.2f, - 12.0f, - 50.0f, - 3.0f, - 33.0f, - 1.2f, -}; - -/* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutNmV_c0::m[32] = { - 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D944, &daAlinkHIO_cutNmV_c0::m); -#pragma pop - -/* 8038D964-8038D984 019FC4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmL_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutNmL_c0::m[32] = { - 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D964, &daAlinkHIO_cutNmL_c0::m); -#pragma pop - -/* 8038D984-8038D9A4 019FE4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmR_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutNmR_c0::m[32] = { - 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x41, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x48, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D984, &daAlinkHIO_cutNmR_c0::m); -#pragma pop - -/* 8038D9A4-8038D9C4 01A004 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSL_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutNmSL_c0::m[32] = { - 0x00, 0x1F, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x88, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D9A4, &daAlinkHIO_cutNmSL_c0::m); -#pragma pop - -/* 8038D9C4-8038D9E4 01A024 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSR_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutNmSR_c0::m[32] = { - 0x00, 0x1B, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x88, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D9C4, &daAlinkHIO_cutNmSR_c0::m); -#pragma pop - -/* 8038D9E4-8038DA10 01A044 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnL_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnL_c0::m[44] = { - 0x00, 0x1D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xE0, - 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0xA8, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038D9E4, &daAlinkHIO_cutFnL_c0::m); -#pragma pop - -/* 8038DA10-8038DA3C 01A070 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnV_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnV_c0::m[44] = { - 0x00, 0x21, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xA0, - 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DA10, &daAlinkHIO_cutFnV_c0::m); -#pragma pop - -/* 8038DA3C-8038DA68 01A09C 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnS_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnS_c0::m[44] = { - 0x00, 0x1F, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41, 0x20, 0x00, 0x00, 0x41, 0x20, - 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DA3C, &daAlinkHIO_cutFnS_c0::m); -#pragma pop - -/* 8038DA68-8038DA94 01A0C8 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSl_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnSl_c0::m[44] = { - 0x00, 0x21, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x41, 0x70, 0x00, 0x00, 0x40, 0xC0, - 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0xA8, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DA68, &daAlinkHIO_cutFnSl_c0::m); -#pragma pop - -/* 8038DA94-8038DAC0 01A0F4 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSm_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnSm_c0::m[44] = { - 0x00, 0x1F, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x20, - 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DA94, &daAlinkHIO_cutFnSm_c0::m); -#pragma pop - -/* 8038DAC0-8038DAEC 01A120 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnR_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutFnR_c0::m[44] = { - 0x00, 0x22, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x41, 0x00, - 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DAC0, &daAlinkHIO_cutFnR_c0::m); -#pragma pop - -/* 8038DAEC-8038DB40 01A14C 0054+00 3/4 0/0 0/0 .rodata m__21daAlinkHIO_cutFnJU_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutFnJU_c0::m[84] = { - 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0x00, - 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x60, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x43, 0x48, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x43, 0x16, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DAEC, &daAlinkHIO_cutFnJU_c0::m); - -/* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */ -daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = { - {17, 1.1f, 0.0f, 2.0f, 18.0f}, - {29, 1.0f, 2.0f, 0.0f, 9.0f}, - 25.0f, - 27.0f, - 15.0f, - 13.0f, - 13.0f, - 1.0f, - 3.0f, -}; - -/* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutTurn_c0::m[152] = { - 0x00, 0x2F, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xE0, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x0C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0xE0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, - 0x40, 0x40, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x43, 0x82, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0xC0, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, - 0x43, 0xC8, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DB84, &daAlinkHIO_cutTurn_c0::m); - -/* 8038DC1C-8038DC3C 01A27C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLA_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_hoCutLA_c0::m[32] = { - 0x00, 0x15, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x60, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DC1C, &daAlinkHIO_hoCutLA_c0::m); -#pragma pop - -/* 8038DC3C-8038DC5C 01A29C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLB_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_hoCutLB_c0::m[32] = { - 0x00, 0x18, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x80, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DC3C, &daAlinkHIO_hoCutLB_c0::m); -#pragma pop - -/* 8038DC5C-8038DC7C 01A2BC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRA_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_hoCutRA_c0::m[32] = { - 0x00, 0x18, 0x00, 0x00, 0x3F, 0x73, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x50, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DC5C, &daAlinkHIO_hoCutRA_c0::m); -#pragma pop - -/* 8038DC7C-8038DC9C 01A2DC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRB_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_hoCutRB_c0::m[32] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DC7C, &daAlinkHIO_hoCutRB_c0::m); -#pragma pop - -/* 8038DC9C-8038DCF0 01A2FC 0054+00 3/3 0/0 0/0 .rodata m__25daAlinkHIO_hoCutCharge_c0 */ -SECTION_RODATA u8 const daAlinkHIO_hoCutCharge_c0::m[84] = { - 0x00, 0x06, 0x00, 0x00, 0x3E, 0xE6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x00, 0x31, - 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0xD8, 0x00, 0x00, 0x00, 0x04, 0x00, 0x05, 0x41, 0x00, 0x00, 0x00, 0x41, 0x70, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xC8, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DC9C, &daAlinkHIO_hoCutCharge_c0::m); - -/* 8038DCF0-8038DD0C 01A350 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaL_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutDaL_c0::m[28] = { - 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DCF0, &daAlinkHIO_cutDaL_c0::m); -#pragma pop - -/* 8038DD0C-8038DD28 01A36C 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaR_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutDaR_c0::m[28] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, - 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DD0C, &daAlinkHIO_cutDaR_c0::m); -#pragma pop - -/* 8038DD28-8038DD44 01A388 001C+00 0/3 0/0 0/0 .rodata m__25daAlinkHIO_cutDaCharge_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_cutDaCharge_c0::m[28] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DD28, &daAlinkHIO_cutDaCharge_c0::m); -#pragma pop - -/* 8038DD44-8038DDB8 01A3A4 0074+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_cutDown_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutDown_c0::m[116] = { - 0x00, 0x08, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3F, - 0xA6, 0x66, 0x66, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, - 0x00, 0x49, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, - 0x00, 0x42, 0x8C, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x59, 0x99, 0x9A, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x06, 0x42, - 0x20, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DD44, &daAlinkHIO_cutDown_c0::m); - -/* 8038DDB8-8038DE18 01A418 0060+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutHead_c0 */ -SECTION_RODATA u8 const daAlinkHIO_cutHead_c0::m[96] = { - 0x00, 0x08, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x41, 0x10, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, - 0x43, 0x96, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, -}; -COMPILER_STRIP_GATE(0x8038DDB8, &daAlinkHIO_cutHead_c0::m); - -/* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */ -daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = { - {29, 1.3f, 0.0f, 3.0f, 30.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {16, 1.0f, 0.0f, 2.0f, 17.0f}, - {35, 1.25f, 0.0f, 0.0f, 22.0f}, - 20.0f, - 33.0f, - 2.0f, - 6.0f, - 13.0f, - 0.0f, - 10.0f, - 250.0f, - 5.0f, -}; - -/* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */ -daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = { - {18, -1.100f, 0.0f, 3.0f, -1.0f}, - {22, 0.9f, 0.0f, 3.0f, 23.0f}, - {45, 1.0f, 0.0f, 3.0f, 15.0f}, - {47, 1.0f, 0.0f, 5.0f, 27.0f}, - 0, - 1, - 15, - 8, - 10, - 90, - 75, - 4000, - -4000, - 30, - 12.0f, - 1.250f, - 1.0f, - 1.0f, - 1.6f, - 45.0f, - 1.65f, - 65.0f, - 1.21f, - 35.0f, - 2.3f, - 2.2f, - 65.0f, - 0.0f, -}; - -/* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */ -SECTION_RODATA u8 const daAlinkHIO_gAtPush_c0::m[36] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DF28, &daAlinkHIO_gAtPush_c0::m); - -/* 8038DF4C-8038DF70 01A5AC 0024+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_gAtKick_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_gAtKick_c0::m[36] = { - 0x00, 0x15, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x40, 0xC0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DF4C, &daAlinkHIO_gAtKick_c0::m); -#pragma pop - -/* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_turnMove_c0 */ -daAlinkHIO_turnMove_c1 const daAlinkHIO_turnMove_c0::m = { - {27, 1.0f, 0.0f, 3.0f, 22.0f}, 5, 2500, 200, 1000, 1.1f, 19.0f, 1.5f, 25.0f, -}; - -/* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata m__19daAlinkHIO_guard_c0 */ -SECTION_RODATA u8 const daAlinkHIO_guard_c0::m[128] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x40, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xE0, 0x00, 0x00, - 0x1F, 0x40, 0x13, 0x88, 0x00, 0x00, 0x1F, 0x40, 0x0F, 0xA0, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, - 0x42, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038DF9C, &daAlinkHIO_guard_c0::m); - -/* 8038E01C-8038E068 01A67C 004C+00 8/9 0/0 0/0 .rodata m__20daAlinkHIO_crouch_c0 */ -SECTION_RODATA u8 const daAlinkHIO_crouch_c0::m[76] = { - 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0xF4, 0x00, 0x32, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E01C, &daAlinkHIO_crouch_c0::m); - -/* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ -daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = { - {6, 1.2f, 3.0f, 6.0f, 7.0f}, - {7, 0.9f, 1.0f, 0.0f, 5.0f}, - {4, 0.75f, 0.0f, 2.0f, 5.0f}, - {10, 0.6f, 0.0f, 2.0f, 11.0f}, - 1, - 9158, - 12287, - 8, - 16384, - 10.0f, - 10.0f, - 1.3f, - 5.0f, - 10.0f, - 3.0f, - -3.4f, - -200.0f, - 26.0f, - 3.0f, - 4.0f, - 10.0f, - 1.0f, - 170.0f, - 100.0f, - 20.0f, - 30.0f, - 20.0f, - -3.4f, - 14.0f, - -5.0f, - 23.0f, -}; - -/* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_smallJump_c0::m[72] = { - 0x00, 0x08, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x3F, - 0x59, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x40, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E11C, &daAlinkHIO_smallJump_c0::m); - -/* 8038E164-8038E1B8 01A7C4 0054+00 15/15 0/0 0/0 .rodata m__23daAlinkHIO_wallCatch_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wallCatch_c0::m[84] = { - 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x1D, - 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xD0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, - 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E164, &daAlinkHIO_wallCatch_c0::m); - -/* 8038E1B8-8038E1E0 01A818 0028+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wallFall_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wallFall_c0::m[40] = { - 0x00, 0x16, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0xB8, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E1B8, &daAlinkHIO_wallFall_c0::m); - -/* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wallMove_c0 */ -daAlinkHIO_wallMove_c1 const daAlinkHIO_wallMove_c0::m = {0.8f, 1.1f, 3.0f, 2.0f, 3.0f}; - -/* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata m__22daAlinkHIO_wallHang_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wallHang_c0::m[28] = { - 0x00, 0x02, 0x00, 0x03, 0x42, 0x48, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, 0x43, 0x16, - 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E1F4, &daAlinkHIO_wallHang_c0::m); - -/* 8038E210-8038E24C 01A870 003C+00 7/7 0/0 0/0 .rodata m__22daAlinkHIO_pushpull_c0 */ -SECTION_RODATA u8 const daAlinkHIO_pushpull_c0::m[60] = { - 0x00, 0x00, 0x00, 0x78, 0x00, 0x07, 0x00, 0x3C, 0x00, 0x50, 0x00, 0x28, 0x00, 0x02, 0x00, - 0x40, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, - 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3E, 0x19, 0x99, 0x9A, 0x3F, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E210, &daAlinkHIO_pushpull_c0::m); - -/* 8038E24C-8038E2B0 01A8AC 0064+00 1/3 0/0 0/0 .rodata m__23daAlinkHIO_damNormal_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damNormal_c0::m[100] = { - 0x00, 0x16, 0x00, 0x00, 0x40, 0x13, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x40, 0x13, 0x33, 0x33, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x40, - 0x13, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, - 0x00, 0x13, 0x00, 0x00, 0x40, 0x13, 0x33, 0x33, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x88, 0x00, 0x00, 0x07, 0xD0, 0x13, 0x88, 0x41, 0x20, 0x00, 0x00, 0x3C, 0xA3, - 0xD7, 0x0A, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E24C, &daAlinkHIO_damNormal_c0::m); - -/* 8038E2B0-8038E36C 01A910 00BC+00 2/4 0/0 0/0 .rodata m__22daAlinkHIO_damLarge_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damLarge_c0::m[188] = { - 0x00, 0x31, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, - 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x42, 0x48, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0x05, 0x14, 0x00, 0x00, 0xC0, 0xA0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, - 0x41, 0xF0, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E2B0, &daAlinkHIO_damLarge_c0::m); - -/* 8038E36C-8038E428 01A9CC 00BC+00 1/3 0/0 0/0 .rodata m__21daAlinkHIO_damHuge_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damHuge_c0::m[188] = { - 0x00, 0x31, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, - 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x04, 0x00, 0x00, - 0x00, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x42, 0x48, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0x07, 0xD0, 0x00, 0x00, 0xC0, 0xF0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E36C, &daAlinkHIO_damHuge_c0::m); - -/* 8038E428-8038E454 01AA88 002C+00 1/1 0/0 0/0 .rodata m__22daAlinkHIO_damHorse_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damHorse_c0::m[44] = { - 0x00, 0x09, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x09, 0xC4, 0x13, 0x88, -}; -COMPILER_STRIP_GATE(0x8038E428, &daAlinkHIO_damHorse_c0::m); - -/* 8038E454-8038E49C 01AAB4 0048+00 9/9 0/0 0/0 .rodata m__21daAlinkHIO_damFall_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damFall_c0::m[72] = { - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x19, 0x40, - 0x80, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, - 0x40, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E454, &daAlinkHIO_damFall_c0::m); - -/* 8038E49C-8038E4C0 01AAFC 0024+00 6/7 0/0 0/0 .rodata m__23daAlinkHIO_damCaught_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damCaught_c0::m[36] = { - 0x00, 0x3B, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x01, 0x2C, 0x00, 0x05, - 0x3F, 0x33, 0x33, 0x33, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, -}; -COMPILER_STRIP_GATE(0x8038E49C, &daAlinkHIO_damCaught_c0::m); - -/* 8038E4C0-8038E54C 01AB20 008C+00 1/2 0/0 0/0 .rodata m__21daAlinkHIO_damSwim_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damSwim_c0::m[140] = { - 0x00, 0x16, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x90, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, - 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x30, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x05, 0xDC, 0x0F, 0xA0, 0x41, 0x00, 0x00, 0x00, - 0x3C, 0xA3, 0xD7, 0x0A, 0x3E, 0x80, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E4C0, &daAlinkHIO_damSwim_c0::m); - -/* 8038E54C-8038E5A4 01ABAC 0058+00 10/12 0/0 0/0 .rodata m__20daAlinkHIO_damage_c0 */ -SECTION_RODATA u8 const daAlinkHIO_damage_c0::m[88] = { - 0x00, 0x0E, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0x70, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, - 0x1E, 0x00, 0x0A, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0A, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, - 0x1E, 0x00, 0x28, 0x00, 0x00, 0x3F, 0x33, 0x33, 0x33, 0x42, 0x0C, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E54C, &daAlinkHIO_damage_c0::m); - -/* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata m__19daAlinkHIO_horse_c0 */ -daAlinkHIO_horse_c1 const daAlinkHIO_horse_c0::m = { - {18, 1.2f, 0.0f, 5.0f, 19.0f}, - {22, 1.2f, 0.0f, 3.0f, 23.0f}, - {43, 1.45f, 3.0f, 3.0f, 44.0f}, - {18, 1.2f, 0.0f, 3.0f, 23.0f}, - 100, - 32767, - 30, - 25, - 5500, - -13000, - 1.2f, - 8.0f, - 8.0f, - 5.0f, -}; +#include "d/a/d_a_alink_HIO_data.inc" /* 800A07D8-800A0868 09B118 0090+00 2/2 0/0 0/0 .text checkAttentionPosAngle__9daAlink_cFP4cXyz */ #pragma push @@ -5532,834 +4657,6 @@ asm void daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { } #pragma pop -/* ############################################################################################## */ -/* 8038E610-8038E658 01AC70 0048+00 11/11 0/0 0/0 .rodata m__19daAlinkHIO_canoe_c0 */ -SECTION_RODATA u8 const daAlinkHIO_canoe_c0::m[72] = { - 0x00, 0x17, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x41, 0xC0, 0x00, 0x00, 0x00, 0x96, 0x01, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xC0, - 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x41, 0x70, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, - 0xC0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x42, 0x20, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, -}; -COMPILER_STRIP_GATE(0x8038E610, &daAlinkHIO_canoe_c0::m); - -/* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata m__17daAlinkHIO_bow_c0 */ -daAlinkHIO_bow_c1 const daAlinkHIO_bow_c0::m = { - {9, 1.0f, 0.0f, 3.0f, 5.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - 10, - 30, - 70, - 5.0f, - 300.0f, - 5000.0f, - 800.0f, - 9000.0f, - 50.0f, - 200.0f, - 3000.0f, - 230.0f, - 3500.0f, - 600.0f, - 9000.0f, - 1000.0f, - 4000.0f, - 250.0f, - 800.0f, -}; - -/* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata m__18daAlinkHIO_boom_c0 */ -daAlinkHIO_boom_c1 const daAlinkHIO_boom_c0::m = { - {21, 0.9f, 3.0f, 2.0f, 22.0f}, - {25, 1.0f, 3.0f, 1.0f, 10.0f}, - 40, - 0, - 1.0f, - 3.0f, - 60.0f, - 60.0f, - 2000.0f, - 3000.0f, - 3000.0f, - 40.0f, -}; - -/* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata m__18daAlinkHIO_bomb_c0 */ -daAlinkHIO_bomb_c1 const daAlinkHIO_bomb_c0::m = { - 160, 50, 50, -4.2f, -100.0f, 0.350f, 2.0f, 20.0f, 1.3f, 225.0f, - 0.0f, -0.8f, -7.0f, 26.0f, 33.0f, 10.0f, 15.0f, 40.0f, 15.0f, 300.0f}; - -/* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_huLight_c0 */ -#pragma push -#pragma force_active on -SECTION_RODATA u8 const daAlinkHIO_huLight_c0::m[28] = { - 0x00, 0x03, 0x00, 0x00, 0x00, 0xB5, 0x00, 0x70, 0x00, 0x28, 0xFF, 0xBA, 0x3F, 0x80, - 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x43, 0xAF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E760, &daAlinkHIO_huLight_c0::m); -#pragma pop - -/* 8038E77C-8038E7CC 01ADDC 0050+00 7/8 0/0 0/0 .rodata m__23daAlinkHIO_kandelaar_c0 */ -SECTION_RODATA u8 const daAlinkHIO_kandelaar_c0::m[80] = { - 0x00, 0x1E, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x88, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x90, 0x00, 0x00, 0x00, 0x50, 0x00, 0x28, - 0x00, 0x14, 0x00, 0x28, 0x00, 0x1E, 0x00, 0x0A, 0x00, 0x03, 0x00, 0xC8, 0x3F, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E77C, &daAlinkHIO_kandelaar_c0::m); - -/* 8038E7CC-8038E7F4 01AE2C 0028+00 2/2 0/0 0/0 .rodata m__21daAlinkHIO_fmChain_c0 */ -SECTION_RODATA u8 const daAlinkHIO_fmChain_c0::m[40] = { - 0x00, 0x14, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, - 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0xBF, 0x8C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E7CC, &daAlinkHIO_fmChain_c0::m); - -/* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */ -daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = { - {29, 1.1f, 0.0f, 3.0f, 23.0f}, - 0.4f, - 1.0f, - 1.8f, - 0.7f, - 0.75f, - 0.45, - 0.6f, - 50.0f, - 10.0f, - 0.35f, - 0.3f, - 0.7f, - 0.8f, - 0.7f, -}; - -/* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */ -SECTION_RODATA u8 const daAlinkHIO_pickUp_c0::m[48] = { - 0x00, 0x12, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x50, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0xBF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038E840, &daAlinkHIO_pickUp_c0::m); - -/* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata m__19daAlinkHIO_board_c0 */ -daAlinkHIO_board_c1 const daAlinkHIO_board_c0::m = { - {9, 2.5f, 0.0f, 3.0f, 10.0f}, - {14, 0.7f, 0.0f, 8.0f, 15.0f}, - {24, 1.6f, 5.0f, 5.0f, 25.0f}, - {24, 0.8f, 0.0f, 3.0f, 25.0f}, - 70.0f, - 4.0f, - 22.0f, - 35.0f, - 1.0f, - 4.0f, - 1.0f, - 3.0f, - 2.0f, - 30.0f, - 0.9f, - 55.0f, - 4.0f, - 3.0f, - 1.0f, - 20.0f, - 24.0f, - 35.0f, - 50.0f, -}; - -/* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata m__20daAlinkHIO_bottle_c0 */ -daAlinkHIO_bottle_c1 const daAlinkHIO_bottle_c0::m = { - {56, 1.15f, 0.0f, 3.0f, 57.0f}, {39, 1.2f, 0.0f, 3.0f, 40.0f}, {44, 1.2f, 0.0f, 3.0f, 50.0f}, - {54, 1.1f, 0.0f, 3.0f, 55.0f}, {24, 1.0f, 0.0f, 3.0f, 25.0f}, {12, 0.6f, 1.0f, 3.0f, 10.0f}, - {47, 1.0f, 0.0f, 3.0f, 48.0f}, {86, 1.0f, 0.0f, 3.0f, 87.0f}, {29, 1.2f, 0.0f, 3.0f, 30.0f}, -}; - -/* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata m__22daAlinkHIO_hookshot_c0 */ -daAlinkHIO_hookshot_c1 const daAlinkHIO_hookshot_c0::m = { - {12, 1.0f, 0.0f, 0.0f, 13.0f}, - {39, 1.0f, 0.0f, 1.0f, 11.0f}, - {28, 1.0f, 0.0f, 2.0f, 7.0f}, - 0.0f, - 1.0f, - 3.0f, - 2000.0f, - 100.0f, - 150.0f, - 60.0f, - 5.0f, - 13.0f, - 3000.0f, - 150.0f, - 225.0f, - 90.0f, -}; - -/* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata m__21daAlinkHIO_spinner_c0 */ -daAlinkHIO_spinner_c1 const daAlinkHIO_spinner_c0::m = { - {21, 0.8f, 0.0f, 3.0f, 13.0f}, - 30, - 15, - 360, - 360, - 150, - -3.7f, - -50.0f, - 0.9f, - 26.0f, - 0.5f, - 0.1f, - 0.01f, - 60.0f, -}; - -/* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata m__22daAlinkHIO_ironBall_c0 */ -SECTION_RODATA u8 const daAlinkHIO_ironBall_c0::m[140] = { - 0x00, 0x13, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, 0x40, 0xA0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0x41, 0x70, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, - 0x40, 0x40, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, - 0x40, 0x40, 0x00, 0x00, 0x3F, 0xD9, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x40, 0xE0, 0x00, 0x00, - 0x3F, 0x00, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, - 0xC0, 0xB0, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0xC3, 0x16, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x42, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x42, 0xA0, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038EA70, &daAlinkHIO_ironBall_c0::m); - -/* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_copyRod_c0 */ -daAlinkHIO_copyRod_c1 const daAlinkHIO_copyRod_c0::m = { - 19, 1.0f, 0.0f, 3.0f, 14.0f, 39, 1.0f, 0.0f, 3.0f, 30.0f, 80.0f, 1500.0f, 100.0f, 2000.0f, -}; - -/* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_zwLight_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_zwLight_c1 const daAlinkHIO_zwLight_c0::m = { - 771, 0, 182, 225, 243, -87, 1.0f, 70.75195f, 131.83594f, 0.0f, -}; -COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m); -#pragma pop - -/* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */ -daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = { - {12, 1.0f, 0.0f, 3.0f, 13.0f}, - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - 15, - 10000, - -13000, - 6000, - -9000, - 1.3f, - 1.3f, -}; - -/* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */ -daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = { - {13, 0.8f, 2.0f, 3.0f, 10.0f}, - {47, 1.25f, 0.0f, 2.0f, 48.0f}, - 0.8f, - 5.0f, - 1.0f, - 0.0f, - 1.0f, - 5.0f, - 1.2f, - 0.0f, - 0.4f, - 0.9f, - 2.0f, - 18.0f, - 40.0f, - 0.8f, - 1.15f, - 0.9f, - 1.35f, - 80.0f, -}; - -/* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata m__22daAlinkHIO_roofHang_c0 */ -SECTION_RODATA u8 const daAlinkHIO_roofHang_c0::m[76] = { - 0x00, 0x22, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0xA0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x64, 0x09, 0x60, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x8C, 0xCC, 0xCD, - 0x40, 0x40, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x40, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038EBFC, &daAlinkHIO_roofHang_c0::m); - -/* 8038EC48-8038ED2C 01B2A8 00E4+00 10/11 0/0 0/0 .rodata m__18daAlinkHIO_grab_c0 */ -SECTION_RODATA u8 const daAlinkHIO_grab_c0::m[228] = { - 0x00, 0x04, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x3F, 0x26, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0xBF, 0x4C, 0xCC, 0xCD, - 0x3F, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, - 0x3F, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, - 0x00, 0x09, 0x00, 0x00, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, - 0xBF, 0x80, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x40, 0xA0, 0x00, 0x00, 0x41, 0x30, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x3F, 0x66, 0x66, 0x66, - 0x40, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, - 0x00, 0x1E, 0x00, 0x00, 0xBF, 0xA6, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x3F, 0x0C, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, - 0x3F, 0x0C, 0xCC, 0xCD, -}; -COMPILER_STRIP_GATE(0x8038EC48, &daAlinkHIO_grab_c0::m); - -/* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata m__18daAlinkHIO_swim_c0 */ -daAlinkHIO_swim_c1 const daAlinkHIO_swim_c0::m = { - {25, 1.0f, 0.0f, 3.0f, -1.0f}, - {23, 1.0f, 0.0f, 3.0f, 24.0f}, - {12, 2.0f, 0.0f, 10.0f, 24.0f}, - {37, 1.0f, 3.0f, 5.0f, 38.0f}, - 15, - 800, - 5000, - 15, - 200, - 5000, - 90, - 50, - 140.0f, - 50.0f, - 8.0f, - 8.0f, - 6.0f, - 12.0f, - 8.0f, - 5.0f, - 0.5f, - -7.0f, - 6.0f, - 0.2f, - 0.8f, - 15.0f, - 3.5f, - 0.5f, - 1.0f, - 0.5f, - 1.3f, - 0.5f, - 1.3f, - 0.4f, - 0.6f, - 15.0f, - 37.5f, - -37.5f, - 3.0f, - -4.0f, - -20.0f, - 250.0f, - 0.0f, - 10.0f, - 0.9f, - -0.7f, - 0.6f, - 13.0f, - 0.3f, - 0.5f, - 1.3f, -}; - -/* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata m__20daAlinkHIO_wlMove_c0 */ -daAlinkHIO_wlMove_c1 const daAlinkHIO_wlMove_c0::m = { - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {14, 1.0f, 0.0f, 3.0f, 12.0f}, - {8, 1.0f, 0.0f, 1.0f, 20.0f}, - {41, 1.0f, 0.0f, 3.0f, 20.0f}, - 9000, - 100, - 5, - 90, - 50, - 60, - 50, - 45, - 50, - 40.0f, - 4.0f, - 3.0f, - 1.6f, - 1.1f, - 2.2f, - 1.2f, - 1.3f, - 0.1f, - 0.4f, - 0.4f, - 0.5f, - 5.0f, - 5.0f, - 0.3f, - 0.85f, - 0.9f, - 2.5f, - 40.0f, - 5.0f, - 22.0f, - 1.0f, - 5.0f, - 100.0f, - 10.0f, - 45.0f, - 1.3f, - 6.0f, - 65.0f, - 20.0f, - 15.0f, - 33.0f, - 35.0f, - 1.2f, - 3.0f, - 25.0f, - 35.0f, - 1.1f, - 0.5f, -}; - -/* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata m__23daAlinkHIO_wlMoveNoP_c0 */ -daAlinkHIO_wlMoveNoP_c1 const daAlinkHIO_wlMoveNoP_c0::m = { - 9000, 100, 5, 25.0f, 3.0f, 1.8f, 1.0f, 0.8f, 2.2f, 1.1f, - 0.1f, 0.6f, 0.6f, 5.0f, 0.5f, 0.85f, 0.9f, 2.5f, 30.0f, -}; - -/* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata m__23daAlinkHIO_wlAtnMove_c0 */ -daAlinkHIO_wlAtnMove_c1 const daAlinkHIO_wlAtnMove_c0::m = { - 9000, 100, 3, 0.8f, 1.8f, 0.2f, 0.6f, 18.0f, 2.0f, 2.0f, 1.7f, 0.4f, 12.0f, 3.0f, 2.0f, -}; - -/* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata m__24daAlinkHIO_wlSideStep_c0 */ -daAlinkHIO_wlSideStep_c1 const daAlinkHIO_wlSideStep_c0::m = { - {5, 1.0f, 0.0f, 3.0f, 6.0f}, - {23, 1.0f, 1.0f, 2.0f, 2.0f}, - {4, 0.9f, 0.0f, 3.0f, 5.0f}, - {23, 1.0f, 1.0f, 2.0f, 3.0f}, - 33.0f, - 23.0f, - 30.0f, - 22.0f, - 100.0f, - 10.0f, -}; - -/* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata m__24daAlinkHIO_wlBackJump_c0 */ -daAlinkHIO_wlBackJump_c1 const daAlinkHIO_wlBackJump_c0::m = { - {11, 0.8f, 0.0f, 2.0f, 12.0f}, {28, 1.0f, 0.0f, 3.0f, 1.0f}, 30.0f, 20.0f, 100.0f, 10.0f, -}; - -/* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata m__20daAlinkHIO_wlHowl_c0 */ -daAlinkHIO_wlHowl_c1 const daAlinkHIO_wlHowl_c0::m = { - {49, 1.0f, 0.0f, 3.0f, 40.0f}, - {71, 1.0f, 0.0f, 3.0f, 72.0f}, - {14, 1.3f, 1.0f, 3.0f, 11.0f}, - {17, 0.9f, 0.0f, 3.0f, 18.0f}, - 3.0f, - 8.0f, - 1.7f, - 0.7f, -}; - -/* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ -daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = {{3, 1.2f, 1.0f, 2.0f, 4.0f}, - {24, 1.0f, 1.0f, 2.0f, 2.0f}, - {5, 0.5f, 2.0f, 5.0f, 7.0f}, - 1, - 0, - 7500, - 8200, - 10.0f, - 10.0f, - 1.1f, - 10.0f, - 5.0f, - -3.6f, - -100.0f, - 1.2f, - 10.0f, - 10.0f, - 1.02f, - 38.0f, - 31.0f, - 100.0f}; - -/* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ -daAlinkHIO_wlPush_c1 const daAlinkHIO_wlPush_c0::m = { - 1.0f, 3.0f, 1.0f, 3.0f, 0.75f, -}; - -/* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata m__19daAlinkHIO_wlLie_c0 */ -daAlinkHIO_wlLie_c1 const daAlinkHIO_wlLie_c0::m = { - {14, 1.5f, 0.0f, 3.0f, 10.0f}, - {11, 1.5f, 3.0f, 3.0f, 8.0f}, - 5, - 500, - 50, - 3.0f, - 8.0f, - 1.7f, - 0.7f, - 5.0f, - 0.8f, - 3.0f, -}; - -/* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_wlLight_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlLight_c1 const daAlinkHIO_wlLight_c0::m = { - 515, 0, 120, 120, 120, -30, 3.0f, 20.0f, 512.0f, -638.0f, -}; -#pragma pop - -/* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata m__24daAlinkHIO_wlWallHang_c0 */ -daAlinkHIO_wlWallHang_c1 const daAlinkHIO_wlWallHang_c0::m = { - {13, 1.2f, 8.0f, 2.0f, 14.0f}, - {39, 1.1f, 0.0f, 3.0f, 31.0f}, - {39, 1.0f, 0.0f, 5.0f, 40.0f}, - {5, 1.0f, 0.0f, 3.0f, 6.0f}, - {6, 1.0f, 0.0f, 3.0f, 7.0f}, - {16, 1.0f, 0.0f, 3.0f, 10.0f}, - 50.0f, - 100.0f, - 200.0f, - 250.0f, - 100.0f, - 17.0f, - 15.0f, - 10.0f, - 10.0f, -}; - -/* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata m__25daAlinkHIO_wlDamNormal_c0 */ -daAlinkHIO_wlDamNormal_c1 const daAlinkHIO_wlDamNormal_c0::m = { - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - {9, 1.0f, 0.0f, 0.0f, 8.0f}, - 10.0f, - 0.01f, - 1.0f, - 0.25f, -}; - -/* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata m__24daAlinkHIO_wlDamLarge_c0 */ -daAlinkHIO_wlDamLarge_c1 const daAlinkHIO_wlDamLarge_c0::m = { - {49, 1.0f, 0.0f, 3.0f, 40.0f}, - {39, 1.0f, 0.0f, 3.0f, 35.0f}, - {34, 1.1f, 0.0f, 3.0f, 32.0f}, - {34, 1.1f, 0.0f, 3.0f, 32.0f}, - 1300, - -5.2f, - 3.0f, - 10.0f, - 15.0f, - 15.0f, - 0.5f, -}; - -/* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata m__23daAlinkHIO_wlDamHuge_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlDamHuge_c1 const daAlinkHIO_wlDamHuge_c0::m = { - {49, 1.1f, 0.0f, 3.0f, 40.0f}, - {39, 1.1f, 0.0f, 3.0f, 35.0f}, - {34, 1.2f, 0.0f, 3.0f, 30.0f}, - {34, 1.2f, 0.0f, 3.0f, 30.0f}, - 2000, - -7.5f, - 3.0f, - 85.0f, - 45.0f, - 15.0f, - 0.5f, -}; -#pragma pop - -/* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata m__23daAlinkHIO_wlDamFall_c0 */ -daAlinkHIO_wlDamFall_c1 const daAlinkHIO_wlDamFall_c0::m = { - {11, 1.0f, 0.0f, 3.0f, 12.0f}, - {17, 0.8f, 0.0f, 0.0f, 12.0f}, - 15, - 35, - 40.0f, - 60.0f, - 3.0f, - 1.0f, - 15.0f, -}; - -/* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata m__25daAlinkHIO_wlDamCaught_c0 */ -daAlinkHIO_wlDamCaught_c1 const daAlinkHIO_wlDamCaught_c0::m = { - 300, 5, 1.2f, 3.0f, 1.5f, -}; - -/* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata m__22daAlinkHIO_wlDamage_c0 */ -daAlinkHIO_wlDamage_c1 const daAlinkHIO_wlDamage_c0::m = { - {9, 1.1f, 0.0f, 3.0f, 10.0f}, - {9, 1.1f, 0.0f, 3.0f, 7.0f}, - 0.7f, -}; - -/* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata m__21daAlinkHIO_wlSlide_c0 */ -daAlinkHIO_wlSlide_c1 const daAlinkHIO_wlSlide_c0::m = { - {20, 1.25f, 0.0f, 3.0f, 25.0f}, - {7, 1.0f, 0.0f, 3.0f, 8.0f}, - {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {29, 1.0f, 0.0f, 3.0f, 27.0f}, - 512, - 64, - 35.0f, - 3.0f, - 50.0f, - 35.0f, - 2.6f, - 18.0f, - 2.1f, - 10.0f, - 0.7f, - 30.0f, -}; - -/* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata m__20daAlinkHIO_wlRope_c0 */ -daAlinkHIO_wlRope_c1 const daAlinkHIO_wlRope_c0::m = { - {16, 1.0f, 0.0f, 3.0f, 17.0f}, 90, 30, 0.5f, 1.2f, 3.0f, 15.0f, 1.0f, 3.0f, 3.0f, 0.8f, -}; - -/* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaLr_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlAtWaLr_c1 const daAlinkHIO_wlAtWaLr_c0::m = { - {41, 0.9f, 4.0f, 3.0f, 16.0f}, - 5, - 3, - 0.0f, - 10.0f, - 4.0f, - 11.0f, - 18.0f, - 5.0f, - 70.0f, - 70.0f, - 150.0f, -}; -#pragma pop - -/* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaSc_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlAtWaSc_c1 const daAlinkHIO_wlAtWaSc_c0::m = { - {15, 0.9f, 0.0f, 3.0f, 15.0f}, - 5, - 5, - 10.0f, - 3.0f, - 5.0f, - 11.0f, - 18.0f, - 0.0f, - 100.0f, - 85.0f, - 150.0f, -}; -#pragma pop - -/* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaTl_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlAtWaTl_c1 const daAlinkHIO_wlAtWaTl_c0::m = { - {42, 1.05f, 3.0f, 3.0f, 28.0f}, - 0, - 3, - 10.0f, - 5.0f, - 10.0f, - 14.0f, - 25.0f, - 0.0f, - 40.0f, - 150.0f, - 100.0f, -}; -#pragma pop - -/* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wlAtRoll_c0 */ -daAlinkHIO_wlAtRoll_c1 const daAlinkHIO_wlAtRoll_c0::m = { - {40, 1.0f, 4.0f, 3.0f, 23.0f}, - 250.0f, - 20.0f, - 0.0f, -}; - -/* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata m__23daAlinkHIO_wlAtNjump_c0 */ -daAlinkHIO_wlAtNjump_c1 const daAlinkHIO_wlAtNjump_c0::m = { - {6, 1.0f, 4.0f, 3.0f, 7.0f}, - 30.0f, - 40.0f, - 23.0f, - 17.0f, - 0.8f, - 2.0f, - 80.0f, - 60.0f, - 120.0f, - 10.0f, -}; - -/* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata m__23daAlinkHIO_wlAtCjump_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtCjump_c0::m[100] = { - 0x00, 0x03, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, - 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x3F, 0x99, 0x99, 0x9A, 0x40, 0x00, - 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x42, - 0x34, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, 0x3F, 0x4C, 0xCC, 0xCD, 0x42, 0xA0, 0x00, - 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0xF0, 0x00, 0x00, 0x41, 0xD0, 0x00, 0x00, 0x3F, 0x00, - 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, -}; -COMPILER_STRIP_GATE(0x8038F5B4, &daAlinkHIO_wlAtCjump_c0::m); - -/* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLand_c0 */ -daAlinkHIO_wlAtLand_c1 const daAlinkHIO_wlAtLand_c0::m = { - {19, 0.9f, 0.0f, 2.0f, 2.0f}, - {14, 1.0f, 0.0f, 3.0f, 1.0f}, - {19, 1.1f, 0.0f, 2.0f, 1.0f}, - 2.0f, -}; - -/* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata m__22daAlinkHIO_wlAtDown_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtDown_c0::m[156] = { - 0x00, 0x03, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x40, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0xB0, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, - 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, - 0x00, 0x0B, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, - 0x41, 0x40, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x3F, 0x59, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x00, 0x28, 0x00, 0x03, - 0x42, 0x34, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, 0x41, 0x50, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8038F658, &daAlinkHIO_wlAtDown_c0::m); - -/* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLock_c0 */ -daAlinkHIO_wlAtLock_c1 const daAlinkHIO_wlAtLock_c0::m = { - {6, 3.0f, 0.0f, 3.0f, 15.0f}, - {6, 2.0f, 0.0f, 2.0f, 20.0f}, - {120, 100.0f, 550.0f, 25.0f, 85.0f}, - 80.0f, - 60.0f, - 120.0f, - -8.0f, - 700.0f, - 1000.0f, -}; - -/* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_wlAtBite_c0 */ -SECTION_RODATA u8 const daAlinkHIO_wlAtBite_c0::m[92] = { - 0x00, 0x05, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x40, 0xC0, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x00, 0x00, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x0F, 0x3F, 0x99, 0x99, 0x9A, - 0x40, 0x40, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xA6, 0x66, 0x66, - 0x3F, 0xA6, 0x66, 0x66, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x3E, 0x42, 0x8F, 0x5C, - 0x3E, 0x42, 0x8F, 0x5C, 0x3C, 0xA3, 0xD7, 0x0A, 0x3C, 0xA3, 0xD7, 0x0A, -}; -COMPILER_STRIP_GATE(0x8038F748, &daAlinkHIO_wlAtBite_c0::m); - -/* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata m__22daAlinkHIO_wlAttack_c0 */ -daAlinkHIO_wlAttack_c1 const daAlinkHIO_wlAttack_c0::m = { - {59, 1.2f, 0.0f, 2.0f, 5.0f}, 15, 5, 100.0f, 10.0f, 5.0f, 230.0f, 10.0f, 12.0f, 35.0f, 30.0f}; - -/* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_wlPoint_c0 */ -daAlinkHIO_wlPoint_c1 const daAlinkHIO_wlPoint_c0::m = { - {6, 0.9f, 2.0f, 3.0f, 7.0f}, - {7, 1.0f, 0.0f, 3.0f, 8.0f}, - {11, 0.75f, 0.0f, 3.0f, 5.0f}, - {14, 1.0f, 0.0f, 3.0f, 3.0f}, - {20, 1.0f, 3.0f, 5.0f, 50.0f}, - 45.0f, - 65.0f, - 15.0f, - 0.5f, - 0.5f, - 0.2f, -}; - -/* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata m__21daAlinkHIO_wlChain_c0 */ -daAlinkHIO_wlChain_c1 const daAlinkHIO_wlChain_c0::m = { - {39, 1.0f, 0.0f, 3.0f, 40.0f}, - {81, 1.0f, 0.0f, 3.0f, 82.0f}, - {47, 1.0f, 0.0f, 0.0f, 48.0f}, - 20, - 5, - 1.0f, - 3.0f, - 1.0f, - 3.0f, - 15.1f, - 1.0f, - 5.0f, -}; - -/* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata m__20daAlinkHIO_wlSwim_c0 */ -daAlinkHIO_wlSwim_c1 const daAlinkHIO_wlSwim_c0::m = { - {25, 0.9f, 0.0f, 5.0f, -1.0f}, - {45, 1.0f, 0.0f, 3.0f, 20.0f}, - {28, 1.1f, 0.0f, 1.0f, 32.0f}, - 5, - 1000, - 1600, - 5, - 2500, - 1024, - 90.0f, - 50.0f, - 20.0f, - 0.35f, - -10.0f, - 10.0f, - 1.5f, - 1.4f, - 10.0f, - 3.5f, - 0.5f, - 1.5f, - 5.0f, - 37.5f, - 9.0f, - 0.25f, - 1.0f, - 0.4f, - 1.2f, - -37.5f, - 8.0f, - 0.2f, - -7.0f, - 7.0f, -}; - -/* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_wlGrab_c0 */ -daAlinkHIO_wlGrab_c1 const daAlinkHIO_wlGrab_c0::m = { - {20, 1.5f, 0.0f, 3.0f, 15.0f}, {20, -1.3f, 0.0f, 3.0f, 5.0f}, {14, 1.0f, 0.0f, 3.0f, 15.0f}, - {14, -1.0f, 0.0f, 3.0f, -1.0f}, {19, 1.3f, 4.0f, 3.0f, 15.0f}, -}; - -/* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata m__20daAlinkHIO_wlBall_c0 */ -#pragma push -#pragma force_active on -daAlinkHIO_wlBall_c1 const daAlinkHIO_wlBall_c0::m = { - {64, 1.0f, 0.0f, 3.0f, 35.0f}, {54, 1.0f, 0.0f, 3.0f, 55.0f}, 60, -5.0f, 60.0f, 20.0f, -}; -#pragma pop - -/* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata m__18daAlinkHIO_wolf_c0 */ -daAlinkHIO_wolf_c1 const daAlinkHIO_wolf_c0::m = { - 13000, -10000, 8000, 4000, -2000, 8000, 150, 5, 35, 60, 0.7f, -}; - /* 800A142C-800A1AEC 09BD6C 06C0+00 1/1 0/0 0/0 .text getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs */ #pragma push @@ -7581,270 +5878,31 @@ SECTION_RODATA static u8 const lit_34968[12] = { COMPILER_STRIP_GATE(0x80391A50, &lit_34968); /* 80391A5C-80391B5C 01E0BC 00FF+01 1/1 0/0 0/0 .rodata getSeType$37390 */ -SECTION_RODATA static u8 const getSeType[255 + 1 /* padding */] = { - 0x08, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x02, - 0x02, - 0x08, - 0x08, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x08, - 0x08, - 0x08, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x03, - 0x02, - 0x08, - 0x02, - 0x02, - 0x00, - 0x01, - 0x01, - 0x02, - 0x01, - 0x08, - 0x01, - 0x08, - 0x01, - 0x01, - 0x01, - 0x08, - 0x08, - 0x08, - 0x01, - 0x01, - 0x08, - 0x02, - 0x08, - 0x01, - 0x01, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x01, - 0x01, - 0x02, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x01, - 0x08, - 0x08, - 0x01, - 0x01, - 0x01, - 0x08, - 0x08, - 0x08, - 0x01, - 0x01, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x01, - 0x02, - 0x02, - 0x02, - 0x02, - 0x01, - 0x02, - 0x08, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x08, - 0x08, - 0x08, - 0x01, - 0x02, - 0x01, - 0x02, - 0x01, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x02, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x02, - 0x02, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x02, - 0x01, - 0x02, - 0x02, - 0x08, - 0x01, - 0x01, - 0x01, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x05, - 0x05, - 0x05, - 0x05, - 0x05, - 0x05, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x04, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x06, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x08, - 0x02, - 0x02, - 0x01, - 0x02, - 0x02, - 0x02, - 0x08, - 0x08, - 0x08, - 0x08, - 0x02, - 0x03, - 0x03, - 0x01, - 0x08, - 0x03, - 0x02, - 0x02, - 0x02, - 0x02, - 0x01, - 0x02, - /* padding */ - 0x00, +SECTION_RODATA static u8 const getSeType[255] = { + 0x08, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x08, 0x08, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, + 0x03, 0x03, 0x03, 0x08, 0x08, 0x08, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x08, + 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x08, 0x01, 0x08, 0x01, 0x01, 0x01, 0x08, 0x08, 0x08, + 0x01, 0x01, 0x08, 0x02, 0x08, 0x01, 0x01, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x01, 0x01, 0x02, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x01, + 0x01, 0x01, 0x08, 0x08, 0x08, 0x01, 0x01, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x01, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x08, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x08, 0x08, 0x08, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, + 0x02, 0x02, 0x02, 0x02, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x02, 0x02, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x02, 0x01, 0x02, 0x02, + 0x08, 0x01, 0x01, 0x01, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, + 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x08, + 0x08, 0x08, 0x08, 0x02, 0x03, 0x03, 0x01, 0x08, 0x03, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, }; COMPILER_STRIP_GATE(0x80391A5C, &getSeType); /* 80391B5C-80391B7C 01E1BC 0020+00 1/1 0/0 0/0 .rodata bgmLabel$37391 */ -static u32 const bgmLabel[8] = {0x100001C, 0x100000A, 0x100000B, 0x1000014, - 0x1000081, 0x1000082, 0x1000083, 0x10000A0}; +static u32 const bgmLabel[8] = { + Z2BGM_HEART_GET, Z2BGM_ITEM_GET, Z2BGM_ITEM_GET_MINI, Z2BGM_ITEM_GET_ME, + Z2BGM_ITEM_GET_INSECT, Z2BGM_ITEM_GET_SMELL, Z2BGM_ITEM_GET_POU, Z2BGM_ITEM_GET_ME_S, +}; /* 80391B7C-80391B8C 01E1DC 0010+00 1/1 0/0 0/0 .rodata rupeeCount$37407 */ static int const rupeeCount[4] = {20, 50, 100, 200}; @@ -14135,7 +12193,8 @@ void daAlink_c::setSelectEquipItem(int param_0) { } } - if (mClothesChangeWaitTimer == 0 && (temp != mSwordModel || i_checkNoResetFlg2(STATUS_WINDOW_DRAW))) { + if (mClothesChangeWaitTimer == 0 && + (temp != mSwordModel || i_checkNoResetFlg2(STATUS_WINDOW_DRAW))) { if (temp != mSwordModel) { mSwordChangeWaitTimer = 5; } @@ -14369,7 +12428,7 @@ void daAlink_c::playerInit() { field_0x3188 = dComIfGp_evmng_startDemo(0xFF); } else if (i_getLastSceneMode() == 12) { field_0x3188 = dComIfGp_evmng_startDemo(0xD1); - } else { + } else { field_0x3188 = dComIfGp_evmng_startDemo(startEvent); } } @@ -14450,6 +12509,14 @@ inline bool checkCasualWearFlg() { return dComIfGs_getSelectEquipClothes() == WEAR_CASUAL; } +inline bool checkZoraWearFlg() { + return dComIfGs_getSelectEquipClothes() == WEAR_ZORA; +} + +inline bool checkMagicArmorWearFlg() { + return dComIfGs_getSelectEquipClothes() == ARMOR; +} + /* 800A5CC8-800A660C 0A0608 0944+00 1/1 0/0 0/0 .text create__9daAlink_cFv */ #ifdef NONMATCHING int daAlink_c::create() { @@ -14470,7 +12537,7 @@ int daAlink_c::create() { BOOL enteringCity = false; // Stage: City Room: Entrance Layer: 0 - if (checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 0 && + if (checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 0 && dComIfG_play_c::getLayerNo(0) == 0 && mCurrent.mPosition.y > 7500.0f) { enteringCity = true; } @@ -14495,7 +12562,8 @@ int daAlink_c::create() { mCurrent.mAngle.y = mCollisionRot.y; } - if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 || sceneMode == 9) { + if ((!checkBossOctaIealRoom() && dComIfGs_Wolf_Change_Check() == 1) || startPoint == -4 || + sceneMode == 9) { mAttentionInfo.mPosition.set(mCurrent.mPosition.x + cM_ssin(mCollisionRot.y) * 70.0f, mCurrent.mPosition.y + 80.0f, mCurrent.mPosition.z + cM_scos(mCollisionRot.y) * 70.0f); @@ -14534,25 +12602,30 @@ int daAlink_c::create() { bgWaitFlg = 1; if (checkCanoeStart()) { - field_0x2900 = fopAcM_create(PROC_CANOE, 0, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + field_0x2900 = fopAcM_create(PROC_CANOE, 0, &mCurrent.mPosition, fopAcM_GetRoomNo(this), + &mCollisionRot, NULL, -1); } else if (sceneMode == 11) { - field_0x2900 = fopAcM_create(PROC_Obj_IceLeaf, 0x1FFFF, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + field_0x2900 = fopAcM_create(PROC_Obj_IceLeaf, 0x1FFFF, &mCurrent.mPosition, + fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); } else { field_0x2900 = -1; } } mLinkAcch.CrrPos(dComIfG_Bgsp()); - void* var_r24 = NULL; // supposed to be set in big if statement + void* var_r24 = NULL; // supposed to be set in big if statement - if (mLinkAcch.GetGroundH() == lit_9138 || + if (mLinkAcch.GetGroundH() == lit_9138 || (startMode == 14 && !dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) || - (startPoint == -4 && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, &mCurrent.mPosition) == NULL) || + (startPoint == -4 && + fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, &mCurrent.mPosition) == NULL) || (field_0x2900 != -1 && !fopAcM_SearchByID(field_0x2900)) || (checkCanoeStart() && !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL)) || (checkBoarStart() && !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchBoar, NULL)) || - (startMode == 13 && (!mLinkAcch.ChkWaterHit() || mLinkAcch.m_wtr.GetHeight() < mCurrent.mPosition.y)) || - ((checkCarryStartLightBallA() || checkCarryStartLightBallB()) && !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL)) || + (startMode == 13 && + (!mLinkAcch.ChkWaterHit() || mLinkAcch.m_wtr.GetHeight() < mCurrent.mPosition.y)) || + ((checkCarryStartLightBallA() || checkCarryStartLightBallB()) && + !fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL)) || (horseStart && i_dComIfGp_getHorseActor() == NULL)) { return 0; } @@ -14570,9 +12643,11 @@ int daAlink_c::create() { setRoomInfo(); setWaterY(); - if (checkStageName("F_SP102") && fopAcM_GetRoomNo(this) == 0 && dComIfG_play_c::getLayerNo(0) == 4) { + if (checkStageName("F_SP102") && fopAcM_GetRoomNo(this) == 0 && + dComIfG_play_c::getLayerNo(0) == 4) { i_onNoResetFlg2(0x800000); - } else if (checkStageName("F_SP123") && fopAcM_GetRoomNo(this) == 13 && dComIfG_play_c::getLayerNo(0) == 0) { + } else if (checkStageName("F_SP123") && fopAcM_GetRoomNo(this) == 13 && + dComIfG_play_c::getLayerNo(0) == 0) { i_onNoResetFlg2(0x1000000); } @@ -14608,7 +12683,8 @@ int daAlink_c::create() { setAttentionPos(); setItemActor(); - if (dComIfGs_getLastSceneMode() & 0x400000 && !i_checkWolf() && !checkNotHeavyBootsStage() && !horseStart && !enteringCity) { + if (dComIfGs_getLastSceneMode() & 0x400000 && !i_checkWolf() && !checkNotHeavyBootsStage() && + !horseStart && !enteringCity) { setHeavyBoots(1); } @@ -14618,10 +12694,12 @@ int daAlink_c::create() { } if (checkCarryStartLightBallA() || checkCarryStartLightBallB()) { - setForceGrab((fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL), 1, 1); + setForceGrab((fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchLightBall, NULL), + 1, 1); } - fopAcM_create(PROC_MIDNA, prm, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + fopAcM_create(PROC_MIDNA, prm, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, + NULL, -1); checkSetNpcTks(&mCurrent.mPosition, fopAcM_GetRoomNo(this), 1); if (startPoint == -4 && dComIfGp_TargetWarpPt_get() != -1 && !dComIfGp_TransportWarp_check()) { @@ -14629,7 +12707,8 @@ int daAlink_c::create() { } if (i_dStage_stagInfo_GetSaveTbl(i_dComIfGp_getStage()->getStagInfo()) == 0x11) { - if (!i_dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !i_dComIfGs_isItemFirstBit(SHIELD) && !i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) { + if (!i_dComIfGs_isItemFirstBit(HYLIA_SHIELD) && !i_dComIfGs_isItemFirstBit(SHIELD) && + !i_dComIfGs_isItemFirstBit(WOOD_SHIELD)) { i_fopAcM_onSwitch(this, 0x6F); } else { i_fopAcM_offSwitch(this, 0x6F); @@ -16046,7 +14125,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 param_1, int param_2 } if (checkHorseRide() || checkSpinnerRide()) { - fopAc_ac_c* rideAc = mRideActor.getActor(); + fopAc_ac_c* rideAc = mRideAcKeep.getActor(); rideAc->mCurrent.mPosition = mCurrent.mPosition; rideAc->mCollisionRot.y = mCollisionRot.y; rideAc->mCurrent.mAngle.y = mCollisionRot.y; @@ -16165,12 +14244,11 @@ void daAlink_c::setStickData() { mItemButton = 0; mHeavySpeedMultiplier = 1.0f; - if (checkEventRun() && mProcID != PROC_GRASS_WHISTLE_WAIT && - mProcID != PROC_WOLF_DIG_THROUGH && mProcID != PROC_GOAT_CATCH && - mProcID != PROC_WOLF_GANON_CATCH && mProcID != PROC_TOOL_DEMO && - (mProcID != PROC_METAMORPHOSE || mFallVoiceInit == 0)) { + if (checkEventRun() && mProcID != PROC_GRASS_WHISTLE_WAIT && mProcID != PROC_WOLF_DIG_THROUGH && + mProcID != PROC_GOAT_CATCH && mProcID != PROC_WOLF_GANON_CATCH && + mProcID != PROC_TOOL_DEMO && (mProcID != PROC_METAMORPHOSE || mFallVoiceInit == 0)) { u32 demoMode = mDemo.getDemoMode(); - + if (checkDemoMoveMode(demoMode)) { if (dDemo_c::m_object->getActor() != NULL) { field_0x33a8 = 1.0f; @@ -16198,12 +14276,12 @@ void daAlink_c::setStickData() { } else if (checkDeadHP() || dMeter2Info_getPauseStatus() == 1) { field_0x33a8 = 0.0f; field_0x33ac = 0.0f; - field_0x2fe0 = 0; + mStickAngle = 0; field_0x2fe2 = 0; } else if (checkMidnaLockJumpPoint() && getMidnaActor()->checkNoInput()) { field_0x33a8 = 0.0f; field_0x33ac = 0.0f; - field_0x2fe0 = 0; + mStickAngle = 0; dComIfGp_2dShowOff(); i_onNoResetFlg2(0x80); var_r31 = 1; @@ -16214,30 +14292,36 @@ void daAlink_c::setStickData() { } bool usingFishRod = false; - if (checkFishingRodAndLureItem() && mItemActor.getActor() != NULL && (checkCanoeRide() || mProcID == PROC_FISHING_CAST)) { + if (checkFishingRodAndLureItem() && mItemAcKeep.getActor() != NULL && + (checkCanoeRide() || mProcID == PROC_FISHING_CAST)) { usingFishRod = true; } if (usingFishRod) { - dmg_rod_class* mg_rod = (dmg_rod_class*)mItemActor.getActor(); - field_0x33a8 = JMAFastSqrt((mg_rod->getRodStickX() * mg_rod->getRodStickX()) + (mg_rod->getRodStickY() * mg_rod->getRodStickY())); - field_0x2fe0 = cM_atan2s(-mg_rod->getRodStickX(), mg_rod->getRodStickY()); + dmg_rod_class* mg_rod = (dmg_rod_class*)mItemAcKeep.getActor(); + field_0x33a8 = JMAFastSqrt((mg_rod->getRodStickX() * mg_rod->getRodStickX()) + + (mg_rod->getRodStickY() * mg_rod->getRodStickY())); + mStickAngle = cM_atan2s(-mg_rod->getRodStickX(), mg_rod->getRodStickY()); } else { field_0x33a8 = mDoCPd_c::getStickValue(PAD_1); - field_0x2fe0 = mDoCPd_c::getStickAngle3D(PAD_1) - 0x8000; + mStickAngle = mDoCPd_c::getStickAngle3D(PAD_1) - 0x8000; } field_0x33ac = field_0x33a8; - field_0x2fe2 = field_0x2fe0 + dCam_getControledAngleY(dComIfGp_getCamera(field_0x317c)); + field_0x2fe2 = mStickAngle + dCam_getControledAngleY(dComIfGp_getCamera(field_0x317c)); if (i_checkMagneBootsOn()) { - if (field_0x2fb9 == 1 || (field_0x2fb9 == 0 && field_0x3114 == -0x8000 && field_0x3114 <= 0x6000)) { + if (field_0x2fb9 == 1 || + (field_0x2fb9 == 0 && field_0x3114 == -0x8000 && field_0x3114 <= 0x6000)) { field_0x2fb9 = 1; } else { field_0x2fb9 = 2; } - if (field_0x2fb9 == 1 && ((field_0x3114 > 0x6000 || field_0x3114 == -0x8000) || (field_0x2fb9 == 2 && field_0x3114 == -0x8000)) && field_0x3114 < 0x4000) { + if (field_0x2fb9 == 1 && + ((field_0x3114 > 0x6000 || field_0x3114 == -0x8000) || + (field_0x2fb9 == 2 && field_0x3114 == -0x8000)) && + field_0x3114 < 0x4000) { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, 0) + 0x8000; } else { field_0x2fe2 = getMagneBootsLocalAngleY(field_0x2fe2, field_0x2fb9); @@ -16304,14 +14388,15 @@ void daAlink_c::setStickData() { mHeavySpeedMultiplier = daAlinkHIO_magneBoots_c0::m.mWaterInputFactor; } field_0x33a8 *= mHeavySpeedMultiplier; - } else if (i_checkWolf() && ((field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11)) { + } else if (i_checkWolf() && + ((field_0x2fbc == 11 && checkWaterPolygonUnder()) || field_0x2fbb == 11)) { i_onNoResetFlg0(0x40000000); field_0x33a8 *= daAlinkHIO_wolf_c0::m.mSwampInputRate; mHeavySpeedMultiplier = daAlinkHIO_wolf_c0::m.mSwampInputRate; } } - s16 sub = field_0x2fe0 - field_0x307c; + s16 sub = mStickAngle - field_0x307c; int x = abs(sub); if (x < 0x4000 && x > 0x6D4 && field_0x3180 * sub > 0) { @@ -16420,14 +14505,21 @@ asm void daAlink_c::checkRestHPAnime() { #pragma pop /* 800B3494-800B3500 0ADDD4 006C+00 44/44 0/0 0/0 .text getDirectionFromAngle__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getDirectionFromAngle(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getDirectionFromAngle__9daAlink_cFs.s" +int daAlink_c::getDirectionFromAngle(s16 angle) { + if (abs(angle) > 0x6000) { + return DIR_BACKWARD; + } + + if (angle >= 0x2000) { + return DIR_LEFT; + } + + if (angle <= -0x2000) { + return DIR_RIGHT; + } + + return DIR_FORWARD; } -#pragma pop /* 800B3500-800B3630 0ADE40 0130+00 13/13 0/0 0/0 .text checkAttentionState__9daAlink_cFv */ @@ -16904,8 +14996,7 @@ asm void daAlink_c::orderZTalk() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daAlink_c::checkNormalAction() { - nofralloc +asm void daAlink_c::checkNormalAction(){nofralloc #include "asm/d/a/d_a_alink/checkNormalAction__9daAlink_cFv.s" } #pragma pop @@ -17070,7 +15161,7 @@ asm void daAlink_c::swordUnequip() { /* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text itemEquip__9daAlink_cFUs */ void daAlink_c::itemEquip(u16 item_id) { - if (mThrowBoomerangActor.getActor() == NULL || item_id != BOOMERANG) { + if (mThrowBoomerangAcKeep.getActor() == NULL || item_id != BOOMERANG) { field_0x2fde = item_id; dComIfGp_clearPlayerStatus0(0, 0x400000); i_offNoResetFlg3(0x40000); @@ -17475,7 +15566,12 @@ int daAlink_c::checkSceneChange(int exitID) { exitID = 0x3F; } - if (var_r3 || ((exitID != 0x3F || mExitID != 0x3F) && (i_checkModeFlg(0x40000) || i_checkModeFlg(0x400) || mLinkAcch.ChkGroundHit() || mProcID == PROC_DOOR_OPEN || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG_THROUGH || (field_0x3174 == 5 && field_0x33c8 - mCurrent.mPosition.y > 500.0f))) || (mExitID & 0x8000 && i_checkModeFlg(2))) { + if (var_r3 || + ((exitID != 0x3F || mExitID != 0x3F) && + (i_checkModeFlg(0x40000) || i_checkModeFlg(0x400) || mLinkAcch.ChkGroundHit() || + mProcID == PROC_DOOR_OPEN || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG_THROUGH || + (field_0x3174 == 5 && field_0x33c8 - mCurrent.mPosition.y > 500.0f))) || + (mExitID & 0x8000 && i_checkModeFlg(2))) { if (field_0x3174 == 5 || (mExitID & 0x8000 && mExitDirection == 0xFF)) { mLinkAcch.i_ClrGroundHit(); } @@ -17494,7 +15590,8 @@ int daAlink_c::checkSceneChange(int exitID) { if (hStop->getActiveFlg()) { fpoAcM_relativePos(hStop, &mCurrent.mPosition, &sp8); - if (sp8.y >= -200.0f && sp8.y <= hStop->mScale.y + 600.0f && fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z) { + if (sp8.y >= -200.0f && sp8.y <= hStop->mScale.y + 600.0f && + fabsf(sp8.x) <= hStop->mScale.x && fabsf(sp8.z) <= hStop->mScale.z) { return 0; } } @@ -17549,7 +15646,9 @@ int daAlink_c::checkSceneChange(int exitID) { exitMode = 0; } - if (mEvtInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG || mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 || dComIfGp_event_compulsory(this, NULL, -1)) { + if (mEvtInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == WOLF_DIG || + mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 || + dComIfGp_event_compulsory(this, NULL, -1)) { s32 sceneChanged = 0; if (var_r3) { @@ -17557,7 +15656,8 @@ int daAlink_c::checkSceneChange(int exitID) { mDemo.setDemoMode(0x34); } else { if (mExitID != 0x3F) { - sceneChanged = dStage_changeScene(mExitID, exitSpeed, exitMode, fopAcM_GetRoomNo(this), mCollisionRot.y, -1); + sceneChanged = dStage_changeScene(mExitID, exitSpeed, exitMode, + fopAcM_GetRoomNo(this), mCollisionRot.y, -1); if (sceneChanged) { i_onNoResetFlg2(0x8000); if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { @@ -17569,8 +15669,11 @@ int daAlink_c::checkSceneChange(int exitID) { field_0x2f58 = dPath_GetRoomPath(mExitDirection, fopAcM_GetRoomNo(this)); } } else { - sceneChanged = dStage_changeSceneExitId(mLinkAcch.m_gnd, exitSpeed, exitMode, fopAcM_GetRoomNo(this), mCollisionRot.y); - field_0x2f58 = dPath_GetRoomPath(dComIfG_Bgsp().GetRoomPathId(mLinkAcch.m_gnd), fopAcM_GetRoomNo(this)); + sceneChanged = + dStage_changeSceneExitId(mLinkAcch.m_gnd, exitSpeed, exitMode, + fopAcM_GetRoomNo(this), mCollisionRot.y); + field_0x2f58 = dPath_GetRoomPath(dComIfG_Bgsp().GetRoomPathId(mLinkAcch.m_gnd), + fopAcM_GetRoomNo(this)); } } @@ -17803,7 +15906,7 @@ BOOL daAlink_c::setItemModel() { if (mEquipItem == IRONBALL) { setIronBallModel(); setIronBallWaitUpperAnime(1); - return mItemActor.getActor() != NULL ? 1 : 0; + return mItemAcKeep.getActor() != NULL ? 1 : 0; } return 0; @@ -17814,31 +15917,31 @@ BOOL daAlink_c::setItemModel() { #ifdef NONMATCHING BOOL daAlink_c::setItemActor() { if (mEquipItem == BOOMERANG) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &mCurrent.mPosition, -1, NULL, - NULL, -1, NULL, NULL); + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &mCurrent.mPosition, + -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(0, 0); return 0; } - mItemActor.setData(actor); + mItemAcKeep.setData(actor); field_0x2f94 = 2; return 1; } - + if (mEquipItem == COPY_ROD) { - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, &mCurrent.mPosition, -1, NULL, - NULL, -1, NULL, NULL); + fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, &mCurrent.mPosition, -1, + NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(0, 0); return 0; } - mItemActor.setData(actor); + mItemAcKeep.setData(actor); field_0x2f94 = 2; return 1; } - + if (mEquipItem == IRONBALL) { fopAc_ac_c* actor = daCrod_c::makeIronBallDummy(this); @@ -17850,23 +15953,23 @@ BOOL daAlink_c::setItemActor() { return 0; } - mItemActor.setData(actor); + mItemAcKeep.setData(actor); field_0x173c.SetActor(actor); return 1; } - + if (checkFisingRodLure()) { u32 id = fopAcM_create(PROC_MG_ROD, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF); - mItemActor.setID(id); + mItemAcKeep.setID(id); initFishingRodHand(); return 1; } - + if (checkFishingRodItem(mEquipItem)) { setGroundFishingRodActor(); return 1; } - + if (checkBombItem(mEquipItem)) { if (checkHorseRide()) { if (!i_dComIfGp_getHorseActor()->checkNoBombProc() && @@ -18104,7 +16207,8 @@ bool daAlink_c::checkCloudSea() { /* 800C03E8-800C044C 0BAD28 0064+00 5/5 0/0 0/0 .text checkRoomOnly__9daAlink_cFv */ bool daAlink_c::checkRoomOnly() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_ROOM || checkLv7DungeonShop(); + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_ROOM || + checkLv7DungeonShop(); } /* 800C044C-800C04B4 0BAD8C 0068+00 3/3 0/0 0/0 .text checkLv2DungeonRoomSpecial__9daAlink_cFv */ @@ -18116,8 +16220,9 @@ bool daAlink_c::checkLv2DungeonRoomSpecial() { /* 800C04B4-800C0520 0BADF4 006C+00 2/2 0/0 0/0 .text checkRoomSpecial__9daAlink_cFv */ bool daAlink_c::checkRoomSpecial() { - return (checkStageName("D_MN11") && (dComIfGp_roomControl_getStayNo() == 1 || - dComIfGp_roomControl_getStayNo() == 2)) || checkLv2DungeonRoomSpecial(); + return (checkStageName("D_MN11") && + (dComIfGp_roomControl_getStayNo() == 1 || dComIfGp_roomControl_getStayNo() == 2)) || + checkLv2DungeonRoomSpecial(); } /* 800C0520-800C0594 0BAE60 0074+00 1/1 0/0 0/0 .text checkRoom__9daAlink_cFv */ @@ -18300,6527 +16405,25 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC procID) { } } -/* 800C2DDC-800C2EAC 0BD71C 00D0+00 17/17 0/0 0/0 .text - * procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c */ -#ifdef NONMATCHING -void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { - commonProcInit(ACT_PROC_PREACTION_UNEQUIP); - mNormalSpeed = 0.0f; - setBlendMoveAnime(4.0f); - allUnequip(0); - field_0x3010 = 0; +#include "d/a/d_a_alink_link.inc" - if (param_1 == NULL) { - field_0x300e = 0; - } else { - field_0x280c.setData(param_1); - field_0x300e = 1; - if (fopAcM_GetName(param_1) == 0x2cb) { - if (mEquipItem == KANTERA) { - field_0x3010 = 1; - } else { - if (i_checkNoResetFlg2(1) != 0) { - offKandelaarModel(); - } - } - } - } +#include "d/a/d_a_alink_cut.inc" - field_0x3198 = param_0; - return 1; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s" -} -#pragma pop -#endif +#include "d/a/d_a_alink_damage.inc" -/* 800C2EAC-800C3098 0BD7EC 01EC+00 1/0 0/0 0/0 .text procPreActionUnequip__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPreActionUnequip() { - nofralloc -#include "asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_guard.inc" -/* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text procServiceWaitInit__9daAlink_cFv - */ -bool daAlink_c::procServiceWaitInit() { - commonProcInit(PROC_SERVICE_WAIT); - setSingleAnimeBase(ANM_SERVICE_WAIT); - mNormalSpeed = FLOAT_LABEL(lit_6108); - mCurrent.mAngle.y = mCollisionRot.y; - field_0x2f98 = 4; - return true; -} +#include "d/a/d_a_alink_bow.inc" -/* 800C30F0-800C3224 0BDA30 0134+00 1/0 0/0 0/0 .text procServiceWait__9daAlink_cFv */ -bool daAlink_c::procServiceWait() { - J3DFrameCtrl* ctrl = &mFrameCtrl1[0]; - if ((!checkNextAction(0) && !checkFrontWallTypeAction()) && - (checkEventRun() || checkGuardActionChange() || mCollisionRot.y != field_0x2fe6)) { - ctrl->setRate(FLOAT_LABEL(lit_6108)); - procWaitInit(); - } else { - if (ctrl->checkPass(lit_10040)) { - voiceStart(Z2SE_AL_V_RELAX_A); - } else if (ctrl->checkPass(lit_11673)) { - voiceStart(Z2SE_AL_V_RELAX_B); - } else if (ctrl->checkPass(lit_25684)) { - voiceStart(Z2SE_AL_V_RELAX_C); - } - } - return true; -} +#include "d/a/d_a_alink_boom.inc" -/* 800C3224-800C3338 0BDB64 0114+00 2/2 0/0 0/0 .text procTiredWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTiredWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_copyrod.inc" -/* 800C3338-800C33B8 0BDC78 0080+00 1/0 0/0 0/0 .text procTiredWait__9daAlink_cFv */ -bool daAlink_c::procTiredWait() { - daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; - if (!checkNextAction(0)) { - if (ctrl->checkAnmEnd()) { - setSingleAnimeBase(ANM_TIRED_WAIT); - } else if (ctrl->getAttribute() == 2) { - setTiredVoice(ctrl); - } - } - return true; -} +#include "d/a/d_a_alink_hvyboots.inc" -/* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text procWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_bomb.inc" -/* 800C3504-800C36CC 0BDE44 01C8+00 1/0 0/0 0/0 .text procWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800C36CC-800C3730 0BE00C 0064+00 3/3 0/0 0/0 .text procMoveInit__9daAlink_cFv */ -bool daAlink_c::procMoveInit() { - if (!commonProcInitNotSameProc(PROC_MOVE)) { - return false; - } - setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - setFootEffectProcType(3); - return true; -} - -/* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text procMove__9daAlink_cFv */ -// results of cLib_minMaxLimit are put in r4 instead of r3 -#ifdef NONMATCHING -bool daAlink_c::procMove() { - setFootEffectProcType(3); - if (!checkNextAction(0) && !checkFrontWallTypeAction()) { - if (mDemo.getDemoMode() == 2 && - mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) { - mNormalSpeed = field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate; - } - setBlendMoveAnime(-1.0f); - if (field_0x3174 != 8) { - field_0x30a0 = - cLib_minMaxLimit((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, - daAlinkHIO_basic_c0::m.mNeckMaxDown); - } - } - return true; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procMove() { - nofralloc -#include "asm/d/a/d_a_alink/procMove__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800C3810-800C3868 0BE150 0058+00 1/1 0/0 0/0 .text procAtnMoveInit__9daAlink_cFv */ -bool daAlink_c::procAtnMoveInit() { - if (!commonProcInitNotSameProc(PROC_ATN_MOVE)) { - return false; - } - setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - return true; -} - -/* 800C3868-800C38CC 0BE1A8 0064+00 1/0 0/0 0/0 .text procAtnMove__9daAlink_cFv */ -bool daAlink_c::procAtnMove() { - if (!checkNextAction(0)) { - if (field_0x2f98 != 0 || !checkFrontWallTypeAction()) { - setBlendAtnMoveAnime(lit_6041); - } - } - return true; -} - -/* 800C38CC-800C397C 0BE20C 00B0+00 4/4 0/0 0/0 .text procAtnActorWaitInit__9daAlink_cFv - */ -bool daAlink_c::procAtnActorWaitInit() { - if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_WAIT)) { - return false; - } - - if (mTargetedActor != NULL) { - fopAcM_searchActorAngleY(this, mTargetedActor); - } - mNormalSpeed = FLOAT_LABEL(lit_6108); - if (field_0x2f98 != 2) { - field_0x2f98 = 3; - } - - if (checkAtnWaitAnime()) { - setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - } else { - setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - } - - return true; -} - -/* 800C397C-800C39EC 0BE2BC 0070+00 1/0 0/0 0/0 .text procAtnActorWait__9daAlink_cFv */ -bool daAlink_c::procAtnActorWait() { - if (!checkNextAction(0)) { - if (checkAtnWaitAnime()) { - setBlendAtnMoveAnime(lit_6041); - } else { - setBlendMoveAnime(lit_6041); - } - checkSwordTwirlAction(); - } - return true; -} - -/* 800C39EC-800C3A44 0BE32C 0058+00 3/3 0/0 0/0 .text procAtnActorMoveInit__9daAlink_cFv - */ -bool daAlink_c::procAtnActorMoveInit() { - if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_MOVE)) { - return false; - } - setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - return true; -} - -/* 800C3A44-800C3A94 0BE384 0050+00 1/0 0/0 0/0 .text procAtnActorMove__9daAlink_cFv */ -bool daAlink_c::procAtnActorMove() { - if (!checkNextAction(0)) { - setBlendAtnMoveAnime(lit_6041); - checkSwordTwirlAction(); - } - return 1; -} - -/* 800C3A94-800C3B1C 0BE3D4 0088+00 2/2 0/0 0/0 .text procWaitTurnInit__9daAlink_cFv */ -bool daAlink_c::procWaitTurnInit() { - if (!commonProcInitNotSameProc(PROC_WAIT_TURN)) { - return false; - } - - setSingleAnimeBaseSpeed(ANM_WAIT_TURN, daAlinkHIO_basic_c0::m.mWaitTurnSpeed, - daAlinkHIO_basic_c0::m.mAnmBlendFactor); - if (checkEventRun()) { - mNormalSpeed = FLOAT_LABEL(lit_6108); - } - field_0x300e = field_0x2fe2; - mCurrent.mAngle.y = mCollisionRot.y; - return true; -} - -/* 800C3B1C-800C3C3C 0BE45C 0120+00 1/0 0/0 0/0 .text procWaitTurn__9daAlink_cFv */ -BOOL daAlink_c::procWaitTurn() { - cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); - if (checkGroundSpecialMode()) { - return true; - } else { - if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { - return procFloorDownReboundInit(); - } else { - s16 angle = cLib_addCalcAngleS(&mCollisionRot.y, field_0x300e, 30, 0x3CDF, 8000); - mCurrent.mAngle.y = mCollisionRot.y; - if (checkNextActionFromButton()) { - return true; - } else { - if (angle == 0) { - if (checkEventRun()) { - if (mDemo.getDemoMode() == 5) { - dComIfGp_evmng_cutEnd(field_0x3184); - } else if (!checkNextAction(0)) { - checkWaitAction(); - } - } else { - checkNextAction(0); - } - } - } - } - } - return true; -} - -/* 800C3C3C-800C3D38 0BE57C 00FC+00 2/2 0/0 0/0 .text procMoveTurnInit__9daAlink_cFi */ -bool daAlink_c::procMoveTurnInit(int param_0) { - if (!commonProcInitNotSameProc(PROC_MOVE_TURN)) { - return false; - } - - setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - dComIfGp_setPlayerStatus0(0, 0x800); - - if (param_0 != 0) { - field_0x300e = (daAlinkHIO_move_c0::m.mMaxTurnAngle << 2) + 19030; - field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; - field_0x300a = 2; - mCurrent.mAngle.y = field_0x2fe2; - mNormalSpeed *= lit_5943; - } else { - field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; - field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; - field_0x300a = 3; - } - field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; - field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; - return true; -} - -/* 800C3D38-800C3DA0 0BE678 0068+00 1/0 0/0 0/0 .text procMoveTurn__9daAlink_cFv */ -bool daAlink_c::procMoveTurn() { - setSpeedAndAngleNormal(); - cLib_addCalcAngleS(&mCollisionRot.y, mCurrent.mAngle.y, field_0x300a, field_0x300e, - field_0x3010); - - if (!checkNextAction(0)) { - setBlendMoveAnime(lit_6041); - } - return true; -} - -/* 800C3DA0-800C3F60 0BE6E0 01C0+00 2/2 0/0 0/0 .text procSideStepInit__9daAlink_cFi */ -bool daAlink_c::procSideStepInit(int jump_type) { - if (jump_type == 1 && !checkHeavyStateOn(1, 1) && - (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) { - return procBackJumpInit(0); - } else { - commonProcInit(PROC_SIDESTEP); - field_0x2f98 = jump_type; - - if (field_0x2f98 == 1) { - mCurrent.mAngle.y = mCollisionRot.y + 0x8000; - setSingleAnimeParam(ANM_BACK_JUMP, &daAlinkHIO_sideStep_c0::m.mBackJumpAnm); - mNormalSpeed = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedH; - mSpeed.y = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedV; - field_0x300a = 0; - } else { - daAlink_ANM anm_id; - if (field_0x2f98 == 2) { - anm_id = ANM_SIDE_STEP_LEFT; - mCurrent.mAngle.y = mCollisionRot.y + 0x4000; - } else { - anm_id = ANM_SIDE_STEP_RIGHT; - mCurrent.mAngle.y = mCollisionRot.y - 0x4000; - } - setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideJumpAnm); - mNormalSpeed = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedH; - mSpeed.y = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedV; - field_0x300a = 1; - } - if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { - mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; - mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; - } - voiceStart(Z2SE_AL_V_JUMP_S); - mCommonCounter = 0; - field_0x300e = 0; - return 1; - } -} - -/* 800C3F60-800C40F0 0BE8A0 0190+00 1/0 0/0 0/0 .text procSideStep__9daAlink_cFv */ -bool daAlink_c::procSideStep() { - if (mTargetedActor != NULL && field_0x300a != 0) { - s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor); - cLib_addCalcAngleS(&mCollisionRot.y, actor_angle, 5, 0x5E8, 0x13C); - if (field_0x2f98 == 2) { - mCurrent.mAngle.y = mCollisionRot.y + 0x4000; - } else { - mCurrent.mAngle.y = mCollisionRot.y - 0x4000; - } - } - if (doTrigger() && field_0x300a != 0) { - mCommonCounter = 1; - } - - if (checkUpperItemActionFly()) { - return true; - } else if (mLinkAcch.ChkGroundHit() && field_0x300e != 0) { - if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { - return true; - } else { - return procSideStepLandInit(); - } - } else if (checkNoUpperAnime() && checkForceSwordSwing()) { - setCutDash(1, 0); - } else if (mDemo.getDemoMode() != 16 && - mCurrent.mPosition.y < mLastJumpPos.y - daAlinkHIO_sideStep_c0::m.mFallHeight) { - return procFallInit(2, daAlinkHIO_sideStep_c0::m.mFallInterpolation); - } - - field_0x300e = 1; - checkItemChangeFromButton(); - return true; -} - -/* 800C40F0-800C4278 0BEA30 0188+00 1/1 0/0 0/0 .text procSideStepLandInit__9daAlink_cFv - */ -bool daAlink_c::procSideStepLandInit() { - commonProcInit(PROC_SIDESTEP_LAND); - if (field_0x2f98 == 1) { - field_0x2f9d = 4; - setSingleAnimeParam(ANM_BACK_JUMP_LAND, &daAlinkHIO_sideStep_c0::m.mBackLandAnm); - field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.field_0x10; - field_0x2f98 = 2; - field_0x300a = 0; - field_0x2fb0 = 0; - field_0x2fcc = 10; - } else { - daAlink_ANM anm_id; - u16 uvar3; - if (field_0x2f98 == 2) { - anm_id = ANM_SIDE_STEP_LEFT_LAND; - uvar3 = 0x3F; - } else { - anm_id = ANM_SIDE_STEP_RIGHT_LAND; - uvar3 = 0x40; - } - setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideLandAnm); - field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.field_0x10; - field_0x300a = 1; - field_0x2fb0 = 8; - field_0x2fcc = 0; - if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) { - setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, lit_6041); - seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING); - } - } - field_0x2f9d = 4; - setFootEffectProcType(2); - i_onResetFlg1(0x30); - mNormalSpeed = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; - mCurrent.mAngle.y = mCollisionRot.y; - setStepLandVibration(); - return true; -} - -/* 800C4278-800C4378 0BEBB8 0100+00 1/0 0/0 0/0 .text procSideStepLand__9daAlink_cFv */ -bool daAlink_c::procSideStepLand() { - daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; - i_onEndResetFlg0(ERFLG0_UNK_8000000); - if (field_0x2fcc != 0) { - field_0x2fcc = 10; - } - - if (doTrigger() && field_0x300a != 0) { - mCommonCounter = 1; - } - - if (ctrl->checkAnmEnd()) { - if (mDemo.getDemoMode() == 16) { - dComIfGp_evmng_cutEnd(field_0x3184); - } else { - checkNextAction(0); - } - } else if (ctrl->getFrame() > field_0x3478) { - if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { - return true; - } - checkNextAction(1); - } - - return true; -} - -/* 800C4378-800C4514 0BECB8 019C+00 1/1 0/0 0/0 .text procSlideInit__9daAlink_cFs */ -bool daAlink_c::procSlideInit(s16 param_0) { - commonProcInit(PROC_SLIDE); - - field_0x814.SetWeight(255); - field_0x3090 = 8; - mCurrent.mAngle.y = param_0; - - if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == 0xD4) { - field_0x300e = 1; - } else { - field_0x300e = 0; - } - - if (cLib_distanceAngleS(param_0, mCollisionRot.y) < 0x3800 || field_0x300e != 0) { - field_0x3198 = 1; - setSingleAnimeParam(ANM_FORWARD_SLIDE, &daAlinkHIO_slide_c0::m.mForwardSlideAnm); - dComIfGp_setPlayerStatus1(0, 0x100); - onModeFlg(MODE_UNK_8000); - onModeFlg(MODE_UNK_2000000); - onModeFlg(MODE_UNK_20000000); - mNormalSpeed = FLOAT_LABEL(lit_6108); - field_0x2f9d = 4; - setUpperAnimeBaseMorf(0xCE, lit_6041); - i_onNoResetFlg1(0x10000000); - setFootEffectProcType(0); - } else { - field_0x3198 = 0; - setSingleAnimeParam(ANM_BACKWARD_SLIDE, &daAlinkHIO_slide_c0::m.mBackwardSlideAnm); - dComIfGp_setPlayerStatus1(0, 0x200); - field_0x2f9d = 0x60; - setFootEffectProcType(1); - } - field_0x594 = daAlinkHIO_slide_c0::m.mMaxSpeed; - field_0x33cc = FLOAT_LABEL(lit_6108); - mCommonCounter = 0; - field_0x3010 = 0; - return true; -} - -/* ############################################################################################## */ -/* 804532E0-804532E4 0018E0 0004+00 1/1 0/0 0/0 .sdata2 @73057 */ -SECTION_SDATA2 static f32 lit_73057 = -4096.0f; - -/* 800C4514-800C47AC 0BEE54 0298+00 1/0 0/0 0/0 .text procSlide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlide() { - nofralloc -#include "asm/d/a/d_a_alink/procSlide__9daAlink_cFv.s" -} -#pragma pop - -/* 800C47AC-800C4894 0BF0EC 00E8+00 1/1 0/0 0/0 .text procSlideLandInit__9daAlink_cFi */ -bool daAlink_c::procSlideLandInit(int param_0) { - commonProcInit(PROC_SLIDE_LAND); - - if (param_0 != 0) { - setSingleAnimeParam(ANM_BACKWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mForwardLandAnm); - field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.field_0x10; - field_0x3198 = 1; - field_0x2f99 = 4; - field_0x3588 = l_waitBaseAnime; - } else { - setSingleAnimeParam(ANM_FORWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mBackwardLandAnm); - field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.field_0x10; - field_0x3198 = 0; - } - field_0x814.SetWeight(255); - mNormalSpeed *= lit_5943; - return true; -} - -/* 800C4894-800C494C 0BF1D4 00B8+00 1/0 0/0 0/0 .text procSlideLand__9daAlink_cFv */ -bool daAlink_c::procSlideLand() { - daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; - - cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_7450); - if (field_0x3198 != 0) { - field_0x2f99 = 4; - } - - if (ctrl->checkAnmEnd()) { - mCurrent.mAngle.y = mCollisionRot.y; - checkNextAction(0); - } else { - if (ctrl->getFrame() > field_0x3478) { - s16 tmp_angle = mCurrent.mAngle.y; - mCurrent.mAngle.y = mCollisionRot.y; - if (!checkNextAction(1)) { - mCurrent.mAngle.y = tmp_angle; - } - } - } - return true; -} - -/* 800C494C-800C4B40 0BF28C 01F4+00 4/3 0/0 0/0 .text procFrontRollInit__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::procFrontRollInit() { - BOOL check = checkUpperGuardAnime(); - if (mProcID == PROC_FRONT_ROLL && mDemo.getDemoMode() == 0x28) { - return 0; - } else { - BOOL check = mProcID == PROC_DIVE_JUMP; - commonProcInit(PROC_FRONT_ROLL); - - f32 fvar1; - if (!check) { - fvar1 = daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04; - } else { - fvar1 = lit_7977; - } - setSingleAnime(ANM_FRONT_ROLL, daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04, fvar1, - daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x00, - daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x0c); - mNormalSpeed = - mSpeedF * daAlinkHIO_frontRoll_c0::m.mInitSpeed + daAlinkHIO_frontRoll_c0::m.mSpeedRate; - if (mNormalSpeed > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08) { - mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08; - } - if (mNormalSpeed < daAlinkHIO_frontRoll_c0::m.mMinSpeed) { - mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mMinSpeed; - } - - if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { - if (checkHeavyStateOn(1, 1)) { - mNormalSpeed *= mHeavySpeedMultiplier; - } - } else { - mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; - } - mCurrent.mAngle.y = mCollisionRot.y; - voiceStart(Z2SE_AL_V_BACKTEN); - mCommonCounter = 0; - setFootEffectProcType(0); - if (check) { - i_onNoResetFlg0(2); - } - if (i_checkEquipHeavyBoots()) { - field_0xFB8.SetAtType(0x200000); - field_0xFB8.SetAtHitMark(1); - field_0xFB8.SetAtSe(9); - field_0xFB8.SetAtAtp(2); - field_0xFB8.SetAtMtrl(0); - field_0xFB8.ResetAtHit(); - field_0xFB8.SetR(daAlinkHIO_frontRoll_c0::m.mBootsAttackRadius); - field_0xFB8.OnAtSetBit(); - } - return true; - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procFrontRollInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollInit__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800C4B40-800C4F14 0BF480 03D4+00 1/0 0/0 0/0 .text procFrontRoll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRoll() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRoll__9daAlink_cFv.s" -} -#pragma pop - -/* 800C4F14-800C4FFC 0BF854 00E8+00 1/1 0/0 0/0 .text procFrontRollCrashInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollCrashInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C4FFC-800C5160 0BF93C 0164+00 1/0 0/0 0/0 .text procFrontRollCrash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollCrash() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5160-800C5240 0BFAA0 00E0+00 3/3 0/0 0/0 .text procFrontRollSuccessInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollSuccessInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5240-800C5328 0BFB80 00E8+00 1/0 0/0 0/0 .text procFrontRollSuccess__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFrontRollSuccess() { - nofralloc -#include "asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5328-800C5484 0BFC68 015C+00 3/3 0/0 0/0 .text procSideRollInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procSideRollInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800C5484-800C5700 0BFDC4 027C+00 1/0 0/0 0/0 .text procSideRoll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSideRoll() { - nofralloc -#include "asm/d/a/d_a_alink/procSideRoll__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5700-800C57A4 0C0040 00A4+00 2/2 0/0 0/0 .text backJumpSpeedDec__9daAlink_cFv */ -void daAlink_c::backJumpSpeedDec() { - if (mLinkAcch.ChkGroundHit()) { - if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { - f32 jump_speed; - if (dBgS_CheckBWallPoly(mLinkAcch.m_gnd)) { - jump_speed = FLOAT_LABEL(lit_6108); - } else { - jump_speed = field_0x3478 * cM_scos(field_0x2ff0); - if (field_0x2ff0 > 0) { - jump_speed *= cM_scos(field_0x2ff0); - } - } - - if (mNormalSpeed > jump_speed) { - mNormalSpeed = jump_speed; - } - } - } -} - -/* 800C57A4-800C5964 0C00E4 01C0+00 6/6 0/0 0/0 .text procBackJumpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procBackJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800C5964-800C5A54 0C02A4 00F0+00 1/0 0/0 0/0 .text procBackJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJump() { - nofralloc -#include "asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5A54-800C5AF0 0C0394 009C+00 1/1 0/0 0/0 .text procBackJumpLandInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800C5AF0-800C5C28 0C0430 0138+00 1/0 0/0 0/0 .text procBackJumpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBackJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5C28-800C5CA4 0C0568 007C+00 1/1 0/0 0/0 .text procSlipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5CA4-800C5E68 0C05E4 01C4+00 1/0 0/0 0/0 .text procSlip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSlip() { - nofralloc -#include "asm/d/a/d_a_alink/procSlip__9daAlink_cFv.s" -} -#pragma pop - -/* 800C5E68-800C61EC 0C07A8 0384+00 4/4 0/0 0/0 .text procAutoJumpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAutoJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procAutoJumpInit__9daAlink_cFi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804532E4-804532E8 0018E4 0004+00 1/1 0/0 0/0 .sdata2 @73781 */ -SECTION_SDATA2 static f32 lit_73781 = 2.0f / 3.0f; - -/* 800C61EC-800C66DC 0C0B2C 04F0+00 1/0 0/0 0/0 .text procAutoJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procAutoJump() { - nofralloc -#include "asm/d/a/d_a_alink/procAutoJump__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804532E8-804532EC 0018E8 0004+00 1/1 0/0 0/0 .sdata2 @73790 */ -SECTION_SDATA2 static f32 lit_73790 = 92.0f; - -/* 800C66DC-800C6798 0C101C 00BC+00 1/1 0/0 0/0 .text procDiveJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDiveJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C6798-800C6850 0C10D8 00B8+00 1/0 0/0 0/0 .text procDiveJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDiveJump() { - nofralloc -#include "asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s" -} -#pragma pop - -/* 800C6850-800C692C 0C1190 00DC+00 1/1 0/0 0/0 .text procRollJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRollJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C692C-800C6A48 0C126C 011C+00 1/0 0/0 0/0 .text procRollJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRollJump() { - nofralloc -#include "asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s" -} -#pragma pop - -/* 800C6A48-800C6D20 0C1388 02D8+00 30/30 0/0 0/0 .text procFallInit__9daAlink_cFif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procFallInit(int param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procFallInit__9daAlink_cFif.s" -} -#pragma pop - -/* 800C6D20-800C6F18 0C1660 01F8+00 1/0 0/0 0/0 .text procFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFall() { - nofralloc -#include "asm/d/a/d_a_alink/procFall__9daAlink_cFv.s" -} -#pragma pop - -/* 800C6F18-800C6FE4 0C1858 00CC+00 6/6 0/0 0/0 .text procLandInit__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLandInit(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s" -} -#pragma pop - -/* 800C6FE4-800C70F8 0C1924 0114+00 1/0 0/0 0/0 .text procLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLand() { - nofralloc -#include "asm/d/a/d_a_alink/procLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800C70F8-800C72D4 0C1A38 01DC+00 3/3 0/0 0/0 .text procSmallJumpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSmallJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSmallJumpInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800C72D4-800C74D4 0C1C14 0200+00 1/0 0/0 0/0 .text procSmallJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSmallJump() { - nofralloc -#include "asm/d/a/d_a_alink/procSmallJump__9daAlink_cFv.s" -} -#pragma pop - -/* 800C74D4-800C755C 0C1E14 0088+00 1/1 0/0 0/0 .text procStepMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStepMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C755C-800C7690 0C1E9C 0134+00 1/0 0/0 0/0 .text procStepMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStepMove() { - nofralloc -#include "asm/d/a/d_a_alink/procStepMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800C7690-800C76F8 0C1FD0 0068+00 1/0 0/0 0/0 .text procCrouchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrouchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804532EC-804532F0 0018EC 0004+00 1/1 0/0 0/0 .sdata2 @74138 */ -SECTION_SDATA2 static f32 lit_74138 = -80.0f; - -/* 800C76F8-800C77F4 0C2038 00FC+00 1/0 0/0 0/0 .text procCrouch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrouch() { - nofralloc -#include "asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804255F8-80425604 052318 000C+00 0/1 0/0 0/0 .bss @4419 */ -#pragma push -#pragma force_active on -static u8 lit_4419[12]; -#pragma pop - -/* 80425604-80425610 052324 000C+00 0/1 0/0 0/0 .bss l_sumouBaseAnimeSp */ -#pragma push -#pragma force_active on -static u8 l_sumouBaseAnimeSp[12]; -#pragma pop - -/* 80425610-8042561C 052330 000C+00 0/1 0/0 0/0 .bss @4420 */ -#pragma push -#pragma force_active on -static u8 lit_4420[12]; -#pragma pop - -/* 8042561C-80425628 05233C 000C+00 37/39 0/0 0/0 .bss l_wolfBaseAnime */ -static Vec l_wolfBaseAnime; - -bool daMidna_c::checkMidnaRealBody() { - return dKy_darkworld_check() == 1 || dComIfGs_isTransformLV(3); -} - -/* 800C77F4-800C7C64 0C2134 0470+00 4/2 0/0 0/0 .text procCoMetamorphoseInit__9daAlink_cFv */ -// 1 missing instruction, lots of regalloc. maybe related -#ifdef NONMATCHING -bool daAlink_c::procCoMetamorphoseInit() { - int svar8 = 0; - - if (i_dComIfGp_getEvent().i_isOrderOK()) { - if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { - return 0; - } - mDemo.i_setSpecialDemoType(); - mDamageTimer = 0; - svar8 = 1; - } - - if (!commonProcInitNotSameProc(METAMORPHOSE)) { - return 1; - } - - field_0x3198 = svar8; - field_0x3008 = 0; - field_0x300e = 0; - field_0x3010 = 0; - field_0x347c = 1.0f; - mFallVoiceInit = 0; - - if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || - (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) { - field_0x300a = 1; - mSpeed.y = 0.0f; - mNormalSpeed = 0.0f; - if (i_checkWolf()) { - mCommonCounter = mCollisionRot.x; - } - } else { - deleteEquipItem(0, 1); - - if (i_checkEndResetFlg0(ERFLG0_UNK_2) && checkStageName("D_MN08")) { - field_0x3010 = 1; - } - field_0x300a = 0; - - if (i_checkWolf()) { - // Transform Wolf -> Human - setSingleAnimeWolfBase(ANM_TRANFORM_HUMAN); - field_0x3588 = l_wolfBaseAnime; - field_0x347c = 0.5f; - field_0x3480 = daAlinkHIO_basic_c0::m.mWolfLinkTransformSpeed; - mCommonCounter = mCollisionRot.x; - - daMidna_c* midna = getMidnaActor(); - if (i_checkMidnaRide() && midna->checkMidnaRealBody() && midna->checkDemoTypeNone()) { - midna->changeOriginalDemo(); - midna->changeDemoMode(15); - } - } else { - // Transform Human -> Wolf - if (mDemo.getDemoMode() == 0x39 && mDemo.getParam1() == 1) { - voiceStart(Z2SE_AL_V_TRANSFORM); - } - setSingleAnimeBase(ANM_TRANSFORM_WOLF); - setMetamorphoseModel(1); - field_0x3588 = l_waitBaseAnime; - field_0x3480 = daAlinkHIO_basic_c0::m.mLinkWolfTransformSpeed; - - cXyz pos(mCurrent.mPosition.x + (cM_ssin(mCollisionRot.y) * 100.0f), - mCurrent.mPosition.y + 300.0f, - mCurrent.mPosition.z + (cM_scos(mCollisionRot.y) * 100.0f)); - mLinkGndChk.SetPos(&pos); - - f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (gnd_cross != -1000000000.0f) { - pos.y = -1000000000.0f; - cXyz tmp_4c = mCurrent.mPosition; - cXyz tmp_58 = pos; - BOOL check = false; - for (int i = 0; i < 4; i++) { - if (i == 3) { - tmp_4c.y = gnd_cross + 5.0f; - } else { - tmp_4c.y = mCurrent.mPosition.y + field_0x18B0[i].GetWallH(); - } - tmp_58.y = tmp_4c.y; - - if (commonLineCheck(&tmp_4c, &tmp_58) && dBgS_CheckBWallPoly(mLinkLinChk)) { - if (dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { - check = true; - break; - } - } - } - - if (check) { - mCommonCounter = field_0x2ff0; - } else { - pos -= mCurrent.mPosition; - pos.atan2sY_XZ(); - mCommonCounter = svar8; - - if (cM_deg2s(70.0f) < abs(mCommonCounter)) { - mCommonCounter = field_0x2ff0; - } - } - } else { - mCommonCounter = 0; - } - } - mSpeed.y = 0.0f; - mNormalSpeed = 0.0f; - field_0x3012 = 0; - } - - field_0x3484 = mCurrent.mPosition.y; - return 1; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procCoMetamorphoseInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphoseInit__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* ############################################################################################## */ -/* 80392070-8039207C 01E6D0 000C+00 0/1 0/0 0/0 .rodata @74273 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_74273[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80392070, &lit_74273); -#pragma pop - -/* 804532F0-804532F4 0018F0 0004+00 1/1 0/0 0/0 .sdata2 @74385 */ -SECTION_SDATA2 static f32 lit_74385 = 1.0f / 26.0f; - -/* 804532F4-804532F8 0018F4 0004+00 1/1 0/0 0/0 .sdata2 @74386 */ -SECTION_SDATA2 static f32 lit_74386 = -64.0f; - -/* 804532F8-80453300 0018F8 0008+00 1/1 0/0 0/0 .sdata2 @74387 */ -SECTION_SDATA2 static f64 lit_74387 = 15.0; - -/* 80453300-80453308 001900 0008+00 1/1 0/0 0/0 .sdata2 @74388 */ -SECTION_SDATA2 static f64 lit_74388 = 49.0; - -/* 80453308-80453310 001908 0008+00 1/1 0/0 0/0 .sdata2 @74389 */ -SECTION_SDATA2 static f64 lit_74389 = 1.0; - -/* 80453310-80453318 001910 0008+00 1/1 0/0 0/0 .sdata2 @74390 */ -SECTION_SDATA2 static f64 lit_74390 = 1.0 / 14.0; - -/* 80453318-80453320 001918 0008+00 1/1 0/0 0/0 .sdata2 @74391 */ -SECTION_SDATA2 static f64 lit_74391 = -64.0; - -/* 80453320-80453328 001920 0008+00 1/1 0/0 0/0 .sdata2 @74392 */ -SECTION_SDATA2 static f64 lit_74392 = -15.0; - -/* 80453328-80453330 001928 0008+00 1/1 0/0 0/0 .sdata2 @74393 */ -SECTION_SDATA2 static f64 lit_74393 = 1.0 / 9.0; - -/* 80453330-80453334 001930 0004+00 1/1 0/0 0/0 .sdata2 @74394 */ -SECTION_SDATA2 static f32 lit_74394 = 49.0f; - -/* 80453334-80453338 001934 0004+00 1/1 0/0 0/0 .sdata2 @74395 */ -SECTION_SDATA2 static f32 lit_74395 = 1.0f / 36.0f; - -/* 800C7C64-800C82E8 0C25A4 0684+00 1/0 0/0 0/0 .text procCoMetamorphose__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphose() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphose__9daAlink_cFv.s" -} -#pragma pop - -/* 800C82E8-800C83A0 0C2C28 00B8+00 2/0 0/0 0/0 .text procCoMetamorphoseOnlyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphoseOnlyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C83A0-800C8460 0C2CE0 00C0+00 1/0 0/0 0/0 .text procCoMetamorphoseOnly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoMetamorphoseOnly() { - nofralloc -#include "asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s" -} -#pragma pop - -/* 800C8460-800C84D0 0C2DA0 0070+00 2/2 0/0 0/0 .text procFloorDownReboundInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::procFloorDownReboundInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800C84D0-800C854C 0C2E10 007C+00 1/0 0/0 0/0 .text procFloorDownRebound__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFloorDownRebound() { - nofralloc -#include "asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s" -} -#pragma pop - -/* 800C854C-800C85D8 0C2E8C 008C+00 1/1 0/0 0/0 .text - * procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800C85D8-800C8700 0C2F18 0128+00 1/0 0/0 0/0 .text procGoronRideWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoronRideWait() { - nofralloc -#include "asm/d/a/d_a_alink/procGoronRideWait__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8039207C-80392088 01E6DC 000C+00 0/1 0/0 0/0 .rodata @74748 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_74748[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x8039207C, &lit_74748); -#pragma pop - -/* 80392088-80392094 01E6E8 000C+00 0/1 0/0 0/0 .rodata localBoomCatchPos$74910 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const localBoomCatchPos[12] = { - 0x41, 0x95, 0x99, 0x9A, 0x43, 0x12, 0x4C, 0xCD, 0x42, 0x8A, 0x66, 0x66, -}; -COMPILER_STRIP_GATE(0x80392088, &localBoomCatchPos); -#pragma pop - -/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803925D1 = "Alink"; -SECTION_DEAD static char const* const stringBase_803925D7 = "kiko_yami"; -SECTION_DEAD static char const* const stringBase_803925E1 = "fire_insect"; -SECTION_DEAD static char const* const stringBase_803925ED = "MapToolCamera19"; -SECTION_DEAD static char const* const stringBase_803925FD = "yami_mog"; -SECTION_DEAD static char const* const stringBase_80392606 = "R_SP109"; -SECTION_DEAD static char const* const stringBase_8039260E = "MapToolCamera1"; -SECTION_DEAD static char const* const stringBase_8039261D = "MapToolCamera2"; -SECTION_DEAD static char const* const stringBase_8039262C = "MapToolCamera23"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_8039263C = "\0\0\0"; -#pragma pop - -/* 800C8700-800CAFA8 0C3040 28A8+00 1/1 0/0 0/0 .text execute__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::execute() { - nofralloc -#include "asm/d/a/d_a_alink/execute__9daAlink_cFv.s" -} -#pragma pop - -/* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text daAlink_Execute__FP9daAlink_c */ -static void daAlink_Execute(daAlink_c* pLinkPtr) { - pLinkPtr->execute(); -} - -/* 800CAFC8-800CB480 0C5908 04B8+00 2/2 0/0 0/0 .text setDrawHand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDrawHand() { - nofralloc -#include "asm/d/a/d_a_alink/setDrawHand__9daAlink_cFv.s" -} -#pragma pop - -/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */ -bool daAlink_c::checkSwordDraw() { - return ((i_checkSwordGet() && mSwordChangeWaitTimer == 0) && - !i_checkNoResetFlg2(FLG2_UNK_2080000)) && - (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); -} - -bool daPy_py_c::i_checkShieldGet() const { - return dComIfGs_getSelectEquipShield() != NO_ITEM; -} - -/* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text checkShieldDraw__9daAlink_cFv */ -bool daAlink_c::checkShieldDraw() { - return ((i_checkShieldGet() && mShieldChangeWaitTimer == 0) && - !i_checkNoResetFlg2(FLG2_UNK_4080000)) && - (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); -} - -/* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */ -bool daAlink_c::checkItemDraw() { - if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) { - if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() || - field_0x2e44.checkPassNum(15)) { - return true; - } - } - return false; -} - -/* 800CB694-800CBA38 0C5FD4 03A4+00 0/0 0/0 1/1 .text initShadowScaleLight__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initShadowScaleLight() { - nofralloc -#include "asm/d/a/d_a_alink/initShadowScaleLight__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80453338-8045333C 001938 0004+00 1/1 0/0 0/0 .sdata2 @75939 */ -SECTION_SDATA2 static f32 lit_75939 = 50000.0f; - -/* 800CBA38-800CBC18 0C6378 01E0+00 0/0 0/0 1/1 .text moveShadowScaleLight__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::moveShadowScaleLight() { - nofralloc -#include "asm/d/a/d_a_alink/moveShadowScaleLight__9daAlink_cFv.s" -} -#pragma pop - -/* 800CBC18-800CC25C 0C6558 0644+00 1/1 0/0 0/0 .text shadowDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::shadowDraw() { - nofralloc -#include "asm/d/a/d_a_alink/shadowDraw__9daAlink_cFv.s" -} -#pragma pop - -/* 800CC25C-800CC298 0C6B9C 003C+00 3/3 0/0 0/0 .text modelCalc__9daAlink_cFP8J3DModel */ -void daAlink_c::modelCalc(J3DModel* p_model) { - if (mClothesChangeWaitTimer == 0) { - p_model->calc(); - } -} - -/* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::basicModelDraw(J3DModel* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s" -} -#pragma pop - -/* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text modelDraw__9daAlink_cFP8J3DModeli - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::modelDraw(J3DModel* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8045333C-80453344 00193C 0008+00 1/1 0/0 0/0 .sdata2 notColor0$76211 */ -SECTION_SDATA2 static u8 notColor0[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, -}; - -/* 800CC364-800CC7DC 0C6CA4 0478+00 2/2 0/0 0/0 .text - * setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s" -} -#pragma pop - -/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ -void daAlink_c::initTevCustomColor() { - mTevStr.field_0x367 = 0; - mTevStr.mFogColor.r = 0; - mTevStr.mFogColor.g = 0; - mTevStr.mFogColor.b = 0; - mTevStr.field_0x360 = 0; - mTevStr.field_0x362 = 0; -} - -/* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::draw() { - nofralloc -#include "asm/d/a/d_a_alink/draw__9daAlink_cFv.s" -} -#pragma pop - -/* 800CD78C-800CD7AC 0C80CC 0020+00 1/0 0/0 0/0 .text daAlink_Draw__FP9daAlink_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_Draw(daAlink_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803B3580-803B3590 0106A0 0010+00 3/3 0/0 0/0 .data __vt__15daAlink_sight_c */ -SECTION_DATA extern void* __vt__15daAlink_sight_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__15daAlink_sight_cFv, - (void*)__dt__15daAlink_sight_cFv, -}; - -/* 803B3590-803B35A0 0106B0 0010+00 4/4 0/0 0/0 .data __vt__20daAlink_lockCursor_c */ -SECTION_DATA extern void* __vt__20daAlink_lockCursor_c[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)draw__20daAlink_lockCursor_cFv, - (void*)__dt__20daAlink_lockCursor_cFv, -}; - -/* 803B35A0-803B35B4 0106C0 0014+00 3/3 0/0 0/0 .data __vt__14daAlink_blur_c */ -SECTION_DATA extern void* __vt__14daAlink_blur_c[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)entry__9J3DPacketFP13J3DDrawBuffer, - (void*)draw__14daAlink_blur_cFv, - (void*)__dt__14daAlink_blur_cFv, -}; - -/* 803B35B4-803B35C8 0106D4 0014+00 3/3 0/0 0/0 .data __vt__29dAlink_bottleWaterPcallBack_c */ -SECTION_DATA extern void* __vt__29dAlink_bottleWaterPcallBack_c[5] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__29dAlink_bottleWaterPcallBack_cFv, - (void*)execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle, - (void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle, -}; - -/* 800CD7AC-800CE208 0C80EC 0A5C+00 1/1 0/0 0/0 .text __dt__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_c::~daAlink_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__9daAlink_cFv.s" -} -#pragma pop - -/* 800CE208-800CE294 0C8B48 008C+00 1/0 0/0 0/0 .text daAlink_Delete__FP9daAlink_c */ -// destructor issue -#ifdef NONMATCHING -static bool daAlink_Delete(daAlink_c* p_link) { - if (p_link->getClothesChangeWaitTimer() != 0) { - p_link->loadModelDVD(); - return false; - } else if (p_link->getShieldChangeWaitTimer() != 0) { - p_link->loadShieldModelDVD(); - return false; - } else { - delete p_link; - return true; - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm bool daAlink_Delete(daAlink_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_Delete__FP9daAlink_c.s" -} -#pragma pop -#endif - -/* 800CE294-800CE468 0C8BD4 01D4+00 1/1 0/0 0/0 .text checkNoSubjectModeCamera__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNoSubjectModeCamera() { - nofralloc -#include "asm/d/a/d_a_alink/checkNoSubjectModeCamera__9daAlink_cFv.s" -} -#pragma pop - -/* 800CE468-800CE628 0C8DA8 01C0+00 2/2 0/0 0/0 .text acceptSubjectModeChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::acceptSubjectModeChange() { - nofralloc -#include "asm/d/a/d_a_alink/acceptSubjectModeChange__9daAlink_cFv.s" -} -#pragma pop - -/* 800CE628-800CE728 0C8F68 0100+00 5/5 0/0 0/0 .text checkSubjectAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSubjectAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800CE728-800CE8A0 0C9068 0178+00 1/1 0/0 0/0 .text checkBodyAngleX__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBodyAngleX(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBodyAngleX__9daAlink_cFs.s" -} -#pragma pop - -/* 800CE8A0-800CEAF4 0C91E0 0254+00 15/15 0/0 0/0 .text setBodyAngleToCamera__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBodyAngleToCamera() { - nofralloc -#include "asm/d/a/d_a_alink/setBodyAngleToCamera__9daAlink_cFv.s" -} -#pragma pop - -/* 800CEAF4-800CEB58 0C9434 0064+00 9/9 0/0 0/0 .text setSubjectMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSubjectMode() { - nofralloc -#include "asm/d/a/d_a_alink/setSubjectMode__9daAlink_cFv.s" -} -#pragma pop - -/* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text subjectCancelTrigger__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::subjectCancelTrigger() { - nofralloc -#include "asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s" -} -#pragma pop - -/* 800CEBD8-800CECE4 0C9518 010C+00 9/9 0/0 0/0 .text checkSubjectEnd__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSubjectEnd(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSubjectEnd__9daAlink_cFi.s" -} -#pragma pop - -/* 800CECE4-800CED48 0C9624 0064+00 1/1 0/0 0/0 .text searchPeepObj__9daAlink_cFP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::searchPeepObj(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/searchPeepObj__9daAlink_cFP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800CED48-800CED84 0C9688 003C+00 1/1 0/0 0/0 .text daAlink_searchPeepObj__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchPeepObj(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800CED84-800CEE08 0C96C4 0084+00 2/2 0/0 0/0 .text procCoSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800CEE08-800CEF70 0C9748 0168+00 1/0 0/0 0/0 .text procCoSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 800CEF70-800CF018 0C98B0 00A8+00 1/1 0/0 0/0 .text procCoSwimSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800CF018-800CF100 0C9958 00E8+00 1/0 0/0 0/0 .text procCoSwimSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 800CF100-800CF1B8 0C9A40 00B8+00 1/1 0/0 0/0 .text procCoPeepSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPeepSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800CF1B8-800CF25C 0C9AF8 00A4+00 1/0 0/0 0/0 .text procCoPeepSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPeepSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 800CF25C-800CF270 0C9B9C 0014+00 1/0 0/0 0/0 .text checkBoardRide__9daAlink_cCFv */ -u32 daAlink_c::checkBoardRide() const { - return mRideStatus == 4; -} - -/* 800CF270-800CF284 0C9BB0 0014+00 1/0 0/0 0/0 .text checkCanoeRide__9daAlink_cCFv */ -u32 daAlink_c::checkCanoeRide() const { - return mRideStatus == 3; -} - -/* 800CF284-800CF298 0C9BC4 0014+00 1/0 0/0 0/0 .text checkHorseRide__9daAlink_cCFv */ -u32 daAlink_c::checkHorseRide() const { - return mRideStatus == 1; -} - -/* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daAlink_cFv */ -MtxP daAlink_c::getLeftItemMatrix() { - return field_0x0650->i_getAnmMtx(field_0x30c0); -} - -/* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text checkBoarRide__9daAlink_cCFv */ -u32 daAlink_c::checkBoarRide() const { - return mRideStatus == 2; -} - -/* 800CF2C8-800CF2DC 0C9C08 0014+00 1/0 0/0 0/0 .text checkSpinnerRide__9daAlink_cCFv */ -u32 daAlink_c::checkSpinnerRide() const { - return mRideStatus == 5; -} - -/* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daAlink_cFv */ -MtxP daAlink_c::getLeftHandMatrix() { - return field_0x0650->i_getAnmMtx(field_0x30b8); -} - -/* 800CF2F8-800CF314 0C9C38 001C+00 1/0 0/0 0/0 .text getRightHandMatrix__9daAlink_cFv */ -MtxP daAlink_c::getRightHandMatrix() { - return field_0x0650->i_getAnmMtx(field_0x30ba); -} - -/* 800CF314-800CF328 0C9C54 0014+00 1/0 0/0 0/0 .text - * onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c */ -void daAlink_c::onSceneChangeArea(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { - mExitID = exitID; - mExitDirection = exitDirection; - mpScnChg = (daScex_c*)scexAc; -} - -/* 800CF328-800CF344 0C9C68 001C+00 1/0 0/0 0/0 .text getRightItemMatrix__9daAlink_cFv */ -MtxP daAlink_c::getRightItemMatrix() { - return field_0x0650->i_getAnmMtx(field_0x30c2); -} - -/* 800CF344-800CF380 0C9C84 003C+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daAlink_cFv */ -BOOL daAlink_c::checkPlayerNoDraw() { - return dComIfGp_checkCameraAttentionStatus(field_0x317c, 2) || - i_checkNoResetFlg0(PLAYER_NO_DRAW); -} - -/* 800CF380-800CFC3C 0C9CC0 08BC+00 1/1 0/0 0/0 .text __ct__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_c::daAlink_c() { - nofralloc -#include "asm/d/a/d_a_alink/__ct__9daAlink_cFv.s" -} -#pragma pop - -/* 800CFC3C-800CFC78 0CA57C 003C+00 2/2 0/0 0/0 .text __dt__Q29daAlink_c14firePointEff_cFv */ -daAlink_c::firePointEff_c::~firePointEff_c() {} - -/* 800CFC78-800CFC7C 0CA5B8 0004+00 1/1 0/0 0/0 .text __ct__Q29daAlink_c14firePointEff_cFv */ -daAlink_c::firePointEff_c::firePointEff_c() { - /* empty function */ -} - -/* 800CFC7C-800CFCB8 0CA5BC 003C+00 0/0 2/2 0/0 .text __dt__15LIGHT_INFLUENCEFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void __dt__15LIGHT_INFLUENCEFv() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s" -} -#pragma pop - -/* 800CFCB8-800CFCF4 0CA5F8 003C+00 2/2 0/0 0/0 .text __dt__18daAlink_footData_cFv */ -daAlink_footData_c::~daAlink_footData_c() {} - -/* 800CFCF4-800CFCF8 0CA634 0004+00 1/1 0/0 0/0 .text __ct__18daAlink_footData_cFv */ -daAlink_footData_c::daAlink_footData_c() { - /* empty function */ -} - -/* 800CFCF8-800CFD58 0CA638 0060+00 1/0 0/0 0/0 .text __dt__29dAlink_bottleWaterPcallBack_cFv */ -dAlink_bottleWaterPcallBack_c::~dAlink_bottleWaterPcallBack_c() {} - -/* 800CFD58-800CFDF4 0CA698 009C+00 1/0 0/0 0/0 .text __dt__14daAlink_blur_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_blur_c::~daAlink_blur_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__14daAlink_blur_cFv.s" -} -#pragma pop - -/* 800CFDF4-800CFE68 0CA734 0074+00 1/0 0/0 0/0 .text __dt__15daAlink_sight_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_sight_c::~daAlink_sight_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__15daAlink_sight_cFv.s" -} -#pragma pop - -/* 800CFE68-800CFEB0 0CA7A8 0048+00 1/0 0/0 0/0 .text __dt__20daAlink_lockCursor_cFv */ -daAlink_lockCursor_c::~daAlink_lockCursor_c() {} - -/* 800CFEB0-800CFEC4 0CA7F0 0014+00 1/1 0/0 0/0 .text checkRideOn__9daAlink_cCFv */ -BOOL daAlink_c::checkRideOn() const { - return mRideStatus != 0; -} - -/* 800CFEC4-800CFEF4 0CA804 0030+00 1/1 0/0 0/0 .text dComIfGp_att_getCatghTarget__Fv */ -#ifdef NONMATCHING -static s32 dComIfGp_att_getCatghTarget() { - return dComIfGp_getAttention().getCatghTarget().getCatghTarget(); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_att_getCatghTarget() { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_att_getCatghTarget__Fv.s" -} -#pragma pop -#endif - -/* 800CFEF4-800CFF2C 0CA834 0038+00 1/1 0/0 0/0 .text mDoAud_setLinkHp__Fll */ -static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { - if (Z2GetLink() != NULL) { - Z2GetLink()->setLinkHp(param_0, param_1); - } -} - -/* 800CFF2C-800CFF3C 0CA86C 0010+00 1/1 0/0 0/0 .text dComIfGs_getLife__Fv */ -static u16 dComIfGs_getLife() { - return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); -} - -/* 800CFF3C-800CFF4C 0CA87C 0010+00 1/1 0/0 0/0 .text dComIfGp_getRStatus__Fv */ -static u8 dComIfGp_getRStatus() { - return g_dComIfG_gameInfo.play.getRStatus(); -} - -/* 800CFF4C-800CFFA4 0CA88C 0058+00 1/1 0/0 0/0 .text checkAttentionLock__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkAttentionLock() { - nofralloc -#include "asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s" -} -#pragma pop - -/* 800CFFA4-800CFFC0 0CA8E4 001C+00 1/1 0/0 0/0 .text dComIfGp_setItemLifeCount__FfUc */ -void dComIfGp_setItemLifeCount(f32 amount, u8 type) { - g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); -} - -/* 800CFFC0-800CFFE0 0CA900 0020+00 1/1 0/0 0/0 .text cMtx_multVec__FPA4_CfPC3VecP3Vec */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/cMtx_multVec__FPA4_CfPC3VecP3Vec.s" -} -#pragma pop - -/* 800CFFE0-800CFFF4 0CA920 0014+00 1/1 0/0 0/0 .text getAnmMtx__8J3DModelFi */ -MtxP J3DModel::getAnmMtx(int i) { - return mMtxBuffer->getAnmMtx(i); -} - -/* 800CFFF4-800D0020 0CA934 002C+00 1/1 0/0 0/0 .text setBaseTRMtx__8J3DModelFPA4_f */ -void J3DModel::setBaseTRMtx(MtxP matrix) { - PSMTXCopy(matrix, mBaseTransformMtx); -} - -/* 800D0020-800D0048 0CA960 0028+00 1/1 0/0 0/0 .text checkFmChainGrabAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkFmChainGrabAnime() const { - return checkUpperAnime(ANM_HUMAN_CHAIN_GRAB) || checkUpperAnime(ANM_WOLF_CHAIN_GRAB); -} - -/* 800D0048-800D005C 0CA988 0014+00 1/1 0/0 0/0 .text checkSmallUpperGuardAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkSmallUpperGuardAnime() const { - return checkUpperAnime(ANM_SMALL_GUARD); -} - -/* 800D005C-800D008C 0CA99C 0030+00 1/1 0/0 0/0 .text dComIfGp_evmng_startCheck__FPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dComIfGp_evmng_startCheck(char const* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/dComIfGp_evmng_startCheck__FPCc.s" -} -#pragma pop - -/* 800D008C-800D00BC 0CA9CC 0030+00 1/1 0/0 0/0 .text mDoAud_setLinkGroupInfo__FUc */ -static void mDoAud_setLinkGroupInfo(u8 param_0) { - if (Z2GetLink() != NULL) { - Z2GetLink()->setLinkGroupInfo(param_0); - } -} - -/* 800D00BC-800D00D0 0CA9FC 0014+00 1/1 0/0 0/0 .text getAnm__25mDoExt_MtxCalcAnmBlendTblFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void mDoExt_MtxCalcAnmBlendTbl::getAnm(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getAnm__25mDoExt_MtxCalcAnmBlendTblFi.s" -} -#pragma pop - -/* 800D00D0-800D00DC 0CAA10 000C+00 1/1 0/0 0/0 .text ChkRoofHit__9dBgS_AcchCFv */ -bool dBgS_Acch::ChkRoofHit() const { - return m_flags & ROOF_HIT; -} - -/* 800D00DC-800D00EC 0CAA1C 0010+00 1/1 0/0 0/0 .text ClrGroundHit__9dBgS_AcchFv */ -void dBgS_Acch::ClrGroundHit() { - m_flags &= ~GROUND_HIT; -} - -/* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ -BOOL daAlink_c::checkReinRide() const { - return mRideStatus == 1 || mRideStatus == 2; -} - -/* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfEnemyThrowAnime() const { - return checkUpperAnime(ANM_WOLF_ENEMY_THROW_LEFT) || - checkUpperAnime(ANM_WOLF_ENEMY_THROW_RIGHT); -} - -/* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv - */ -u16 daAlink_c::checkSpecialDemoMode() const { - return mDemo.getDemoType() == 5; -} - -/* 800D014C-800D0164 0CAA8C 0018+00 1/1 0/0 0/0 .text setMidnaTalkStatus__9daAlink_cFUc - */ -void daAlink_c::setMidnaTalkStatus(u8 status) { - dComIfGp_setZStatus(status, 0); -} - -/* 800D0164-800D0180 0CAAA4 001C+00 1/1 0/0 0/0 .text set3DStatus__9daAlink_cFUcUc */ -void daAlink_c::set3DStatus(u8 status, u8 direction) { - dComIfGp_set3DStatus(status, direction, 0); -} - -/* 800D0180-800D018C 0CAAC0 000C+00 1/1 0/0 0/0 .text offSetFlg__16daAlink_matAnm_cFv */ -void daAlink_matAnm_c::offSetFlg() { - mSetFlag = 0; -} - -/* 800D018C-800D0198 0CAACC 000C+00 1/1 0/0 0/0 .text checkModeFlg__9daAlink_cCFUl */ -u32 daAlink_c::checkModeFlg(u32 pFlag) const { - return mModeFlg & pFlag; -} - -/* 800D0198-800D01A0 0CAAD8 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getShieldChangeWaitTimer() const { - return mShieldChangeWaitTimer; -} - -/* 800D01A0-800D01A8 0CAAE0 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getClothesChangeWaitTimer() const { - return mClothesChangeWaitTimer; -} - -/* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ -u32 daPy_py_c::getLastSceneMode() { - return dComIfGs_getLastSceneMode() & 0xF; -} - -BOOL daAlink_c::checkHorseStart() { - return checkHorseStart(getLastSceneMode(), getStartMode()); -} - -/* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv - */ -BOOL daAlink_c::checkCutTurnCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter == 0; -} - -/* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ -bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { - return checkAcceptWarp(); -} - -/* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */ -fopAc_ac_c* daAlink_c::getSpinnerActor() { - fopAc_ac_c* spinnerActor; - - if (!checkSpinnerRide()) { - spinnerActor = NULL; - } else { - spinnerActor = mRideActor.getActor(); - } - return spinnerActor; -} - -/* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */ -s16 daAlink_c::getSumouCounter() const { - return mCommonCounter; -} - -/* 800D027C-800D0284 0CABBC 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daAlink_cCFv - */ -s16 daAlink_c::checkSumouWithstand() const { - return field_0x300e; -} - -/* 800D0284-800D0290 0CABC4 000C+00 1/0 0/0 0/0 .text setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs - */ -void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { - mMidnaMsgNum = pMsgNum; - static_cast(mMidnaMsg) = param_0; -} - -/* 800D0290-800D029C 0CABD0 000C+00 1/0 0/0 0/0 .text getModelMtx__9daAlink_cFv */ -MtxP daAlink_c::getModelMtx() { - return field_0x0650->getBaseTRMtx(); -} - -/* 800D029C-800D02A4 0CABDC 0008+00 1/0 0/0 0/0 .text getInvMtx__9daAlink_cFv */ -MtxP daAlink_c::getInvMtx() { - return mInvMtx; -} - -/* 800D02A4-800D02B8 0CABE4 0014+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daAlink_cFv */ -MtxP daAlink_c::getLinkBackBone1Matrix() { - return field_0x0650->i_getAnmMtx(1); -} - -/* 800D02B8-800D02CC 0CABF8 0014+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daAlink_cFv */ -MtxP daAlink_c::getWolfMouthMatrix() { - return field_0x0650->i_getAnmMtx(13); -} - -/* 800D02CC-800D02E0 0CAC0C 0014+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daAlink_cFv */ -MtxP daAlink_c::getWolfBackbone2Matrix() { - return field_0x0650->i_getAnmMtx(2); -} - -/* 800D02E0-800D0334 0CAC20 0054+00 1/0 0/0 0/0 .text getBottleMtx__9daAlink_cFv */ -MtxP daAlink_c::getBottleMtx() { - if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) { - return mHeldItemModel->getBaseTRMtx(); - } - - return NULL; -} - -/* 800D0334-800D0350 0CAC74 001C+00 1/0 0/0 0/0 .text getHeadMtx__9daAlink_cFv */ -MtxP daAlink_c::getHeadMtx() { - return field_0x0650->i_getAnmMtx(field_0x30b4); -} - -/* 800D0350-800D0358 0CAC90 0008+00 1/0 0/0 0/0 .text getGroundY__9daAlink_cFv */ -f32 daAlink_c::getGroundY() { - return mLinkAcch.GetGroundH(); -} - -/* 800D0358-800D0360 0CAC98 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daAlink_cCFv */ -f32 daAlink_c::getBaseAnimeFrameRate() const { - return mFrameCtrl1[0].getRate(); -} - -/* 800D0360-800D0368 0CACA0 0008+00 1/0 0/0 0/0 .text getAtnActorID__9daAlink_cCFv */ -s32 daAlink_c::getAtnActorID() const { - return mAtnActorID; -} - -/* 800D0368-800D0370 0CACA8 0008+00 1/0 0/0 0/0 .text getItemID__9daAlink_cCFv */ -s32 daAlink_c::getItemID() const { - return mItemActor.getID(); -} - -/* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ -s32 daAlink_c::getGrabActorID() const { - if (mEquipItem == 0x102) { - return mItemActor.getID(); - } else { - return mGrabItemActor.getID(); - } -} - -/* 800D038C-800D03B4 0CACCC 0028+00 1/0 0/0 0/0 .text setForcePutPos__9daAlink_cFRC4cXyz - */ -void daAlink_c::setForcePutPos(cXyz const& pPutPos) { - mForcePutPos = pPutPos; - i_onEndResetFlg1(UNK_FORCE_PUT_POS); -} - -/* 800D03B4-800D03C8 0CACF4 0014+00 1/0 0/0 0/0 .text checkPlayerFly__9daAlink_cCFv */ -u32 daAlink_c::checkPlayerFly() const { - return i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | - MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP); -} - -/* 800D03C8-800D03DC 0CAD08 0014+00 1/0 0/0 0/0 .text checkFrontRoll__9daAlink_cCFv */ -BOOL daAlink_c::checkFrontRoll() const { - return mProcID == PROC_FRONT_ROLL; -} - -/* 800D03DC-800D03F0 0CAD1C 0014+00 1/0 0/0 0/0 .text checkWolfDash__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDash() const { - return mProcID == PROC_WOLF_DASH; -} - -/* 800D03F0-800D0414 0CAD30 0024+00 1/0 0/0 0/0 .text checkAutoJump__9daAlink_cCFv */ -BOOL daAlink_c::checkAutoJump() const { - return mProcID == PROC_AUTO_JUMP || mProcID == PROC_WOLF_AUTO_JUMP; -} - -/* 800D0414-800D0444 0CAD54 0030+00 1/0 0/0 0/0 .text checkSideStep__9daAlink_cCFv */ -bool daAlink_c::checkSideStep() const { - return (mProcID == PROC_SIDESTEP || mProcID == PROC_WOLF_SIDESTEP) && field_0x300a != 0; -} - -/* 800D0444-800D0468 0CAD84 0024+00 1/0 0/0 0/0 .text checkWolfTriggerJump__9daAlink_cCFv - */ -bool daAlink_c::checkWolfTriggerJump() const { - return mProcID == PROC_WOLF_SIDESTEP || mProcID == PROC_WOLF_JUMP_ATTACK; -} - -/* 800D0468-800D047C 0CADA8 0014+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daAlink_cCFv - */ -BOOL daAlink_c::checkGuardBreakMode() const { - return mProcID == PROC_GUARD_BREAK; -} - -/* 800D047C-800D04A4 0CADBC 0028+00 1/0 0/0 0/0 .text checkLv3Slide__9daAlink_cCFv */ -bool daAlink_c::checkLv3Slide() const { - return mProcID == PROC_SLIDE && field_0x300e != 0; -} - -/* 800D04A4-800D04B8 0CADE4 0014+00 1/0 0/0 0/0 .text checkWolfHowlDemoMode__9daAlink_cCFv */ -bool daAlink_c::checkWolfHowlDemoMode() const { - return mProcID == PROC_WOLF_HOWL_DEMO; -} - -/* 800D04B8-800D04CC 0CADF8 0014+00 1/0 0/0 0/0 .text checkElecDamage__9daAlink_cCFv */ -BOOL daAlink_c::checkElecDamage() const { - return mProcID == PROC_ELEC_DAMAGE; -} - -/* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */ -BOOL daAlink_c::checkEmptyBottleSwing() const { - return mEquipItem == EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; -} - -/* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv - */ -BOOL daAlink_c::checkBottleSwingMode() const { - return mProcID == PROC_BOTTLE_SWING; -} - -/* 800D0508-800D051C 0CAE48 0014+00 1/0 0/0 0/0 .text checkHawkWait__9daAlink_cCFv */ -BOOL daAlink_c::checkHawkWait() const { - return mProcID == PROC_HAWK_SUBJECT; -} - -/* 800D051C-800D0544 0CAE5C 0028+00 1/0 0/0 0/0 .text checkGoatThrow__9daAlink_cCFv */ -BOOL daAlink_c::checkGoatThrow() const { - return mProcID == PROC_GOAT_CATCH && mCommonCounter != 0; -} - -/* 800D0544-800D0570 0CAE84 002C+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daAlink_cCFv - */ -BOOL daAlink_c::checkGoatThrowAfter() const { - return mProcID == PROC_GOAT_CATCH && field_0x3478 > FLOAT_LABEL(lit_6108); -} - -/* 800D0570-800D0598 0CAEB0 0028+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daAlink_cCFv - */ -BOOL daAlink_c::checkWolfTagLockJump() const { - return mProcID == PROC_WOLF_TAG_JUMP && field_0x3198 == 0; -} - -/* 800D0598-800D05AC 0CAED8 0014+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfTagLockJumpLand() const { - return mProcID == PROC_WOLF_TAG_JUMP_LAND; -} - -/* 800D05AC-800D05C0 0CAEEC 0014+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfRopeHang() const { - return mProcID == PROC_WOLF_ROPE_HANG; -} - -/* 800D05C0-800D05D4 0CAF00 0014+00 1/0 0/0 0/0 .text checkRollJump__9daAlink_cCFv */ -BOOL daAlink_c::checkRollJump() const { - return mProcID == PROC_ROLL_JUMP; -} - -/* 800D05D4-800D05E8 0CAF14 0014+00 1/0 0/0 0/0 .text checkGoronRideWait__9daAlink_cCFv - */ -BOOL daAlink_c::checkGoronRideWait() const { - return mProcID == PROC_GORON_RIDE_WAIT; -} - -/* 800D05E8-800D05FC 0CAF28 0014+00 1/0 0/0 0/0 .text checkWolfChain__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfChain() const { - return mProcID == PROC_WOLF_CHAIN_WAIT; -} - -/* 800D05FC-800D0610 0CAF3C 0014+00 1/0 0/0 0/0 .text checkWolfWait__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfWait() const { - return mProcID == PROC_WOLF_WAIT; -} - -/* 800D0610-800D0624 0CAF50 0014+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daAlink_cCFv - */ -BOOL daAlink_c::checkWolfJumpAttack() const { - return mProcID == PROC_WOLF_JUMP_ATTACK; -} - -/* 800D0624-800D0638 0CAF64 0014+00 1/0 0/0 0/0 .text checkWolfRSit__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfRSit() const { - return mProcID == PROC_WOLF_SIT; -} - -/* 800D0638-800D0660 0CAF78 0028+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daAlink_cCFv - */ -BOOL daAlink_c::checkBottleDrinkEnd() const { - return mProcID == PROC_BOTTLE_DRINK && field_0x300e != 0; -} - -/* 800D0660-800D0674 0CAFA0 0014+00 1/0 0/0 0/0 .text checkWolfDig__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDig() const { - return mProcID == PROC_WOLF_DIG; -} - -/* 800D0674-800D0688 0CAFB4 0014+00 1/0 0/0 0/0 .text checkCutCharge__9daAlink_cCFv */ -BOOL daAlink_c::checkCutCharge() const { - return mProcID == PROC_CUT_TURN_MOVE; -} - -/* 800D0688-800D06B0 0CAFC8 0028+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daAlink_cCFv */ -BOOL daAlink_c::checkCutLargeJumpCharge() const { - return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter != 0; -} - -/* 800D06B0-800D06D8 0CAFF0 0028+00 1/0 0/0 0/0 .text checkComboCutTurn__9daAlink_cCFv */ -BOOL daAlink_c::checkComboCutTurn() const { - return mProcID == PROC_CUT_TURN && mComboCutCount != 0; -} - -/* 800D06D8-800D0704 0CB018 002C+00 1/0 0/0 0/0 .text checkClimbMove__9daAlink_cCFv */ -BOOL daAlink_c::checkClimbMove() const { - return mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_LADDER_MOVE || - mProcID == PROC_CLIMB_MOVE_SIDE; -} - -/* 800D0704-800D0718 0CB044 0014+00 1/0 0/0 0/0 .text checkGrassWhistle__9daAlink_cCFv */ -BOOL daAlink_c::checkGrassWhistle() const { - return mProcID == PROC_GRASS_WHISTLE_WAIT; -} - -/* 800D0718-800D072C 0CB058 0014+00 1/0 0/0 0/0 .text checkBoarRun__9daAlink_cCFv */ -BOOL daAlink_c::checkBoarRun() const { - return mProcID == PROC_BOAR_RUN; -} - -/* 800D072C-800D0794 0CB06C 0068+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daAlink_cCFv */ -BOOL daAlink_c::checkHorseRideNotReady() const { - return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF; -} - -/* 800D0794-800D079C 0CB0D4 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daAlink_cCFv - */ -f32 daAlink_c::getSearchBallScale() const { - return mSearchBallScale; -} - -/* 800D079C-800D07A4 0CB0DC 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daAlink_cFv */ -s16 daAlink_c::checkFastShotTime() { - return mFastShotTime; -} - -/* 800D07A4-800D07D4 0CB0E4 0030+00 1/0 0/0 0/0 .text checkCutJumpCancelTurn__9daAlink_cCFv */ -BOOL daAlink_c::checkCutJumpCancelTurn() const { - return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2; -} - -/* 800D07D4-800D07FC 0CB114 0028+00 1/0 0/0 0/0 .text - * checkSingleBoarBattleSecondBowReady__9daAlink_cCFv */ -BOOL daAlink_c::checkSingleBoarBattleSecondBowReady() const { - return mProcID == PROC_HORSE_BOW_SUBJECT && mCommonCounter != 0; -} - -/* 800D07FC-800D0818 0CB13C 001C+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daAlink_cFv */ -void daAlink_c::cancelDungeonWarpReadyNeck() { - if (mProcID != PROC_DUNGEON_WARP_READY) { - return; - } - offModeFlg(MODE_UNK_100); -} - -/* 800D0818-800D0830 0CB158 0018+00 1/0 0/0 0/0 .text - * onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c */ -void daAlink_c::onSceneChangeAreaJump(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { - mExitID = exitID | 0x8000; - mExitDirection = exitDirection; - mpScnChg = (daScex_c*)scexAc; -} - -/* 800D0830-800D084C 0CB170 001C+00 1/0 0/0 0/0 .text onSceneChangeDead__9daAlink_cFUci - */ -void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { - if (mProcID != PROC_DEAD) { - return; - } - field_0x3012 = param_0; - field_0x3198 = param_1; -} - -/* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */ -bool daAlink_c::checkNoEquipItem() const { - return mEquipItem == NO_ITEM; -} - -/* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv - */ -s16 daAlink_c::getBoardCutTurnOffsetAngleY() const { - if (mProcID == PROC_BOARD_CUT_TURN) { - return field_0x3012; - } - return 0; -} - -/* 800D087C-800D0884 0CB1BC 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daAlink_cFv - */ -cXyz* daAlink_c::getMagneBootsTopVec() { - return &mMagneBootsTopVec; -} - -/* 800D0884-800D08B0 0CB1C4 002C+00 1/0 0/0 0/0 .text setCargoCarry__9daAlink_cFP10fopAc_ac_c */ -void daAlink_c::setCargoCarry(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_CARGO_CARRY; - mCargoCarryActor.setData(p_actor); -} - -/* 800D08B0-800D08DC 0CB1F0 002C+00 1/0 0/0 0/0 .text setGoronSideMove__9daAlink_cFP10fopAc_ac_c - */ -void daAlink_c::setGoronSideMove(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_GORON_THROW; - mCargoCarryActor.setData(p_actor); -} - -/* 800D08DC-800D091C 0CB21C 0040+00 1/0 0/0 0/0 .text setSumouReady__9daAlink_cFP10fopAc_ac_c */ -void daAlink_c::setSumouReady(fopAc_ac_c* p_actor) { - mSpecialMode = SMODE_SUMO_READY; - mCargoCarryActor.setData(p_actor); - mDemo.setDemoMode(1); -} - -/* 800D091C-800D0930 0CB25C 0014+00 1/0 0/0 0/0 .text setSumouPushBackDirection__9daAlink_cFs */ -void daAlink_c::setSumouPushBackDirection(s16 param_0) { - if (mProcID != PROC_SUMOU_MOVE) { - return; - } - field_0x3010 = param_0; -} - -/* 800D0930-800D0948 0CB270 0018+00 1/0 0/0 0/0 .text setSumouLoseHeadUp__9daAlink_cFv */ -void daAlink_c::setSumouLoseHeadUp() { - if (mProcID != PROC_SUMOU_WIN_LOSE) { - return; - } - mSpecialMode = SMODE_SUMO_LOSE; -} - -/* 800D0948-800D095C 0CB288 0014+00 1/0 0/0 0/0 .text checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c - */ -bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* p_actor) const { - return field_0x27f4 == p_actor; -} - -/* 800D095C-800D0970 0CB29C 0014+00 1/0 0/0 0/0 .text - * checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c */ -bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { - return field_0x281c.getActorConst() == p_actor; -} - -/* 800D0970-800D0984 0CB2B0 0014+00 1/0 0/0 0/0 .text setWolfEnemyHangBiteAngle__9daAlink_cFs */ -void daAlink_c::setWolfEnemyHangBiteAngle(s16 angle) { - if (mProcID != PROC_WOLF_ENEMY_HANG_BITE) { - return; - } - field_0x3010 = angle; -} - -/* 800D0984-800D0998 0CB2C4 0014+00 1/0 0/0 0/0 .text setSumouGraspCancelCount__9daAlink_cFi */ -void daAlink_c::setSumouGraspCancelCount(int param_0) { - if (mProcID != PROC_SUMOU_MOVE) { - return; - } - mCommonCounter = param_0; -} - -/* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv - */ -bool daAlink_c::checkItemSwordEquip() const { - return mEquipItem == EQUIP_SWORD; -} - -/* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv - */ -f32 daAlink_c::getSinkShapeOffset() const { - return mSinkShapeOffset; -} - -/* 800D09B4-800D09C8 0CB2F4 0014+00 1/0 0/0 0/0 .text checkSinkDead__9daAlink_cCFv */ -BOOL daAlink_c::checkSinkDead() const { - return field_0x2fbd == 0xFF; -} - -/* 800D09C8-800D09DC 0CB308 0014+00 1/0 0/0 0/0 .text checkCutJumpMode__9daAlink_cCFv */ -BOOL daAlink_c::checkCutJumpMode() const { - return mProcID == PROC_CUT_JUMP; -} - -/* 800D09DC-800D09E4 0CB31C 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daAlink_cCFv */ -s16 daAlink_c::getGiantPuzzleAimAngle() const { - return mCommonCounter; -} - -/* 800D09E4-800D09EC 0CB324 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daAlink_cCFv */ -u8 daAlink_c::getSwordChangeWaitTimer() const { - return mSwordChangeWaitTimer; -} - -/* 800D09EC-800D0A14 0CB32C 0028+00 1/0 0/0 0/0 .text checkMetamorphose__9daAlink_cCFv */ -BOOL daAlink_c::checkMetamorphose() const { - return mProcID == PROC_METAMORPHOSE && field_0x300a == 0; -} - -/* 800D0A14-800D0A28 0CB354 0014+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfDownAttackPullOut() const { - return mProcID == PROC_WOLF_DOWN_AT_LAND; -} - -/* 800D0A28-800D0A30 0CB368 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daAlink_cCFv */ -// vtable issue -#ifdef NONMATCHING -cXyz* daAlink_c::getMidnaAtnPos() const { - return &mMidnaAtnPos; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() { - // asm bool daAlink_c::getMidnaAtnPos() const { - nofralloc -#include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s" -} -#pragma pop -#endif - -/* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */ -bool daAlink_c::checkCopyRodEquip() const { - return mEquipItem == COPY_ROD; -} - -/* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */ -bool daAlink_c::checkCanoeFishingGetLeft() const { - return mProcID == PROC_CANOE_FISHING_GET && field_0x300e == 0; -} - -/* 800D0A6C-800D0A94 0CB3AC 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetRight__9daAlink_cCFv */ -bool daAlink_c::checkCanoeFishingGetRight() const { - return mProcID == PROC_CANOE_FISHING_GET && field_0x300e == 1; -} - -/* 800D0A94-800D0A9C 0CB3D4 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daAlink_cCFv - */ -u8 daAlink_c::checkBeeChildDrink() const { - return field_0x2fd3; -} - -/* 800D0A9C-800D0AA4 0CB3DC 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daAlink_cFv */ -Z2WolfHowlMgr* daAlink_c::getWolfHowlMgrP() { - return &mZ2WolfHowlMgr; -} - -/* 800D0AA4-800D0AC8 0CB3E4 0024+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfHowlSuccessAnime() const { - return checkUnderMove0BckNoArcWolf(ANM_WOLF_HOWL_SUCCESS); -} - -/* 800D0AC8-800D0AF0 0CB408 0028+00 1/0 0/0 0/0 .text checkOctaIealHang__9daAlink_cCFv */ -bool daAlink_c::checkOctaIealHang() const { - return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc == 0; -} - -/* 800D0AF0-800D0B08 0CB430 0018+00 1/0 0/0 0/0 .text cancelOctaIealHang__9daAlink_cFv */ -void daAlink_c::cancelOctaIealHang() { - if (mProcID != PROC_BOSS_BODY_HANG) { - return; - } - field_0x300e = 1; -} - -/* 800D0B08-800D0B20 0CB448 0018+00 1/0 0/0 0/0 .text cancelDragonHangBackJump__9daAlink_cFv */ -void daAlink_c::cancelDragonHangBackJump() { - if (mProcID != PROC_BOSS_BODY_HANG) { - return; - } - field_0x300e = -1; -} - -/* 800D0B20-800D0B38 0CB460 0018+00 1/0 0/0 0/0 .text setOctaIealWildHang__9daAlink_cFv - */ -void daAlink_c::setOctaIealWildHang() { - if (mProcID != PROC_BOSS_BODY_HANG) { - return; - } - field_0x3008 = 1; -} - -/* 800D0B38-800D0B60 0CB478 0028+00 1/0 0/0 0/0 .text checkDragonHangRide__9daAlink_cCFv - */ -bool daAlink_c::checkDragonHangRide() const { - return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0; -} - -/* 800D0B60-800D0B8C 0CB4A0 002C+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daAlink_cFUlUl */ -void daAlink_c::playerStartCollisionSE(u32 param_0, u32 param_1) { - mZ2Link.startCollisionSE(param_0, param_1); -} - -/* 800D0B8C-800D0C6C 0CB4CC 00E0+00 1/0 0/0 0/0 .text __dt__16daAlink_matAnm_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm daAlink_matAnm_c::~daAlink_matAnm_c() { -extern "C" asm void __dt__16daAlink_matAnm_cFv() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__16daAlink_matAnm_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803B35C8-803B35EC 0106E8 0024+00 2/2 5/5 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_801446DC, - (void*)NULL, - (void*)NULL, - (void*)func_801446D4, -}; - -/* 800D0C6C-800D0CDC 0CB5AC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" asm void __dt__12dBgS_ObjAcchFv() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__12dBgS_ObjAcchFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 803B35EC-803B3610 01070C 0014+10 3/3 0/0 0/0 .data __vt__Q29daAlink_c14hsChainShape_c - */ -SECTION_DATA extern void* __vt__Q29daAlink_c14hsChainShape_c[5 + 4 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)entry__9J3DPacketFP13J3DDrawBuffer, - (void*)draw__Q29daAlink_c14hsChainShape_cFv, - (void*)__dt__Q29daAlink_c14hsChainShape_cFv, - /* padding */ - NULL, - NULL, - NULL, - NULL, -}; - -/* 800D0CDC-800D0D38 0CB61C 005C+00 1/0 0/0 0/0 .text __dt__Q29daAlink_c14hsChainShape_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlink_c::hsChainShape_c::~hsChainShape_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__Q29daAlink_c14hsChainShape_cFv.s" -} -#pragma pop - -/* 800D0D38-800D0E08 0CB678 00D0+00 1/1 0/0 0/0 .text daAlink_searchNightStalker__FP10fopAc_ac_cPv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchNightStalker(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchNightStalker__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800D0E08-800D0E98 0CB748 0090+00 1/1 0/0 0/0 .text checkLightSwordMtrl__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLightSwordMtrl() { - nofralloc -#include "asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s" -} -#pragma pop - -/* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text checkSwordEquipAnime__9daAlink_cCFv - */ -BOOL daAlink_c::checkSwordEquipAnime() const { - return !i_checkNoResetFlg0(FLG0_UNK_1000000) && - (checkUpperAnime(0x255) || checkUpperAnime(0x261)); -} - -/* 800D0ECC-800D0EFC 0CB80C 0030+00 8/8 0/0 0/0 .text checkCutDashAnime__9daAlink_cCFv */ -BOOL daAlink_c::checkCutDashAnime() const { - return checkUpperAnime(0x80) || checkUpperAnime(0x82) || checkUpperAnime(0x81); -} - -/* 800D0EFC-800D0F5C 0CB83C 0060+00 1/1 0/0 0/0 .text - * checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf */ -BOOL daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf& obj) { - return obj.ChkAtHit() && checkEnemyGroup(obj.GetAtHitAc()); -} - -/* 800D0F5C-800D0F90 0CB89C 0034+00 6/6 0/0 0/0 .text getSwordAtType__9daAlink_cFv */ -u32 daAlink_c::getSwordAtType() { - return checkMasterSwordEquip() ? 0x4000002 : 2; -} - -/* 800D0F90-800D102C 0CB8D0 009C+00 3/3 0/0 0/0 .text initCutTurnAt__9daAlink_cFfi */ -void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { - field_0xFB8.ResetAtHit(); - field_0xFB8.OnAtSetBit(); - field_0xFB8.SetAtType(getSwordAtType()); - field_0xFB8.SetAtHitMark(3); - field_0xFB8.SetAtSe(1); - field_0xFB8.SetAtAtp(param_1); - u8 mtrl; - if (!i_checkNoResetFlg3(FLG3_UNK_100000)) { - mtrl = 0; - } else { - mtrl = 4; - } - field_0xFB8.SetAtMtrl(mtrl); - field_0xFB8.SetR(param_0); - field_0x2fd0 = 1; -} - -/* 800D102C-800D1088 0CB96C 005C+00 2/2 0/0 0/0 .text checkCutFinishJumpUp__9daAlink_cFv - */ -#ifdef NONMATCHING -bool daAlink_c::checkCutFinishJumpUp() { - return checkCutBackState() && (!checkNotBattleStage() && swordSwingTrigger()); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutFinishJumpUp() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800D1088-800D10E0 0CB9C8 0058+00 2/2 0/0 0/0 .text changeCutFast__9daAlink_cFv */ -void daAlink_c::changeCutFast() { - deleteEquipItem(0, 0); - setSwordModel(); - mComboCutCount = 3; - checkCutAction(); - i_onNoResetFlg0(FLG0_UNK_80000); -} - -/* 800D10E0-800D1268 0CBA20 0188+00 1/1 0/0 0/0 .text checkCutFastReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutFastReady() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutFastReady__9daAlink_cFv.s" -} -#pragma pop - -/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */ -void daAlink_c::setSwordModel() { - field_0x2fde = 0xFF; - mEquipItem = EQUIP_SWORD; - - mDoAud_bgmSetSwordUsing(1); - field_0x2f94 = 0; - - if (checkWoodSwordEquip()) { - mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide(); - } else { - mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->show(); - } -} - -/* 800D1310-800D13AC 0CBC50 009C+00 2/2 0/0 0/0 .text offSwordModel__9daAlink_cFv */ -void daAlink_c::offSwordModel() { - mDoAud_bgmSetSwordUsing(0); - - if (mSwordModel == field_0x0668 || mSwordModel == field_0x0660) { - mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); - } else if (mSwordModel == field_0x0670) { - field_0x0670->getModelData()->getMaterialNodePointer(1)->getShape()->show(); - } -} - -/* 800D13AC-800D13E4 0CBCEC 0038+00 1/1 0/0 0/0 .text checkCutTypeNoBlur__9daAlink_cCFv - */ -BOOL daAlink_c::checkCutTypeNoBlur() const { - return mCutType == TYPE_CUT_STAB || mCutType == TYPE_CUT_STAB_COMBO || - mCutType == TYPE_CUT_STAB_FINISH || i_checkNoResetFlg0(UNDER_WATER_MOVEMENT); -} - -/* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text checkCutTurnInput__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkCutTurnInput() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s" -} -#pragma pop - -/* 800D1424-800D1430 0CBD64 000C+00 7/7 0/0 0/0 .text getCutTurnDirection__9daAlink_cCFv - */ -int daAlink_c::getCutTurnDirection() const { - return field_0x3180 < 0; -} - -/* 800D1430-800D1454 0CBD70 0024+00 17/17 0/0 0/0 .text resetCombo__9daAlink_cFi */ -void daAlink_c::resetCombo(int param_0) { - mComboCutCount = 0; - i_offNoResetFlg0(FLG0_UNK_8000); - if (param_0 != 0) { - mRunCutComboCount = 0; - } -} - -/* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ -// something with i_checkAttentionLock -#ifdef NONMATCHING -void daAlink_c::checkComboCnt() { - if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && - (i_checkAttentionLock() && (field_0x122C[0].ChkAtHit() || field_0x122C[1].ChkAtHit() || - field_0x122C[2].ChkAtHit()))) { - i_onNoResetFlg0(FLG0_UNK_8000); - } - if (field_0x307e > 0) { - field_0x307e--; - } else { - resetCombo(1); - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkComboCnt() { - nofralloc -#include "asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text setCutType__9daAlink_cFUc */ -void daAlink_c::setCutType(u8 type) { - mCutType = type; - i_offResetFlg0(RFLG0_UNK_8000000); -} - -/* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text - * setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCylAtParam(u32 param_0, dCcG_At_Spl param_1, u8 param_2, u8 param_3, - int param_4, f32 param_5, f32 param_6) { - nofralloc -#include "asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s" -} -#pragma pop - -/* 800D1688-800D1788 0CBFC8 0100+00 9/9 0/0 0/0 .text - * setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordAtParam(dCcG_At_Spl param_0, u8 param_1, u8 param_2, int param_3, - f32 param_4, f32 param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s" -} -#pragma pop - -/* 800D1788-800D17EC 0CC0C8 0064+00 1/1 0/0 1/1 .text - * notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c */ -bool daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) { - if (p_actor != NULL && fopAcM_GetGroup(p_actor) == 4) { - s16 name = fopAcM_GetName(p_actor); - if (!checkSpecialNpc(p_actor) && name != 0x108 && name != 0x240) { - return true; - } - } - return false; -} - -/* 800D17EC-800D1920 0CC12C 0134+00 4/4 0/0 0/0 .text - * setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordHitVibration(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800D1920-800D1978 0CC260 0058+00 3/3 0/0 0/0 .text checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf - */ -BOOL daAlink_c::checkAtShieldHit(dCcD_GObjInf& param_0) { - return param_0.ChkAtHit() && param_0.ChkAtShieldHit(); -} - -/* 800D1978-800D19C8 0CC2B8 0050+00 1/1 0/0 0/0 .text - * checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf */ -bool daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) { - param_0->GetAtHitAc(); - return checkAtShieldHit(*param_0) ? true : false; -} - -/* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text - * changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" -} -#pragma pop - -/* 800D1E1C-800D20B4 0CC75C 0298+00 4/4 0/0 0/0 .text setCutDash__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutDash(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s" -} -#pragma pop - -/* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv - */ -BOOL daAlink_c::checkForceSwordSwing() { - return mEquipItem == EQUIP_SWORD && swordSwingTrigger(); -} - -/* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */ -void daAlink_c::setComboReserb() { - if (i_checkWolf()) { - field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; - } else { - field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; - } - if (mComboCutCount != 4 && field_0x2fce == 0 && swordSwingTrigger()) { - i_onNoResetFlg2(UNK_FLG2_2); - } -} - -/* 800D2188-800D21D0 0CCAC8 0048+00 1/1 0/0 0/0 .text checkComboReserb__9daAlink_cFv */ -BOOL daAlink_c::checkComboReserb() { - return i_checkNoResetFlg2(UNK_FLG2_2) && !checkEventRun(); -} - -/* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text commonCutAction__9daAlink_cFv */ -bool daAlink_c::commonCutAction() { - if (mComboCutCount == 4) { - resetCombo(1); - } - - if (i_dComIfGp_getDoStatus() == 4) { - setDoStatus(0); - } - mComboCutCount++; - - if (i_checkReinRide()) { - procHorseCutInit(); - if (mComboCutCount > 1) { - mComboCutCount = 1; - } - return true; - } else { - return false; - } -} - -/* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text setSwordVoiceSe__9daAlink_cFUl */ -void daAlink_c::setSwordVoiceSe(u32 sfx_id) { - if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { - voiceStart(sfx_id); - } -} - -/* 800D22BC-800D2304 0CCBFC 0048+00 3/3 0/0 0/0 .text setSwordChargeVoiceSe__9daAlink_cFv - */ -void daAlink_c::setSwordChargeVoiceSe() { - if (mCommonCounter != 0) { - mCommonCounter--; - if (mCommonCounter == 0) { - setSwordVoiceSe(Z2SE_AL_V_TAME); - } - } -} - -/* 800D2304-800D2368 0CCC44 0064+00 3/3 0/0 0/0 .text setSwordComboVoice__9daAlink_cFv */ -void daAlink_c::setSwordComboVoice() { - if (mProcID == PROC_CUT_JUMP || mComboCutCount == 4) { - setSwordVoiceSe(Z2SE_AL_V_ATTACK_L); - } else if (mComboCutCount == 1) { - setSwordVoiceSe(Z2SE_AL_V_ATTACK_S); - } else { - setSwordVoiceSe(Z2SE_AL_V_ATTACK_M); - } -} - -/* 800D2368-800D23C0 0CCCA8 0058+00 3/3 0/0 0/0 .text checkCutTurnInputTrigger__9daAlink_cFv */ -bool daAlink_c::checkCutTurnInputTrigger() { - return swordSwingTrigger() && checkCutTurnInput(); -} - -/* 800D23C0-800D2684 0CCD00 02C4+00 7/7 0/0 0/0 .text checkCutAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2684-800D26EC 0CCFC4 0068+00 9/9 0/0 0/0 .text checkCutTurnCharge__9daAlink_cFv */ -void daAlink_c::checkCutTurnCharge() { - if (swordButton()) { - if (field_0x3012 < 3) { - field_0x3012++; - } else { - i_onResetFlg0(RFLG0_UNK_40); - } - } else { - field_0x3012 = 0; - } -} - -/* 800D26EC-800D2760 0CD02C 0074+00 4/4 0/0 0/0 .text getCutDirection__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCutDirection() { - nofralloc -#include "asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2760-800D27E4 0CD0A0 0084+00 4/4 0/0 0/0 .text checkCutCancelNextMode__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutCancelNextMode(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s" -} -#pragma pop - -/* 800D27E4-800D2890 0CD124 00AC+00 4/4 0/0 0/0 .text checkDoCutAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDoCutAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text checkCutBackState__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCutBackState() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s" -} -#pragma pop - -/* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text checkCutHeadState__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutHeadState() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s" -} -#pragma pop - -/* 800D29D4-800D2ABC 0CD314 00E8+00 4/4 0/0 0/0 .text checkDownAttackState__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDownAttackState() { - nofralloc -#include "asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2ABC-800D2B88 0CD3FC 00CC+00 1/1 1/1 0/0 .text checkCutLargeTurnState__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutLargeTurnState() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s" -} -#pragma pop - -/* 800D2B88-800D2BFC 0CD4C8 0074+00 2/2 0/0 0/0 .text cancelCutCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelCutCharge() { - nofralloc -#include "asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2BFC-800D2C54 0CD53C 0058+00 3/3 0/0 0/0 .text initCutAtnActorSearch__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCutAtnActorSearch() { - nofralloc -#include "asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutAtnActorChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s" -} -#pragma pop - -/* 800D2C78-800D2F58 0CD5B8 02E0+00 2/2 0/0 0/0 .text setCutJumpSpeed__9daAlink_cFi */ -// literals, and small issue with JMAFastSqrt instructions -#ifdef NONMATCHING -void daAlink_c::setCutJumpSpeed(int cut_type) { - if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { - mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; - mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; - } else if (checkHeavyStateOn(1, 1)) { - mSpeed.y *= 1.35f; - } - - // cut_type 0 = standing jump attack - if (mTargetedActor != NULL && cut_type == 0) { - mCollisionRot.y = cLib_targetAngleY(&mCurrent.mPosition, &mTargetedActor->mEyePos); - cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(mCollisionRot.y) * 70.0f), - mTargetedActor->mEyePos.y + 50.0f, - mTargetedActor->mEyePos.z - (cM_scos(mCollisionRot.y) * 70.0f)); - - if (fopAcM_gc_c::gndCheck(&targetPos)) { - targetPos.y = fopAcM_gc_c::getGroundY(); - } else { - targetPos.y = mTargetedActor->mEyePos.y; - } - - f32 dvar12 = mSpeed.y + mGravity; - f32 dvar10 = 1.0f / mGravity; - f32 fvar1 = targetPos.y - (mCurrent.mPosition.y - (dvar10 * (dvar12 * dvar12) * 0.5f)); - - if (fvar1 > 0.0f) { - fvar1 = 0.0f; - } - f32 sqrt = JMAFastSqrt(fvar1 * 2.0f * dvar10); - f32 speedDiv = sqrt - (dvar12 * dvar10); - f32 squareDist = mCurrent.mPosition.absXZ(targetPos); - - if (squareDist > 500.0f) { - squareDist = 500.0f; - } - mNormalSpeed = squareDist / speedDiv; - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutJumpSpeed(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setCutJumpSpeed__9daAlink_cFi.s" -} -#pragma pop -#endif - -/* 800D2F58-800D31B8 0CD898 0260+00 3/3 0/0 0/0 .text procCutNormalInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutNormalInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D31B8-800D34D8 0CDAF8 0320+00 1/0 0/0 0/0 .text procCutNormal__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutNormal() { - nofralloc -#include "asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s" -} -#pragma pop - -/* 800D34D8-800D382C 0CDE18 0354+00 4/4 0/0 0/0 .text procCutFinishInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D382C-800D3ADC 0CE16C 02B0+00 1/0 0/0 0/0 .text procCutFinish__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinish() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinish__9daAlink_cFv.s" -} -#pragma pop - -/* 800D3ADC-800D3CCC 0CE41C 01F0+00 2/2 0/0 0/0 .text procCutFinishJumpUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D3CCC-800D3DD8 0CE60C 010C+00 1/0 0/0 0/0 .text procCutFinishJumpUp__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUp() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800D3DD8-800D3ECC 0CE718 00F4+00 1/1 0/0 0/0 .text procCutFinishJumpUpLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D3ECC-800D4068 0CE80C 019C+00 1/0 0/0 0/0 .text procCutFinishJumpUpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFinishJumpUpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D4068-800D41FC 0CE9A8 0194+00 2/2 0/0 0/0 .text - * procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" -} -#pragma pop - -/* 800D41FC-800D42FC 0CEB3C 0100+00 1/0 0/0 0/0 .text procCutReverse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutReverse() { - nofralloc -#include "asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s" -} -#pragma pop - -/* 800D42FC-800D43F8 0CEC3C 00FC+00 2/2 0/0 0/0 .text procCutJumpInit__9daAlink_cFi */ -bool daAlink_c::procCutJumpInit(int jump_type) { - commonProcInit(PROC_CUT_JUMP); - setSingleAnimeParam(ANM_CUT_JUMP, &daAlinkHIO_cutJump_c0::m.mCutAnm); - if (jump_type != 0) { - mNormalSpeed = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedH; - mSpeed.y = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedV; - } else { - mNormalSpeed = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedH; - mSpeed.y = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedV; - } - setCutJumpSpeed(jump_type); - mCurrent.mAngle.y = mCollisionRot.y; - setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, - daAlinkHIO_cut_c0::m.mSwordRadius); - setCutType(TYPE_CUT_JUMP); - setSwordComboVoice(); - dComIfGp_setPlayerStatus0(0, 0x8000); - field_0x3198 = 2; - return true; -} - -/* 800D43F8-800D452C 0CED38 0134+00 1/0 0/0 0/0 .text procCutJump__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::procCutJump() { - if (mCurrent.mAngle.y == mCollisionRot.y && changeCutReverseProc(ANM_CUT_JUMP)) { - mCurrent.mAngle.y += 0x8000; - mNormalSpeed = 27.0f; - cXyz xyz(0.0f, 1.0f, 0.0f); - dComIfGp_getVibration().StartShock(5, 31, xyz); - } else if (mCurrent.mAngle.y != mCollisionRot.y) { - cLib_chaseF(&mNormalSpeed, 5.0f, 1.0f); - } - - if (checkCutTurnInput()) { - field_0x3198 = getCutTurnDirection(); - } - if (mLinkAcch.ChkGroundHit()) { - procCutJumpLandInit(field_0x3198); - } else if (mFrameCtrl1[0].getFrame() >= daAlinkHIO_cutJump_c0::m.mStartAttackFrame) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { - seStartSwordCut(Z2SE_AL_SWORD_SWING_L); - } - i_onResetFlg0(RFLG0_UNK_2); - } - return true; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procCutJump() { - nofralloc -#include "asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text procCutJumpLandInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D4684-800D47DC 0CEFC4 0158+00 1/0 0/0 0/0 .text procCutJumpLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D47DC-800D4A74 0CF11C 0298+00 7/7 0/0 0/0 .text procCutTurnInit__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnInit__9daAlink_cFii.s" -} -#pragma pop - -/* 800D4A74-800D4C68 0CF3B4 01F4+00 1/0 0/0 0/0 .text procCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 800D4C68-800D4D04 0CF5A8 009C+00 3/3 0/0 0/0 .text procCutTurnChargeInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D4D04-800D4DDC 0CF644 00D8+00 1/0 0/0 0/0 .text procCutTurnCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s" -} -#pragma pop - -/* 800D4DDC-800D4EFC 0CF71C 0120+00 3/3 0/0 0/0 .text procCutTurnMoveInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D4EFC-800D53C8 0CF83C 04CC+00 1/0 0/0 0/0 .text procCutTurnMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutTurnMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCutTurnMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800D53C8-800D57F8 0CFD08 0430+00 2/1 0/0 0/0 .text procCutDownInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutDownInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutDownInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D57F8-800D58A0 0D0138 00A8+00 1/0 0/0 0/0 .text procCutDown__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutDown() { - nofralloc -#include "asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s" -} -#pragma pop - -/* 800D58A0-800D5ADC 0D01E0 023C+00 1/1 0/0 0/0 .text - * procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutDownLandInit(fopEn_enemy_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c.s" -} -#pragma pop - -/* 800D5ADC-800D5C88 0D041C 01AC+00 1/0 0/0 0/0 .text procCutDownLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutDownLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutDownLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D5C88-800D5FC8 0D05C8 0340+00 2/1 0/0 0/0 .text procCutHeadInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHeadInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHeadInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D5FC8-800D6130 0D0908 0168+00 1/0 0/0 0/0 .text procCutHead__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHead() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6130-800D618C 0D0A70 005C+00 1/1 0/0 0/0 .text procCutHeadLandInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHeadLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D618C-800D6238 0D0ACC 00AC+00 1/0 0/0 0/0 .text procCutHeadLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutHeadLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6238-800D62A0 0D0B78 0068+00 2/2 0/0 0/0 .text procCutLargeJumpChargeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D62A0-800D6374 0D0BE0 00D4+00 1/0 0/0 0/0 .text procCutLargeJumpCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6374-800D6484 0D0CB4 0110+00 2/1 0/0 0/0 .text procCutLargeJumpInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6484-800D66C0 0D0DC4 023C+00 1/0 0/0 0/0 .text procCutLargeJump__9daAlink_cFv */ -bool daAlink_c::procCutLargeJump() { - daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; - - if (field_0x3010 != 0) { - field_0x2f99 = 4; - } - - if (i_checkModeFlg(2) && checkCutTurnInput()) { - field_0x3198 = getCutTurnDirection(); - } - - if (mCommonCounter == 0) { - if (ctrl->checkAnmEnd()) { - field_0x2f99 = 12; - setSingleAnimeParam(ANM_CUT_JUMP_LARGE, &daAlinkHIO_cutLargeJump_c0::m.mCutAnm); - mCommonCounter = 1; - setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_2); - } else { - if (ctrl->getFrame() >= lit_7307) { - field_0x3010 = 1; - } - - if (!i_checkModeFlg(2) && ctrl->getFrame() >= lit_7808) { - setJumpMode(); - mNormalSpeed = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedH; - mSpeed.y = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedV; - setCutJumpSpeed(0); - } - - if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartF && - ctrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndF) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { - seStartSwordCut(Z2SE_AL_SWORD_SWING_S); - } - i_onResetFlg0(2); - } - } - } else { - if (field_0x300e != 0) { - field_0x300e--; - if (field_0x300e == 0) { - setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 4, daAlinkHIO_cut_c0::m.mSwordLength, - daAlinkHIO_cut_c0::m.mSwordRadius); - setCutType(TYPE_CUT_LARGE_JUMP); - } - } - - if (mLinkAcch.ChkGroundHit()) { - procCutLargeJumpLandInit(field_0x3198); - } else { - if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitF) { - if (!i_checkNoResetFlg0(FLG0_UNK_40)) { - seStartSwordCut(Z2SE_AL_SWORD_SWING_S); - } - i_onResetFlg0(2); - } - } - } - return true; -} - -/* 800D66C0-800D67FC 0D1000 013C+00 1/1 0/0 0/0 .text procCutLargeJumpLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800D67FC-800D698C 0D113C 0190+00 1/0 0/0 0/0 .text procCutLargeJumpLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutLargeJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800D698C-800D6A38 0D12CC 00AC+00 2/1 0/0 0/0 .text procSwordUnequipSpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordUnequipSpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6A38-800D6D94 0D1378 035C+00 1/0 0/0 0/0 .text procSwordUnequipSp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordUnequipSp() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6D94-800D6DA4 0D16D4 0010+00 0/0 0/0 2/2 .text getFreezeR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeR() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s" -} -#pragma pop - -/* 800D6DA4-800D6DB4 0D16E4 0010+00 0/0 0/0 2/2 .text getFreezeG__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeG() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s" -} -#pragma pop - -/* 800D6DB4-800D6DC4 0D16F4 0010+00 0/0 0/0 2/2 .text getFreezeB__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getFreezeB() const { - nofralloc -#include "asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s" -} -#pragma pop - -/* 800D6DC4-800D6DF0 0D1704 002C+00 2/2 0/0 0/0 .text checkMiddleBossGoronRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMiddleBossGoronRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6DF0-800D6E24 0D1730 0034+00 1/0 0/0 0/0 .text setDkCaught__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDkCaught(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800D6E24-800D6F00 0D1764 00DC+00 2/2 0/0 0/0 .text freezeTimerDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::freezeTimerDamage() { - nofralloc -#include "asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s" -} -#pragma pop - -/* 800D6F2C-800D6FE0 0D186C 00B4+00 3/3 0/0 0/0 .text checkNoLandDamageSlidePolygon__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNoLandDamageSlidePolygon() { - nofralloc -#include "asm/d/a/d_a_alink/checkNoLandDamageSlidePolygon__9daAlink_cFv.s" -} -#pragma pop - -/* 800D6FE0-800D70A0 0D1920 00C0+00 6/6 0/0 0/0 .text checkCutLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCutLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCaughtEscapeCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 800D7160-800D7208 0D1AA0 00A8+00 1/0 0/0 0/0 .text setThrowDamage__9daAlink_cFsffiii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, - int param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s" -} -#pragma pop - -/* 800D7208-800D72BC 0D1B48 00B4+00 2/2 0/0 0/0 .text damageMagnification__9daAlink_cFii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::damageMagnification(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s" -} -#pragma pop - -/* 800D72BC-800D7478 0D1BFC 01BC+00 6/6 1/1 0/0 .text setDamagePoint__9daAlink_cFiiii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDamagePoint(int param_0, int param_1, int param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_alink/setDamagePoint__9daAlink_cFiiii.s" -} -#pragma pop - -/* 800D7478-800D74A4 0D1DB8 002C+00 6/6 0/0 0/0 .text setDamagePointNormal__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDamagePointNormal(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s" -} -#pragma pop - -/* 800D74A4-800D74F4 0D1DE4 0050+00 3/3 0/0 0/0 .text setLandDamagePoint__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLandDamagePoint(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s" -} -#pragma pop - -/* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getDamageVec(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getDamageVec__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800D76C4-800D7768 0D2004 00A4+00 1/1 0/0 0/0 .text setDashDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDashDamage() { - nofralloc -#include "asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D7768-800D77C8 0D20A8 0060+00 2/2 0/0 3/3 .text - * checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s" -} -#pragma pop - -/* 800D77C8-800D7820 0D2108 0058+00 8/8 0/0 0/0 .text checkMagicArmorNoDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMagicArmorNoDamage() { - nofralloc -#include "asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D7820-800D7A98 0D2160 0278+00 1/1 0/0 0/0 .text checkPolyDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPolyDamage() { - nofralloc -#include "asm/d/a/d_a_alink/checkPolyDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D7A98-800D7B18 0D23D8 0080+00 1/1 0/0 0/0 .text - * checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s" -} -#pragma pop - -/* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text damageTimerCount__9daAlink_cFv */ -#ifdef NONMATCHING -void daAlink_c::damageTimerCount() { - if (!i_checkModeFlg(8)) { - if (mDamageColorTime != 0) { - mDamageColorTime--; - } - - if (mProcID != PROC_DK_CAUGHT && i_checkNoResetFlg1(1)) { - i_offNoResetFlg1(1); - } - - if (checkDkCaught2Anime() && i_checkNoResetFlg0(0x20000)) { - i_offNoResetFlg0(0x20000); - } - } else if (mDamageColorTime != 0) { - mDamageColorTime--; - - if (mDamageColorTime + mDamageTimer == 0) { - - } - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::damageTimerCount() { - nofralloc -#include "asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800D7BE8-800D7C14 0D2528 002C+00 3/3 0/0 0/0 .text checkHugeAttack__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHugeAttack(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s" -} -#pragma pop - -/* 800D7C14-800D7C40 0D2554 002C+00 3/3 0/0 0/0 .text checkLargeAttack__9daAlink_cCFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLargeAttack(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s" -} -#pragma pop - -/* 800D7C40-800D8F3C 0D2580 12FC+00 1/1 0/0 0/0 .text checkDamageAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDamageAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkDamageAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800D8F3C-800D9514 0D387C 05D8+00 2/2 0/0 0/0 .text procDamageInit__9daAlink_cFP12dCcD_GObjInfi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procDamageInit__9daAlink_cFP12dCcD_GObjInfi.s" -} -#pragma pop - -/* 800D9514-800D96DC 0D3E54 01C8+00 1/0 0/0 0/0 .text procDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800D96DC-800D9E88 0D401C 07AC+00 12/12 0/0 0/0 .text - * procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3, - dCcD_GObjInf* param_4, int param_5) { - nofralloc -#include "asm/d/a/d_a_alink/procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi.s" -} -#pragma pop - -/* 800D9E88-800DA180 0D47C8 02F8+00 1/0 0/0 0/0 .text procCoLargeDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLargeDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800DA180-800DA554 0D4AC0 03D4+00 2/2 0/0 0/0 .text procLargeDamageUpInit__9daAlink_cFiiss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { - nofralloc -#include "asm/d/a/d_a_alink/procLargeDamageUpInit__9daAlink_cFiiss.s" -} -#pragma pop - -/* 800DA554-800DA82C 0D4E94 02D8+00 1/0 0/0 0/0 .text procLargeDamageUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLargeDamageUp() { - nofralloc -#include "asm/d/a/d_a_alink/procLargeDamageUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800DA82C-800DAC28 0D516C 03FC+00 1/1 0/0 0/0 .text procCoLargeDamageWallInit__9daAlink_cFiiss - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2, s16 param_3) { - nofralloc -#include "asm/d/a/d_a_alink/procCoLargeDamageWallInit__9daAlink_cFiiss.s" -} -#pragma pop - -/* 800DAC28-800DAC84 0D5568 005C+00 1/0 0/0 0/0 .text procCoLargeDamageWall__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLargeDamageWall() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s" -} -#pragma pop - -/* 800DAC84-800DAD90 0D55C4 010C+00 2/2 0/0 0/0 .text procCoPolyDamageInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPolyDamageInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DAD90-800DAE10 0D56D0 0080+00 1/0 0/0 0/0 .text procCoPolyDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPolyDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800DAE10-800DB060 0D5750 0250+00 2/2 0/0 0/0 .text procLandDamageInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLandDamageInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procLandDamageInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800DB060-800DB140 0D59A0 00E0+00 1/0 0/0 0/0 .text procLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800DB140-800DB418 0D5A80 02D8+00 1/1 0/0 0/0 .text - * procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi.s" -} -#pragma pop - -/* 800DB418-800DB5B0 0D5D58 0198+00 1/0 0/0 0/0 .text procCoElecDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoElecDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procCoElecDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800DB5B0-800DB610 0D5EF0 0060+00 2/2 0/0 0/0 .text procStEscapeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStEscapeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DB610-800DB6A4 0D5F50 0094+00 1/0 0/0 0/0 .text procStEscape__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procStEscape() { - nofralloc -#include "asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s" -} -#pragma pop - -/* 800DB6A4-800DB860 0D5FE4 01BC+00 1/1 0/0 0/0 .text procDkCaughtInit__9daAlink_cFUi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDkCaughtInit(unsigned int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procDkCaughtInit__9daAlink_cFUi.s" -} -#pragma pop - -/* 800DB860-800DBC98 0D61A0 0438+00 1/0 0/0 0/0 .text procDkCaught__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDkCaught() { - nofralloc -#include "asm/d/a/d_a_alink/procDkCaught__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBC98-800DBD1C 0D65D8 0084+00 2/2 0/0 0/0 .text setScreamWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setScreamWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBD1C-800DBDA4 0D665C 0088+00 1/1 0/0 0/0 .text procScreamWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procScreamWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBDA4-800DBE00 0D66E4 005C+00 1/0 0/0 0/0 .text procScreamWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procScreamWait() { - nofralloc -#include "asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBE00-800DBE74 0D6740 0074+00 1/1 0/0 0/0 .text procCoSandWallHitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSandWallHitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBE74-800DBED8 0D67B4 0064+00 1/0 0/0 0/0 .text procCoSandWallHit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSandWallHit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DBED8-800DC214 0D6818 033C+00 1/1 0/0 0/0 .text procCoLavaReturnInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLavaReturnInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCoLavaReturnInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800DC214-800DC278 0D6B54 0064+00 1/0 0/0 0/0 .text procCoLavaReturn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLavaReturn() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s" -} -#pragma pop - -/* 800DC278-800DC474 0D6BB8 01FC+00 1/1 0/0 0/0 .text procCoSwimFreezeReturnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimFreezeReturnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DC474-800DC548 0D6DB4 00D4+00 1/0 0/0 0/0 .text procCoSwimFreezeReturn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoSwimFreezeReturn() { - nofralloc -#include "asm/d/a/d_a_alink/procCoSwimFreezeReturn__9daAlink_cFv.s" -} -#pragma pop - -/* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkShieldAttackEmphasys() { - nofralloc -#include "asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s" -} -#pragma pop - -/* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGuardActionChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkGuardActionChange__9daAlink_cFv.s" -} -#pragma pop - -/* 800DC79C-800DC8C4 0D70DC 0128+00 3/3 0/0 0/0 .text stickArrowIncrement__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::stickArrowIncrement(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/stickArrowIncrement__9daAlink_cFi.s" -} -#pragma pop - -/* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text - * setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArrowShieldActor(fopAc_ac_c* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci.s" -} -#pragma pop - -/* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text - * checkWoodShieldEquipNotIronBall__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWoodShieldEquipNotIronBall() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text - * getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, - cXyz* param_3) const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz.s" -} -#pragma pop - -/* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text - * setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* param_2, - cXyz const* param_3) const { - nofralloc -#include "asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s" -} -#pragma pop - -/* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkUpperGuardAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */ -#ifdef NONMATCHING -BOOL daAlink_c::checkPlayerGuard() const { - bool ret = true; - bool bvar2 = true; - if (!i_checkSmallUpperGuardAnime()) { - bool bvar1 = false; - if (i_checkShieldGet() && checkHorseLieAnime()) { - bvar1 = true; - } - if (!bvar1) { - bvar2 = false; - } - } - - if (!bvar2 && !checkUpperGuardAnime()) { - ret = false; - } - - return ret; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkPlayerGuard() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s" -} -#pragma pop -#endif - -/* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPlayerGuardAndAttack() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGuardAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s" -} -#pragma pop - -/* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setUpperGuardAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShieldGuard() { - nofralloc -#include "asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s" -} -#pragma pop - -/* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGuardSe(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSmallGuard__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text - * procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800DD894-800DDA10 0D81D4 017C+00 1/0 0/0 0/0 .text procGuardSlip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardSlip() { - nofralloc -#include "asm/d/a/d_a_alink/procGuardSlip__9daAlink_cFv.s" -} -#pragma pop - -/* 800DDA10-800DDBA8 0D8350 0198+00 2/1 0/0 0/0 .text procGuardAttackInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardAttackInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGuardAttackInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DDBA8-800DDE58 0D84E8 02B0+00 1/0 0/0 0/0 .text procGuardAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procGuardAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 800DDE58-800DDF2C 0D8798 00D4+00 2/2 0/0 0/0 .text procGuardBreakInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardBreakInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGuardBreakInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DDF2C-800DE008 0D886C 00DC+00 1/0 0/0 0/0 .text procGuardBreak__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGuardBreak() { - nofralloc -#include "asm/d/a/d_a_alink/procGuardBreak__9daAlink_cFv.s" -} -#pragma pop - -/* 800DE008-800DE380 0D8948 0378+00 2/2 0/0 0/0 .text procTurnMoveInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procTurnMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procTurnMoveInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800DE380-800DE64C 0D8CC0 02CC+00 1/0 0/0 0/0 .text procTurnMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTurnMove() { - nofralloc -#include "asm/d/a/d_a_alink/procTurnMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text getArrowFlyData__9daAlink_cCFPfPfi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowFlyData(f32* param_0, f32* param_1, int param_2) const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s" -} -#pragma pop - -/* 800DE740-800DE750 0D9080 0010+00 0/0 0/0 1/1 .text getArrowIncAtR__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtR() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE750-800DE760 0D9090 0010+00 0/0 0/0 1/1 .text getBombArrowFlyExplodeTime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBombArrowFlyExplodeTime() const { - nofralloc -#include "asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE760-800DE770 0D90A0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMaxStart__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtMaxStart() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE770-800DE780 0D90B0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getArrowIncAtMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkBowAndSlingItem(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s" -} -#pragma pop - -/* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text setSlingModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSlingModel() { - nofralloc -#include "asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s" -} -#pragma pop - -/* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s" -} -#pragma pop - -/* 800DE990-800DE9B8 0D92D0 0028+00 1/0 0/0 0/0 .text checkArrowChargeEnd__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkArrowChargeEnd() const { - nofralloc -#include "asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE9B8-800DE9E8 0D92F8 0030+00 3/3 0/0 0/0 .text checkBowReadyAnime__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowReadyAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DE9E8-800DEA3C 0D9328 0054+00 16/16 0/0 0/0 .text checkBowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DEA3C-800DEAE4 0D937C 00A8+00 2/2 0/0 0/0 .text makeArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::makeArrow() { - nofralloc -#include "asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEAE4-800DEB8C 0D9424 00A8+00 3/3 0/0 0/0 .text deleteArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::deleteArrow() { - nofralloc -#include "asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text setBowOrSlingStatus__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowOrSlingStatus() { - nofralloc -#include "asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text changeArrowType__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeArrowType() { - nofralloc -#include "asm/d/a/d_a_alink/changeArrowType__9daAlink_cFv.s" -} -#pragma pop - -/* 800DED88-800DEE1C 0D96C8 0094+00 1/1 0/0 0/0 .text cancelBowMoveRideNotAtn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBowMoveRideNotAtn() { - nofralloc -#include "asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEE1C-800DEEDC 0D975C 00C0+00 3/3 0/0 0/0 .text cancelBowMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text setBowReadyAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800DEFB8-800DF0BC 0D98F8 0104+00 2/2 0/0 0/0 .text setBowReloadAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowReloadAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800DF0BC-800DF798 0D99FC 06DC+00 2/2 0/0 0/0 .text checkUpperItemActionBow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBow() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBow__9daAlink_cFv.s" -} -#pragma pop - -/* 800DF798-800DF814 0DA0D8 007C+00 1/1 0/0 0/0 .text checkUpperItemActionBowFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBowFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s" -} -#pragma pop - -/* 800DF814-800DFAE8 0DA154 02D4+00 4/4 0/0 0/0 .text checkNextActionBow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionBow() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionBow__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFAE8-800DFBC8 0DA428 00E0+00 1/1 0/0 0/0 .text setBowModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowModel() { - nofralloc -#include "asm/d/a/d_a_alink/setBowModel__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text checkBowGrabLeftHand__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBowGrabLeftHand() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s" -} -#pragma pop - -/* 800DFC28-800DFC70 0DA568 0048+00 6/6 0/0 0/0 .text setBowHangAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowHangAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFC70-800DFCD8 0DA5B0 0068+00 3/3 0/0 0/0 .text setBowNormalAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowNormalAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFCD8-800DFD6C 0DA618 0094+00 3/3 0/0 0/0 .text setBowSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBowSight() { - nofralloc -#include "asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFD6C-800DFDDC 0DA6AC 0070+00 1/1 0/0 0/0 .text procBowSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFDDC-800DFE3C 0DA71C 0060+00 1/0 0/0 0/0 .text procBowSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFE3C-800DFEC0 0DA77C 0084+00 1/1 0/0 0/0 .text procBowMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFEC0-800DFFE0 0DA800 0120+00 1/0 0/0 0/0 .text procBowMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800DFFE0-800E0010 0DA920 0030+00 0/0 0/0 1/1 .text checkBoomerangLockAccept__9daAlink_cFv */ -BOOL daAlink_c::checkBoomerangLockAccept() { - return mSight.getDrawFlg() && i_dComIfGp_checkPlayerStatus0(0, 0x80000); -} - -/* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text getBoomSpeed__9daAlink_cFv */ -// small regalloc -#ifdef NONMATCHING -f32 daAlink_c::getBoomSpeed() { - f32 speed; - if (checkBoomerangChargeEndWait()) { - speed = daAlinkHIO_boom_c0::m.field_0x38; - } else { - speed = daAlinkHIO_boom_c0::m.field_0x34; - } - - if (i_checkModeFlg(0x400) && mRideActor.getActor() != NULL && mSpeedF > FLOAT_LABEL(lit_6108)) { - speed += mSpeedF; - } - - return speed; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 daAlink_c::getBoomSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800E00B0-800E00C0 0DA9F0 0010+00 0/0 0/0 1/1 .text getBoomCatchSpeed__9daAlink_cCFv */ -f32 daAlink_c::getBoomCatchSpeed() const { - return daAlinkHIO_boom_c0::m.mCatchSpeed; -} - -/* 800E00C0-800E011C 0DAA00 005C+00 1/1 0/0 1/1 .text getBoomFlyMax__9daAlink_cCFv */ -f32 daAlink_c::getBoomFlyMax() const { - if (i_checkModeFlg(0x400) && !checkCanoeRide()) { - return daAlinkHIO_boom_c0::m.field_0x40; - } else { - return daAlinkHIO_boom_c0::m.field_0x3c; - } -} - -/* 800E011C-800E0190 0DAA5C 0074+00 1/1 0/0 2/2 .text getBoomLockMax__9daAlink_cFv */ -f32 daAlink_c::getBoomLockMax() { - f32 max = getBoomFlyMax(); - - if (checkBossBabaRoom()) { - return lit_12475; - } else if (daAlinkHIO_boom_c0::m.field_0x44 > max) { - return daAlinkHIO_boom_c0::m.field_0x44; - } else { - return max; - } -} - -/* 800E0190-800E01A0 0DAAD0 0010+00 0/0 0/0 1/1 .text getBoomBgThroughTime__9daAlink_cCFv - */ -s16 daAlink_c::getBoomBgThroughTime() const { - return daAlinkHIO_boom_c0::m.mBgThroughTime; -} - -/* 800E01A0-800E01CC 0DAAE0 002C+00 1/1 0/0 0/0 .text checkBossBabaRoom__9daAlink_cFv */ -bool daAlink_c::checkBossBabaRoom() { - return checkStageName("D_MN05A"); -} - -/* 800E01CC-800E0210 0DAB0C 0044+00 0/0 1/1 0/0 .text - * cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelBoomerangLock(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800E0210-800E0244 0DAB50 0034+00 2/2 0/0 0/0 .text getBoomerangActor__9daAlink_cFv */ -fopAc_ac_c* daAlink_c::getBoomerangActor() { - if (mThrowBoomerangActor.getID() != 0xFFFFFFFF) { - return mThrowBoomerangActor.getActor(); - } - - if (mEquipItem == BOOMERANG) { - return mItemActor.getActor(); - } - - return NULL; -} - -/* 800E0244-800E02B8 0DAB84 0074+00 0/0 1/1 0/0 .text checkBoomerangChargeEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkBoomerangChargeEnd() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangChargeEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 800E02B8-800E03D0 0DABF8 0118+00 0/0 1/1 0/0 .text - * checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoomerangCarry(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800E03D0-800E0440 0DAD10 0070+00 6/6 0/0 0/0 .text initBoomerangUpperAnimeSpeed__9daAlink_cFi - */ -void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) { - if (!checkBoomerangThrowAnime()) { - if (param_0 != 0) { - f32 tmp = FLOAT_LABEL(lit_6108); - mFrameCtrl2[2].setRate(tmp); - mFrameCtrl2[2].setFrame(tmp); - getNowAnmPackUpper(UPPER_NOW)->setFrame(tmp); - } else { - mFrameCtrl2[2].setRate(daAlinkHIO_boom_c0::m.field_0x2c); - } - } -} - -/* 800E0440-800E04AC 0DAD80 006C+00 9/9 0/0 0/0 .text checkBoomerangAnime__9daAlink_cCFv - */ -BOOL daAlink_c::checkBoomerangAnime() const { - return checkBoomerangReadyAnime() || checkBoomerangThrowAnime(); -} - -/* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkBoomerangThrowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangThrowAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800E04E8-800E055C 0DAE28 0074+00 1/1 0/0 0/0 .text setBoomerangReadyQuake__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangReadyQuake() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s" -} -#pragma pop - -/* 800E055C-800E05E8 0DAE9C 008C+00 2/2 0/0 0/0 .text setBoomerangReadyAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800E05E8-800E0630 0DAF28 0048+00 2/2 0/0 0/0 .text setThrowBoomerangAnime__9daAlink_cFv */ -void daAlink_c::setThrowBoomerangAnime() { - setUpperAnimeParam(0x53, UPPER_NOW, &daAlinkHIO_boom_c0::m.mThrowAnm); - cancelItemUseQuake(0); -} - -/* 800E0630-800E06B8 0DAF70 0088+00 2/2 0/0 0/0 .text setBoomerangCatchAnime__9daAlink_cFv */ -void daAlink_c::setBoomerangCatchAnime() { - setUpperAnimeParam(0x52, UPPER_NOW, &daAlinkHIO_boom_c0::m.mCatchAnm); - setFacePriBck(0xE8); - field_0x2f97 = 254; - if (mEquipItem != COPY_ROD) { - seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); - } -} - -/* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text throwBoomerang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::throwBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s" -} -#pragma pop - -/* 800E08C4-800E0A9C 0DB204 01D8+00 0/0 0/0 1/1 .text returnBoomerang__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::returnBoomerang(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s" -} -#pragma pop - -/* 800E0A9C-800E0B58 0DB3DC 00BC+00 2/2 0/0 0/0 .text checkUpperItemActionBoomerang__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0B58-800E0BE4 0DB498 008C+00 1/1 0/0 0/0 .text - * checkUpperItemActionBoomerangFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionBoomerangFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionBoomerang() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0D8C-800E0E64 0DB6CC 00D8+00 1/1 0/0 0/0 .text checkBoomerangCatchAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoomerangCatchAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0E64-800E0F10 0DB7A4 00AC+00 3/3 0/0 0/0 .text setBoomerangSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoomerangSight() { - nofralloc -#include "asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0F10-800E0FA0 0DB850 0090+00 1/1 0/0 0/0 .text procBoomerangSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E0FA0-800E1060 0DB8E0 00C0+00 1/0 0/0 0/0 .text procBoomerangSubject__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1060-800E10F4 0DB9A0 0094+00 1/1 0/0 0/0 .text procBoomerangMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E10F4-800E11D8 0DBA34 00E4+00 1/0 0/0 0/0 .text procBoomerangMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangMove() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800E11D8-800E1248 0DBB18 0070+00 1/1 0/0 0/0 .text procBoomerangCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1248-800E12E0 0DBB88 0098+00 1/0 0/0 0/0 .text procBoomerangCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoomerangCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 800E12E0-800E1310 0DBC20 0030+00 1/1 0/0 0/0 .text checkLv6BossRoom__9daAlink_cFv */ -BOOL daAlink_c::checkLv6BossRoom() { - return checkStageName("D_MN06A"); -} - -/* 800E1310-800E1320 0DBC50 0010+00 0/0 0/0 1/1 .text getCopyRodBallSpeed__9daAlink_cCFv - */ -f32 daAlink_c::getCopyRodBallSpeed() const { - return daAlinkHIO_copyRod_c0::m.mBallSpeed; -} - -/* 800E1320-800E1330 0DBC60 0010+00 0/0 0/0 1/1 .text getCopyRodBallReturnSpeed__9daAlink_cCFv */ -f32 daAlink_c::getCopyRodBallReturnSpeed() const { - return daAlinkHIO_copyRod_c0::m.mBallReturnSpeed; -} - -/* 800E1330-800E1374 0DBC70 0044+00 3/3 0/0 2/2 .text getCopyRodBallDisMax__9daAlink_cCFv - */ -f32 daAlink_c::getCopyRodBallDisMax() const { - if (checkLv6BossRoom()) { - return daAlinkHIO_copyRod_c0::m.mBossBallMaxDistance; - } - - return daAlinkHIO_copyRod_c0::m.mBallMaxDistance; -} - -/* 800E1374-800E1390 0DBCB4 001C+00 6/6 0/0 7/7 .text getCopyRodControllActor__9daAlink_cFv */ -fopAc_ac_c* daAlink_c::getCopyRodControllActor() { - if (mCopyRodAcKeep.getActor() != NULL) { - return static_cast(mCopyRodAcKeep.getActor())->getControllActor(); - } - - return NULL; -} - -/* 800E1390-800E13AC 0DBCD0 001C+00 0/0 4/4 1/1 .text getCopyRodCameraActor__9daAlink_cFv - */ -fopAc_ac_c* daAlink_c::getCopyRodCameraActor() { - if (mCopyRodAcKeep.getActor() != NULL) { - return static_cast(mCopyRodAcKeep.getActor())->getCameraActor(); - } - - return NULL; -} - -/* 800E13AC-800E1408 0DBCEC 005C+00 2/2 0/0 0/0 .text initCopyRodUpperAnimeSpeed__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s" -} -#pragma pop - -/* void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { - if (checkCopyRodThrowAnime()) { - if (param_1 == 0) { - mFrameCtrl2[2].setRate(); - } - f32 tmp = FLOAT_LABEL(lit_6108); - mFrameCtrl2[2].setRate(tmp); - mFrameCtrl2[2].setFrame(tmp); - - } -} */ - -/* 800E1408-800E145C 0DBD48 0054+00 2/2 0/0 0/0 .text checkForestOldCentury__9daAlink_cFv - */ -BOOL daAlink_c::checkForestOldCentury() { - return checkStageName("F_SP117") && dComIfGp_roomControl_getStayNo() == 2; -} - -/* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCopyRodTopUse() { - nofralloc -#include "asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1530-800E158C 0DBE70 005C+00 4/4 0/0 0/0 .text checkCopyRodAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCopyRodAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800E158C-800E15FC 0DBECC 0070+00 2/2 0/0 0/0 .text setCopyRodControllAnime__9daAlink_cFv */ -void daAlink_c::setCopyRodControllAnime() { - if (checkNoUpperAnime() && getCopyRodControllActor()) { - setUpperAnimeBaseSpeed(0x202, FLOAT_LABEL(lit_6108), lit_6109); - field_0x2f96 = 2; - field_0x2f97 = 5; - field_0x33e8 = FLOAT_LABEL(lit_6108); - } -} - -/* 800E15FC-800E1748 0DBF3C 014C+00 1/1 0/0 0/0 .text - * setCopyRodControllUpperSpeedRate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodControllUpperSpeedRate() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodControllUpperSpeedRate__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1748-800E1840 0DC088 00F8+00 2/2 0/0 0/0 .text setCopyRodModel__9daAlink_cFv */ -void daAlink_c::setCopyRodModel() { - JKRHeap* heap = setItemHeap(); - J3DModelData* mdl_data = loadAramBmd(0x315, 0x5400); - mHeldItemModel = initModel(mdl_data, 0x80000, 0x1000000); - field_0x0724 = loadAramItemBrk(0x323, mHeldItemModel); - mDoExt_setCurrentHeap(heap); - field_0x0724->setFrame(FLOAT_LABEL(lit_6108)); - field_0x2f94 = 2; - field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); - field_0x122C[0].SetAtAtp(0); - field_0x122C[0].SetAtSe(20); - field_0x122C[0].SetAtHitMark(1); - field_0x122C[0].OnAtSetBit(); - field_0x122C[0].SetAtHitCallback(NULL); - field_0x122C[0].SetAtMtrl(0); - mHeldItemModel->i_setBaseTRMtx(field_0x0650->i_getAnmMtx(field_0x30c0)); - mHeldItemModel->calc(); -} - -/* 800E1840-800E191C 0DC180 00DC+00 2/2 0/0 0/0 .text setCopyRodReadyAnime__9daAlink_cFv - */ -// regalloc -#ifdef NONMATCHING -void daAlink_c::setCopyRodReadyAnime() { - f32 tmp; - if (i_checkAttentionLock()) { - tmp = daAlinkHIO_boom_c0::m.valc; - } else { - tmp = FLOAT_LABEL(lit_6108); - } - - setUpperAnimeBaseSpeed(0x54, tmp, lit_6109); - if (checkCopyRodTopUse()) { - seStartSwordCut(Z2SE_AL_COPYROD_READY); - } else { - seStartSwordCut(Z2SE_AL_COPYROD_READY_OFF); - } - field_0x122C[0].SetR(lit_8676); - field_0x122C[0].SetAtType(0x1000000); - initLockAt(); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text throwCopyRod__9daAlink_cFv */ -void daAlink_c::throwCopyRod() { - daCrod_c* copy_rod = static_cast(mItemActor.getActor()); - i_onNoResetFlg1(FLG1_UNK_10000); - - if (checkCopyRodTopUse()) { - copy_rod->setThrow(); - mCopyRodAcKeep = mItemActor; - i_onNoResetFlg3(COPY_ROD_THROW_AFTER); - mItemActor.clearData(); - } - dComIfGp_clearPlayerStatus0(0, 0x80); - mFastShotTime = -1; - voiceStart(Z2SE_AL_V_ATTACK_S); - seStartSwordCut(Z2SE_AL_COPYROD_SWING); - - if (mLinkAcch.ChkGroundHit()) { - if (checkZeroSpeedF()) { - field_0x2f98 = 3; - procAtnActorWaitInit(); - } else { - procAtnActorMoveInit(); - } - field_0x2060->initOldFrameMorf(FLOAT_LABEL(lit_6108), 0, 35); - } -} - -/* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text returnCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::returnCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s" -} -#pragma pop - -/* void daAlink_c::returnCopyRod() { - i_offNoResetFlg3(COPY_ROD_THROW_AFTER); - - if (mEquipItem == 0x46) { - mItemActor = mCopyRodAcKeep; - i_onNoResetFlg0(FLG0_UNK_20); - cXyz tmp(0, 1, 0); - dComIfGp_getVibration().StartShock(1, 1, tmp); - } - mCopyRodAcKeep.clearData(); -} */ - -/* 800E1ADC-800E1BB4 0DC41C 00D8+00 2/2 0/0 0/0 .text checkUpperItemActionCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1BB4-800E1C44 0DC4F4 0090+00 1/1 0/0 0/0 .text checkUpperItemActionCopyRodFly__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionCopyRodFly() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1C44-800E1D6C 0DC584 0128+00 2/2 0/0 0/0 .text checkNextActionCopyRod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionCopyRod() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1D6C-800E1E20 0DC6AC 00B4+00 1/1 0/0 0/0 .text setCopyRodSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCopyRodSight() { - nofralloc -#include "asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1E20-800E1EB0 0DC760 0090+00 1/1 0/0 0/0 .text procCopyRodSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1EB0-800E1F68 0DC7F0 00B8+00 1/0 0/0 0/0 .text procCopyRodSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1F68-800E1FFC 0DC8A8 0094+00 1/1 0/0 0/0 .text procCopyRodMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E1FFC-800E20C8 0DC93C 00CC+00 1/0 0/0 0/0 .text procCopyRodMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800E20C8-800E21FC 0DCA08 0134+00 1/1 0/0 0/0 .text procCopyRodSwingInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSwingInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E21FC-800E2308 0DCB3C 010C+00 1/0 0/0 0/0 .text procCopyRodSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodSwing() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s" -} -#pragma pop - -/* 800E2308-800E23A4 0DCC48 009C+00 1/0 0/0 0/0 .text procCopyRodReviveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodReviveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E23A4-800E23FC 0DCCE4 0058+00 1/0 0/0 0/0 .text procCopyRodRevive__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCopyRodRevive() { - nofralloc -#include "asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s" -} -#pragma pop - -/* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text concatMagneBootMtx__9daAlink_cFv */ -void daAlink_c::concatMagneBootMtx() { - if (i_checkMagneBootsOn()) { - mDoMtx_stack_c::concat(mMagneBootMtx); - } -} - -/* 800E243C-800E247C 0DCD7C 0040+00 1/1 0/0 0/0 .text concatMagneBootInvMtx__9daAlink_cFv - */ -void daAlink_c::concatMagneBootInvMtx() { - if (i_checkMagneBootsOn()) { - mDoMtx_stack_c::concat(mMagneBootInvMtx); - } -} - -/* 800E247C-800E24B0 0DCDBC 0034+00 8/8 0/0 0/0 .text multVecMagneBootInvMtx__9daAlink_cFP4cXyz */ -void daAlink_c::multVecMagneBootInvMtx(cXyz* vec) { - if (i_checkMagneBootsOn()) { - mDoMtx_multVecSR(mMagneBootInvMtx, vec, vec); - } -} - -/* 800E24B0-800E251C 0DCDF0 006C+00 2/2 0/0 0/0 .text - * commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz */ -int daAlink_c::commonMagneLineCheck(cXyz* param_0, cXyz* param_1) { - mMagneLineChk.Set(param_0, param_1, this); - - if (dComIfG_Bgsp().LineCross(&mMagneLineChk) && daTagMagne_c::checkMagnetCode(mMagneLineChk)) { - return 1; - } - - return 0; -} - -/* 800E251C-800E2580 0DCE5C 0064+00 2/2 0/0 0/0 .text checkBootsMoveAnime__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBootsMoveAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s" -} -#pragma pop - -/* 800E2580-800E2738 0DCEC0 01B8+00 17/17 0/0 0/0 .text setHeavyBoots__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHeavyBoots(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setHeavyBoots__9daAlink_cFi.s" -} -#pragma pop - -/* 800E2738-800E2808 0DD078 00D0+00 2/2 0/0 0/0 .text getMagneBootsLocalAngleY__9daAlink_cFsi */ -// matches with literals -#ifdef NONMATCHING -s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) { - if (param_1 == 1 || (param_1 != 2 && field_0x3114 <= 0x4000 && field_0x3114 != -0x8000)) { - return param_0; - } - - cXyz vec(cM_ssin(param_0), 0.0f, cM_scos(param_0)); - mDoMtx_stack_c::YrotS(field_0x3116); - mDoMtx_stack_c::XrotM(-0x8000); - mDoMtx_stack_c::YrotM(-field_0x3116); - mDoMtx_stack_c::multVec(&vec, &vec); - - return vec.atan2sX_Z(); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/getMagneBootsLocalAngleY__9daAlink_cFsi.s" -} -#pragma pop -#endif - -/* 800E2808-800E2DC4 0DD148 05BC+00 3/3 0/0 0/0 .text - * setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi.s" -} -#pragma pop - -/* 800E2DC4-800E2F88 0DD704 01C4+00 7/7 0/0 0/0 .text cancelMagneBootsOn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::cancelMagneBootsOn() { - nofralloc -#include "asm/d/a/d_a_alink/cancelMagneBootsOn__9daAlink_cFv.s" -} -#pragma pop - -/* 800E2F88-800E3048 0DD8C8 00C0+00 1/1 0/0 0/0 .text checkMagneBootsFly__9daAlink_cFv */ -int daAlink_c::checkMagneBootsFly() { - if (field_0x2fb8 != 0 && i_checkEquipHeavyBoots() && !checkDeadHP() && mProcID != PROC_MAGNE_BOOTS_FLY && !checkEventRun()) { - cXyz vec(field_0x369c); - vec.normalizeZP(); - - if (mMagneBootsTopVec.getDotProduct(vec) > lit_8131 && procMagneBootsFlyInit()) { - return 1; - } - } - - return 0; -} - -/* 800E3048-800E30DC 0DD988 0094+00 2/2 0/0 0/0 .text procBootsEquipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBootsEquipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E30DC-800E3218 0DDA1C 013C+00 1/0 0/0 0/0 .text procBootsEquip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBootsEquip() { - nofralloc -#include "asm/d/a/d_a_alink/procBootsEquip__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3218-800E3454 0DDB58 023C+00 1/1 0/0 0/0 .text procMagneBootsFlyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procMagneBootsFlyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procMagneBootsFlyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3454-800E3760 0DDD94 030C+00 1/0 0/0 0/0 .text procMagneBootsFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMagneBootsFly() { - nofralloc -#include "asm/d/a/d_a_alink/procMagneBootsFly__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3760-800E3770 0DE0A0 0010+00 0/0 0/0 7/7 .text getBombExplodeTime__9daAlink_cCFv - */ -s16 daAlink_c::getBombExplodeTime() const { - return daAlinkHIO_bomb_c0::m.mExplodeTime; -} - -/* 800E3770-800E3780 0DE0B0 0010+00 0/0 0/0 2/2 .text getBombGravity__9daAlink_cCFv */ -f32 daAlink_c::getBombGravity() const { - return daAlinkHIO_bomb_c0::m.mGravity; -} - -/* 800E3780-800E3790 0DE0C0 0010+00 0/0 0/0 2/2 .text getBombMaxFallSpeed__9daAlink_cCFv - */ -f32 daAlink_c::getBombMaxFallSpeed() const { - return daAlinkHIO_bomb_c0::m.mMaxFallSpeed; -} - -/* 800E3790-800E37A0 0DE0D0 0010+00 0/0 0/0 1/1 .text getBombBoundRate__9daAlink_cCFv */ -f32 daAlink_c::getBombBoundRate() const { - return daAlinkHIO_bomb_c0::m.mBoundRate; -} - -/* 800E37A0-800E37B0 0DE0E0 0010+00 0/0 0/0 1/1 .text getBombStopSpeedY__9daAlink_cCFv */ -f32 daAlink_c::getBombStopSpeedY() const { - return daAlinkHIO_bomb_c0::m.mStopSpeedY; -} - -/* 800E37B0-800E37C0 0DE0F0 0010+00 0/0 0/0 1/1 .text getBombMaxSpeedY__9daAlink_cCFv */ -f32 daAlink_c::getBombMaxSpeedY() const { - return daAlinkHIO_bomb_c0::m.mMaxSpeedY; -} - -/* 800E37C0-800E37D0 0DE100 0010+00 0/0 0/0 1/1 .text getBombEffScale__9daAlink_cCFv */ -f32 daAlink_c::getBombEffScale() const { - return daAlinkHIO_bomb_c0::m.mEffScale; -} - -/* 800E37D0-800E37E0 0DE110 0010+00 0/0 0/0 1/1 .text getBombAtR__9daAlink_cCFv */ -f32 daAlink_c::getBombAtR() const { - return daAlinkHIO_bomb_c0::m.mAtRadius; -} - -/* 800E37E0-800E37F0 0DE120 0010+00 0/0 0/0 1/1 .text getEnemyBombColorR__9daAlink_cCFv - */ -s16 daAlink_c::getEnemyBombColorR() const { - return daAlinkHIO_bomb_c0::m.mEnemyBombColorR; -} - -/* 800E37F0-800E3800 0DE130 0010+00 0/0 0/0 2/2 .text getBombWaterGravity__9daAlink_cCFv - */ -f32 daAlink_c::getBombWaterGravity() const { - return daAlinkHIO_bomb_c0::m.mWaterGravity; -} - -/* 800E3800-800E3810 0DE140 0010+00 0/0 0/0 2/2 .text getBombWaterMaxFallSpeed__9daAlink_cCFv */ -f32 daAlink_c::getBombWaterMaxFallSpeed() const { - return daAlinkHIO_bomb_c0::m.mWaterMaxFallSpeed; -} - -/* 800E3810-800E3820 0DE150 0010+00 0/0 0/0 1/1 .text - * getBombExplodeWaterEffectLimit__9daAlink_cCFv */ -f32 daAlink_c::getBombExplodeWaterEffectLimit() const { - return daAlinkHIO_bomb_c0::m.mExplodeWaterEffectLimit; -} - -/* 800E3820-800E3830 0DE160 0010+00 0/0 0/0 1/1 .text getBombInsectLimitAngle__9daAlink_cCFv */ -s16 daAlink_c::getBombInsectLimitAngle() const { - return daAlinkHIO_bomb_c0::m.mBombInsectLimitAngle; -} - -/* 800E3830-800E3858 0DE170 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallA__FP10fopAc_ac_c */ -static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) { - if (fopAcM_GetName(p_actor) == PROC_Obj_Carry && - static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S) { - return true; - } - return false; -} - -/* 800E3858-800E3880 0DE198 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallB__FP10fopAc_ac_c */ -static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor) { - if (fopAcM_GetName(p_actor) == PROC_Obj_Carry && - static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S_2) { - return true; - } - return false; -} - -/* 800E3880-800E38EC 0DE1C0 006C+00 1/1 0/0 0/0 .text daAlink_searchLightBall__FP10fopAc_ac_cPv */ -static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1) { - if ((daPy_py_c::checkCarryStartLightBallA() && daAlink_checkLightBallA(p_actor)) || - (daPy_py_c::checkCarryStartLightBallB() && daAlink_checkLightBallB(p_actor))) { - return p_actor; - } - return NULL; -} - -/* 800E38EC-800E3994 0DE22C 00A8+00 1/1 0/0 0/0 .text checkGrabLineCheck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabLineCheck() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabLineCheck__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3994-800E3A14 0DE2D4 0080+00 1/0 0/0 0/0 .text - * setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo */ -// matches with literals -#ifdef NONMATCHING -void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { - if (param_2 != NULL) { - mPolyInfo4.SetPolyInfo(*param_2); - } else { - mPolyInfo4.ClearPi(); - } - - field_0x342c = param_0 * 0.8f; - field_0x3430 = param_1 * 0.8f; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s" -} -#pragma pop -#endif - -/* 800E3A14-800E3A9C 0DE354 0088+00 1/0 0/0 0/0 .text exchangeGrabActor__9daAlink_cFP10fopAc_ac_c - */ -bool daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { - fopAc_ac_c* actor = mGrabItemActor.getActor(); - - if (actor == NULL) { - return false; - } - - fopAcM_cancelCarryNow(actor); - actor->mCollisionRot.z = 0; - actor->mCollisionRot.x = 0; - if (checkGrabCarryActor()) { - actor->mCurrent.mAngle.z = 0; - actor->mCurrent.mAngle.x = 0; - } - setGrabItemActor(p_actor); - return true; -} - -/* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */ -bool daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { - if (((param_1 != 0 || !checkEventRun()) && !i_checkWolf()) && - (((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && - ((i_checkModeFlg(MODE_UNK_10000000) && - (checkHorseNoUpperAnime() || checkHorseTurnAnime())) || - param_2 != 0 && checkHookshotAnime()))) { - deleteEquipItem(1, 0); - setGrabItemActor(p_actor); - field_0x33e4 = lit_8785; - setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); - return true; - } - return false; -} - -/* 800E3BCC-800E3C1C 0DE50C 0050+00 2/2 0/0 0/0 .text getGrabThrowRate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getGrabThrowRate() { - nofralloc -#include "asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3C1C-800E3C6C 0DE55C 0050+00 3/3 0/0 0/0 .text checkGrabThrowAnime__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabThrowAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800E3C6C-800E3C9C 0DE5AC 0030+00 25/25 0/0 0/0 .text checkGrabAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800E3C9C-800E3CF4 0DE5DC 0058+00 5/5 0/0 0/0 .text checkGrabAnimeAndThrow__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabAnimeAndThrow() const { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s" -} -#pragma pop - -/* 800E3CF4-800E3D1C 0DE634 0028+00 10/10 0/0 0/0 .text checkGrabCarryActor__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGrabCarryActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3D1C-800E3D6C 0DE65C 0050+00 1/1 0/0 0/0 .text checkGrabSlowMoveActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabSlowMoveActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabSlowMoveActor__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3D6C-800E3D94 0DE6AC 0028+00 1/1 0/0 0/0 .text checkGrabHeavyActor__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabHeavyActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3D94-800E3DBC 0DE6D4 0028+00 2/2 0/0 0/0 .text checkGrabSideActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabSideActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s" -} -#pragma pop - -/* 800E3DBC-800E3F20 0DE6FC 0164+00 5/5 0/0 0/0 .text setGrabUpperAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabUpperAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGrabUpperAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 800E3F20-800E3F50 0DE860 0030+00 8/8 0/0 0/0 .text checkGrabRooster__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabRooster() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 80425628-80425634 052348 000C+00 0/1 0/0 0/0 .bss @4421 */ -#pragma push -#pragma force_active on -static u8 lit_4421[12]; -#pragma pop - -/* 80425634-80425640 052354 000C+00 2/3 0/0 0/0 .bss l_wolfRopeBaseAnime */ -static f32 l_wolfRopeBaseAnime[3]; - -/* 80425640-8042564C 052360 000C+00 0/1 0/0 0/0 .bss @14255 */ -#pragma push -#pragma force_active on -static u8 lit_14255[12]; -#pragma pop - -/* 8042564C-80425658 05236C 000C+00 0/1 0/0 0/0 .bss grabCarryOffset0$14254 */ -#pragma push -#pragma force_active on -static u8 grabCarryOffset0[12]; -#pragma pop - -/* 80425658-80425664 052378 000C+00 0/1 0/0 0/0 .bss @14259 */ -#pragma push -#pragma force_active on -static u8 lit_14259[12]; -#pragma pop - -/* 80425664-80425670 052384 000C+00 0/1 0/0 0/0 .bss grabCarryOffset1$14258 */ -#pragma push -#pragma force_active on -static u8 grabCarryOffset1[12]; -#pragma pop - -/* 80425670-8042567C 052390 000C+00 0/1 0/0 0/0 .bss @14263 */ -#pragma push -#pragma force_active on -static u8 lit_14263[12]; -#pragma pop - -/* 8042567C-80425688 05239C 000C+00 0/1 0/0 0/0 .bss grabCarryOffset2$14262 */ -#pragma push -#pragma force_active on -static u8 grabCarryOffset2[12]; -#pragma pop - -/* 80425688-80425694 0523A8 000C+00 0/1 0/0 0/0 .bss @14267 */ -#pragma push -#pragma force_active on -static u8 lit_14267[12]; -#pragma pop - -/* 80425694-804256A0 0523B4 000C+00 0/1 0/0 0/0 .bss grabCarryOffset3$14266 */ -#pragma push -#pragma force_active on -static u8 grabCarryOffset3[12]; -#pragma pop - -/* 800E3F50-800E4BD4 0DE890 0C84+00 1/1 0/0 0/0 .text setGrabItemPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabItemPos() { - nofralloc -#include "asm/d/a/d_a_alink/setGrabItemPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800E4BD4-800E4DEC 0DF514 0218+00 16/16 0/0 0/0 .text freeGrabItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::freeGrabItem() { - nofralloc -#include "asm/d/a/d_a_alink/freeGrabItem__9daAlink_cFv.s" -} -#pragma pop - -/* 800E4DEC-800E4FA8 0DF72C 01BC+00 1/1 0/0 0/0 .text setGrabUpperSpeedRate__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabUpperSpeedRate() { - nofralloc -#include "asm/d/a/d_a_alink/setGrabUpperSpeedRate__9daAlink_cFv.s" -} -#pragma pop - -/* 800E4FA8-800E5150 0DF8E8 01A8+00 7/7 0/0 0/0 .text setCarryArmAngle__9daAlink_cFff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setCarryArmAngle__9daAlink_cFff.s" -} -#pragma pop - -/* 800E5150-800E5170 0DFA90 0020+00 1/1 0/0 0/0 .text checkGrabNotThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabNotThrow() { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800E5170-800E53AC 0DFAB0 023C+00 1/1 0/0 0/0 .text checkNextActionGrab__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionGrab() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionGrab__9daAlink_cFv.s" -} -#pragma pop - -/* 800E53AC-800E53F8 0DFCEC 004C+00 2/2 0/0 0/0 .text initGrabNextMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initGrabNextMode() { - nofralloc -#include "asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s" -} -#pragma pop - -/* 800E53F8-800E57AC 0DFD38 03B4+00 3/3 0/0 0/0 .text setGrabItemThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabItemThrow() { - nofralloc -#include "asm/d/a/d_a_alink/setGrabItemThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800E57AC-800E5830 0E00EC 0084+00 2/2 0/0 0/0 .text checkUpperGrabItemThrow__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperGrabItemThrow(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperGrabItemThrow__9daAlink_cFf.s" -} -#pragma pop - -/* 800E5830-800E5B6C 0E0170 033C+00 2/2 0/0 0/0 .text - * putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c.s" -} -#pragma pop - -/* 800E5B6C-800E5BB4 0E04AC 0048+00 3/3 0/0 0/0 .text grabLineCheck__9daAlink_cFP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::grabLineCheck(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s" -} -#pragma pop - -/* 800E5BB4-800E5CBC 0E04F4 0108+00 6/6 0/0 0/0 .text setGrabItemActor__9daAlink_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrabItemActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGrabItemActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800E5CBC-800E5EC8 0E05FC 020C+00 2/2 0/0 0/0 .text procGrabReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E5EC8-800E5FD0 0E0808 0108+00 1/0 0/0 0/0 .text procGrabReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabReady() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabReady__9daAlink_cFv.s" -} -#pragma pop - -/* 800E5FD0-800E6230 0E0910 0260+00 1/1 0/0 0/0 .text procGrabUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6230-800E637C 0E0B70 014C+00 1/0 0/0 0/0 .text procGrabUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabUp() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800E637C-800E63F0 0E0CBC 0074+00 1/0 0/0 0/0 .text procGrabMiss__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabMiss() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabMiss__9daAlink_cFv.s" -} -#pragma pop - -/* 800E63F0-800E65F8 0E0D30 0208+00 1/1 0/0 0/0 .text procGrabThrowInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabThrowInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procGrabThrowInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800E65F8-800E672C 0E0F38 0134+00 1/0 0/0 0/0 .text procGrabThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800E672C-800E6914 0E106C 01E8+00 2/2 0/0 0/0 .text procGrabPutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabPutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabPutInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6914-800E6A9C 0E1254 0188+00 1/0 0/0 0/0 .text procGrabPut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabPut() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabPut__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6A9C-800E6C34 0E13DC 0198+00 2/2 0/0 0/0 .text procGrabWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6C34-800E6D6C 0E1574 0138+00 1/0 0/0 0/0 .text procGrabWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabWait() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6D6C-800E6E0C 0E16AC 00A0+00 2/2 0/0 0/0 .text procGrabReboundInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabReboundInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procGrabReboundInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800E6E0C-800E6EEC 0E174C 00E0+00 1/0 0/0 0/0 .text procGrabRebound__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabRebound() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabRebound__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6EEC-800E6FE0 0E182C 00F4+00 2/2 0/0 0/0 .text procGrabStandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabStandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabStandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E6FE0-800E70C0 0E1920 00E0+00 1/0 0/0 0/0 .text procGrabStand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrabStand() { - nofralloc -#include "asm/d/a/d_a_alink/procGrabStand__9daAlink_cFv.s" -} -#pragma pop - -/* 800E70C0-800E70FC 0E1A00 003C+00 1/1 0/0 0/0 .text - * checkInsectActorName__9daAlink_cFP10fopAc_ac_c */ -bool daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) { - s16 insectName = fopAcM_GetName(insectActor); - - for (int i = 0; i < 12; i++) { - if (insectName == l_insectNameList[i]) { - return true; - } - } - return false; -} - -/* 800E70FC-800E71D4 0E1A3C 00D8+00 2/2 0/0 0/0 .text procInsectCatchInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procInsectCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procInsectCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E71D4-800E7254 0E1B14 0080+00 1/0 0/0 0/0 .text procInsectCatch__9daAlink_cFv */ -bool daAlink_c::procInsectCatch() { - daPy_frameCtrl_c* tmp = &mFrameCtrl1[0]; - - if (tmp->checkAnmEnd()) { - checkNextAction(0); - } else { - if (tmp->checkPass(field_0x3478)) { - fopAc_ac_c* tmp2 = field_0x280c.getActor(); - if (tmp2 != NULL) { - fopAcM_setCarryNow(tmp2, 0); - } - } - } - return true; -} - -/* 800E7254-800E7460 0E1B94 020C+00 2/2 0/0 0/0 .text procPickUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPickUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procPickUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7460-800E75EC 0E1DA0 018C+00 1/0 0/0 0/0 .text procPickUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPickUp() { - nofralloc -#include "asm/d/a/d_a_alink/procPickUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800E75EC-800E76E0 0E1F2C 00F4+00 3/3 0/0 0/0 .text procPickPutInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPickPutInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procPickPutInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800E76E0-800E7894 0E2020 01B4+00 1/0 0/0 0/0 .text procPickPut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPickPut() { - nofralloc -#include "asm/d/a/d_a_alink/procPickPut__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7894-800E794C 0E21D4 00B8+00 2/2 0/0 0/0 .text checkSetChainPullAnime__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSetChainPullAnime(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSetChainPullAnime__9daAlink_cFs.s" -} -#pragma pop - -/* 800E794C-800E7994 0E228C 0048+00 3/3 0/0 0/0 .text getChainStickAngleY__9daAlink_cCFs - */ -// one instruction off -#ifdef NONMATCHING -s16 daAlink_c::getChainStickAngleY(s16 param_0) const { - s16 tmp = field_0x2fe2 - param_0; - - if (tmp >= 14336 && tmp < 32640) { - return param_0 + 32640; - } else if (tmp <= -14336 && tmp <= -32640) { - return field_0x2fe2; - } - return param_0 - 32640; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s16 daAlink_c::getChainStickAngleY(s16 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s" -} -#pragma pop -#endif - -/* 800E7994-800E79F8 0E22D4 0064+00 1/1 0/0 0/0 .text checkChainEmphasys__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkChainEmphasys() { - nofralloc -#include "asm/d/a/d_a_alink/checkChainEmphasys__9daAlink_cFv.s" -} -#pragma pop - -/* 800E79F8-800E7AEC 0E2338 00F4+00 4/4 0/0 0/0 .text searchFmChainPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::searchFmChainPos() { - nofralloc -#include "asm/d/a/d_a_alink/searchFmChainPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7AEC-800E7BD0 0E242C 00E4+00 0/0 1/1 0/0 .text - * setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi.s" -} -#pragma pop - -/* 800E7BD0-800E7C30 0E2510 0060+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daAlink_cFv */ -bool daAlink_c::checkChainBlockPushPull() { - if (i_checkFmChainGrabAnime()) { - fopAc_ac_c* actor = field_0x2844.getActor(); - if (actor != NULL) { - s16 name = fopAcM_GetName(actor); - // actor is Cblock || chainSw || Cwall - if (name == 0x7E || name == 0x16F || name == 0x7F) { - return true; - } - } - } - return false; -} - -/* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text procFmChainUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFmChainUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFmChainUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7CC0-800E7DD8 0E2600 0118+00 1/0 0/0 0/0 .text procFmChainUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFmChainUp() { - nofralloc -#include "asm/d/a/d_a_alink/procFmChainUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7DD8-800E7E50 0E2718 0078+00 2/1 0/0 0/0 .text procFmChainStrongPullInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFmChainStrongPullInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFmChainStrongPullInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7E50-800E7ED0 0E2790 0080+00 1/0 0/0 0/0 .text procFmChainStrongPull__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFmChainStrongPull() { - nofralloc -#include "asm/d/a/d_a_alink/procFmChainStrongPull__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7ED0-800E7EE4 0E2810 0014+00 9/9 0/0 0/0 .text setWallGrabStatus__9daAlink_cFUcUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWallGrabStatus(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWallGrabStatus__9daAlink_cFUcUc.s" -} -#pragma pop - -/* 800E7EE4-800E7EF4 0E2824 0010+00 2/2 0/0 0/0 .text getWallGrabStatus__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWallGrabStatus() { - nofralloc -#include "asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s" -} -#pragma pop - -/* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text wallGrabTrigger__9daAlink_cFv */ -void daAlink_c::wallGrabTrigger() { - itemTriggerCheck(BTN_R); -} - -/* 800E7F18-800E7F3C 0E2858 0024+00 4/4 0/0 0/0 .text wallGrabButton__9daAlink_cFv */ -void daAlink_c::wallGrabButton() { - itemButtonCheck(BTN_R); -} - -/* 800E7F3C-800E80A4 0E287C 0168+00 4/4 0/0 0/0 .text - * setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s" -} -#pragma pop - -/* 800E80A4-800E8148 0E29E4 00A4+00 2/2 0/0 0/0 .text checkPushPullTurnBlock__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPushPullTurnBlock() { - nofralloc -#include "asm/d/a/d_a_alink/checkPushPullTurnBlock__9daAlink_cFv.s" -} -#pragma pop - -/* 800E8148-800E8298 0E2A88 0150+00 1/1 0/0 0/0 .text checkPullBehindWall__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPullBehindWall() { - nofralloc -#include "asm/d/a/d_a_alink/checkPullBehindWall__9daAlink_cFv.s" -} -#pragma pop - -/* 800E8298-800E82B0 0E2BD8 0018+00 3/3 0/0 0/0 .text offGoatStopGame__9daAlink_cFv */ -void daAlink_c::offGoatStopGame() { - if (mSpecialMode != SMODE_GOAT_STOP) { - return; - } else { - mSpecialMode = 0; - } -} - -/* 800E82B0-800E8314 0E2BF0 0064+00 4/4 0/0 0/0 .text - * checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c */ -#ifdef NONMATCHING -BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { - s16 name = fopAcM_GetName(param_0); - bool check = false; - - if (name == 0x1b1 || name == 0x21) { - if (checkSpecialNpc(param_0) || name == 0x106) { - check = true; - } - } - - return check; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop -#endif - -/* 800E8314-800E8334 0E2C54 0020+00 2/2 0/0 0/0 .text getGoatCatchDistance2__9daAlink_cFv - */ -float daAlink_c::getGoatCatchDistance2() { - if (field_0x27f4->mBase.mProcName == 0x216) { - return lit_16066; - } - return lit_16067; -} - -/* 800E8334-800E8354 0E2C74 0020+00 3/3 0/0 0/0 .text endPushPull__9daAlink_cFv */ -void daAlink_c::endPushPull() { - checkWaitAction(); -} - -/* 800E8354-800E8428 0E2C94 00D4+00 2/2 0/0 0/0 .text getPushPullAnimeSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getPushPullAnimeSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getPushPullAnimeSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800E8428-800E857C 0E2D68 0154+00 4/4 0/0 0/0 .text procCoPushPullWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPushPullWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCoPushPullWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800E857C-800E875C 0E2EBC 01E0+00 1/0 0/0 0/0 .text procCoPushPullWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPushPullWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPushPullWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800E875C-800E89F0 0E309C 0294+00 2/2 0/0 0/0 .text procCoPushMoveInit__9daAlink_cFii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPushMoveInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procCoPushMoveInit__9daAlink_cFii.s" -} -#pragma pop - -/* 800E89F0-800E8D1C 0E3330 032C+00 1/0 0/0 0/0 .text procCoPushMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoPushMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCoPushMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800E8D1C-800E8F44 0E365C 0228+00 2/2 0/0 0/0 .text procPullMoveInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPullMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procPullMoveInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800E8F44-800E91B0 0E3884 026C+00 1/0 0/0 0/0 .text procPullMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procPullMove() { - nofralloc -#include "asm/d/a/d_a_alink/procPullMove__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_grab.inc" /* 800E91B0-800E91C4 0E3AF0 0014+00 1/1 0/0 0/0 .text daAlink_searchGoat__FP10fopAc_ac_cPv */ static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* param_0, void* param_1) { @@ -24933,7134 +16536,33 @@ asm void daAlink_c::procGoronMove() { } #pragma pop -/* 800EA844-800EA8D0 0E5184 008C+00 5/5 0/0 0/0 .text checkSumouVsActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSumouVsActor() { - nofralloc -#include "asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_sumou.inc" -/* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text cancelSumouMode__9daAlink_cFv */ -void daAlink_c::cancelSumouMode() { - mCargoCarryActor.clearData(); - mSpecialMode = 0; -} +#include "d/a/d_a_alink_horse.inc" -/* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text sumouPunchTrigger__9daAlink_cFv */ -void daAlink_c::sumouPunchTrigger() { - itemTriggerCheck(BTN_B); -} +#include "d/a/d_a_alink_canoe.inc" -/* 800EA92C-800EA950 0E526C 0024+00 5/5 0/0 0/0 .text setSumouPunchStatus__9daAlink_cFv - */ -void daAlink_c::setSumouPunchStatus() { - setBStatus(0x44); -} +#include "d/a/d_a_alink_crawl.inc" -/* 800EA950-800EAA28 0E5290 00D8+00 4/4 0/0 0/0 .text procSumouReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_hang.inc" -/* 800EAA28-800EAC4C 0E5368 0224+00 1/0 0/0 0/0 .text procSumouReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouReady() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouReady__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_swim.inc" -/* 800EAC4C-800EAD84 0E558C 0138+00 1/1 0/0 0/0 .text procSumouMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouMoveInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_iceleaf.inc" -/* 800EAD84-800EB208 0E56C4 0484+00 1/0 0/0 0/0 .text procSumouMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouMove__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_hook.inc" -/* 800EB208-800EB2BC 0E5B48 00B4+00 4/4 0/0 0/0 .text procSumouSideMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouSideMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_spinner.inc" -/* 800EB2BC-800EB624 0E5BFC 0368+00 1/0 0/0 0/0 .text procSumouSideMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouSideMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouSideMove__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_bottle.inc" -/* 800EB624-800EBCE0 0E5F64 06BC+00 4/4 0/0 0/0 .text procSumouActionInit__9daAlink_cFiii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouActionInit(int param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procSumouActionInit__9daAlink_cFiii.s" -} -#pragma pop +#include "d/a/d_a_alink_kandelaar.inc" -/* 800EBCE0-800EC0F8 0E6620 0418+00 1/0 0/0 0/0 .text procSumouAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouAction() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouAction__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_whistle.inc" -/* 800EC0F8-800EC170 0E6A38 0078+00 1/1 0/0 0/0 .text procSumouStaggerInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouStaggerInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_ironball.inc" -/* 800EC170-800EC20C 0E6AB0 009C+00 1/0 0/0 0/0 .text procSumouStagger__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouStagger() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC20C-800EC3D8 0E6B4C 01CC+00 1/1 0/0 0/0 .text procSumouWinLoseInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouWinLoseInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouWinLoseInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC3D8-800EC538 0E6D18 0160+00 1/0 0/0 0/0 .text procSumouWinLose__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouWinLose() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouWinLose__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC538-800EC5F4 0E6E78 00BC+00 1/0 0/0 0/0 .text procSumouShikoInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouShikoInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC5F4-800EC724 0E6F34 0130+00 1/0 0/0 0/0 .text procSumouShiko__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSumouShiko() { - nofralloc -#include "asm/d/a/d_a_alink/procSumouShiko__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC724-800EC758 0E7064 0034+00 3/3 0/0 0/0 .text daAlink_searchBoar__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchBoar__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800EC758-800EC76C 0E7098 0014+00 1/1 0/0 0/0 .text daAlink_searchCoach__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800EC76C-800EC7B0 0E70AC 0044+00 3/3 0/0 0/0 .text checkHorseZeldaBowMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseZeldaBowMode() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseZeldaBowMode__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC7B0-800EC7DC 0E70F0 002C+00 4/4 0/0 0/0 .text setHorseZeldaDamage__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseZeldaDamage() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseZeldaDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC7DC-800EC814 0E711C 0038+00 2/2 0/0 0/0 .text checkHorseDashAccept__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkHorseDashAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC814-800EC87C 0E7154 0068+00 1/1 0/0 0/0 .text checkCowGame__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCowGame() { - nofralloc -#include "asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC87C-800EC8F8 0E71BC 007C+00 2/2 0/0 0/0 .text getReinRideDirection__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getReinRideDirection() { - nofralloc -#include "asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s" -} -#pragma pop - -/* 800EC8F8-800ECA3C 0E7238 0144+00 1/1 0/0 0/0 .text checkReinRideBgCheck__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkReinRideBgCheck() { - nofralloc -#include "asm/d/a/d_a_alink/checkReinRideBgCheck__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECA3C-800ECAAC 0E737C 0070+00 3/3 0/0 0/0 .text commonInitForceRideRein__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonInitForceRideRein() { - nofralloc -#include "asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECAAC-800ECB58 0E73EC 00AC+00 1/1 0/0 0/0 .text initForceRideBoar__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initForceRideBoar() { - nofralloc -#include "asm/d/a/d_a_alink/initForceRideBoar__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECB58-800ECBD0 0E7498 0078+00 4/4 0/0 0/0 .text initForceRideHorse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initForceRideHorse() { - nofralloc -#include "asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECBD0-800ECD90 0E7510 01C0+00 5/5 0/0 0/0 .text rideGetOff__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::rideGetOff() { - nofralloc -#include "asm/d/a/d_a_alink/rideGetOff__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECD90-800ECDC4 0E76D0 0034+00 1/1 0/0 0/0 .text checkHorseNotDamageReaction__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseNotDamageReaction() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECDC4-800ECDEC 0E7704 0028+00 1/1 0/0 2/2 .text checkHorseWaitLashAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseWaitLashAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECDEC-800ECE10 0E772C 0024+00 1/1 0/0 0/0 .text checkHorseReinLeftOnly__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseReinLeftOnly() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECE10-800ECF04 0E7750 00F4+00 2/2 0/0 0/0 .text getReinHandType__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getReinHandType() const { - nofralloc -#include "asm/d/a/d_a_alink/getReinHandType__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECF04-800ECF5C 0E7844 0058+00 5/5 0/0 1/1 .text checkHorseLieAnime__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkHorseLieAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECF5C-800ECF9C 0E789C 0040+00 0/0 0/0 3/3 .text checkHorseSubjectivity__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseSubjectivity() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ECF9C-800ECFF4 0E78DC 0058+00 2/2 0/0 0/0 .text setHorseSwordUpAnime__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseSwordUpAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800ECFF4-800ED074 0E7934 0080+00 1/1 0/0 0/0 .text setHorseTurnUpperAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseTurnUpperAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setHorseTurnUpperAnime__9daAlink_cFi.s" -} -#pragma pop - -/* 800ED074-800ED0D4 0E79B4 0060+00 9/9 0/0 0/0 .text checkHorseNoUpperAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkHorseNoUpperAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ED0D4-800ED1F0 0E7A14 011C+00 0/0 0/0 2/2 .text getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getHorseReinHandPos(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz.s" -} -#pragma pop - -/* 800ED1F0-800ED310 0E7B30 0120+00 1/1 0/0 1/1 .text checkHorseNotGrab__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseNotGrab() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseNotGrab__9daAlink_cCFv.s" -} -#pragma pop - -/* 800ED310-800ED4B8 0E7C50 01A8+00 1/1 0/0 0/0 .text setHorseStirrup__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseStirrup() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseStirrup__9daAlink_cFv.s" -} -#pragma pop - -/* 800ED4B8-800ED4DC 0E7DF8 0024+00 1/1 0/0 0/0 .text changeBoarRunRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeBoarRunRide() { - nofralloc -#include "asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800ED4DC-800ED78C 0E7E1C 02B0+00 7/7 0/0 0/0 .text setSyncHorsePos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncHorsePos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncHorsePos__9daAlink_cFv.s" -} -#pragma pop - -/* 800ED78C-800ED90C 0E80CC 0180+00 4/4 0/0 0/0 .text setSyncBoarPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncBoarPos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncBoarPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800ED90C-800EDA24 0E824C 0118+00 1/1 0/0 0/0 .text setSyncBoarRunPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncBoarRunPos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncBoarRunPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800EDA24-800EDA78 0E8364 0054+00 33/33 0/0 0/0 .text setSyncRidePos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncRidePos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s" -} -#pragma pop - -/* 800EDA78-800EDB48 0E83B8 00D0+00 6/6 0/0 0/0 .text setHorseTurnAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseTurnAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseTurnAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800EDB48-800EDD6C 0E8488 0224+00 2/2 0/0 0/0 .text - * getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM.s" -} -#pragma pop - -/* 800EDD6C-800EDE8C 0E86AC 0120+00 9/9 0/0 0/0 .text checkHorseSpecialProc__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseSpecialProc() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseSpecialProc__9daAlink_cFv.s" -} -#pragma pop - -/* 800EDE8C-800EDEEC 0E87CC 0060+00 2/2 0/0 0/0 .text checkHorseServiceWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseServiceWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseServiceWaitAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800EDEEC-800EE64C 0E882C 0760+00 1/1 0/0 0/0 .text setSyncHorse__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncHorse(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSyncHorse__9daAlink_cFi.s" -} -#pragma pop - -/* 800EE64C-800EE918 0E8F8C 02CC+00 1/1 0/0 0/0 .text setSyncBoar__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncBoar(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSyncBoar__9daAlink_cFi.s" -} -#pragma pop - -/* 800EE918-800EEAE8 0E9258 01D0+00 12/12 0/0 0/0 .text setSyncRide__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncRide(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSyncRide__9daAlink_cFi.s" -} -#pragma pop - -/* 800EEAE8-800EEC98 0E9428 01B0+00 2/2 0/0 0/0 .text setBaseHorseAnimeFrame__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBaseHorseAnimeFrame() { - nofralloc -#include "asm/d/a/d_a_alink/setBaseHorseAnimeFrame__9daAlink_cFv.s" -} -#pragma pop - -/* 800EEC98-800EED98 0E95D8 0100+00 2/2 0/0 0/0 .text setBaseBoarAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBaseBoarAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBaseBoarAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800EED98-800EEE30 0E96D8 0098+00 18/18 0/0 0/0 .text setBaseRideAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBaseRideAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBaseRideAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800EEE30-800EEE5C 0E9770 002C+00 1/1 0/0 0/0 .text checkHorseSwordUpSpped__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseSwordUpSpped() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseSwordUpSpped__9daAlink_cFv.s" -} -#pragma pop - -/* 800EEE5C-800EEF30 0E979C 00D4+00 2/2 0/0 0/0 .text setHorseSwordUp__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseSwordUp(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setHorseSwordUp__9daAlink_cFi.s" -} -#pragma pop - -/* 800EEF30-800EF050 0E9870 0120+00 9/9 0/0 0/0 .text setRideSubjectAngle__9daAlink_cFs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRideSubjectAngle(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRideSubjectAngle__9daAlink_cFs.s" -} -#pragma pop - -/* 800EF050-800EF0E8 0E9990 0098+00 7/7 0/0 0/0 .text setBodyAngleRideReadyAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBodyAngleRideReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBodyAngleRideReadyAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF0E8-800EF198 0E9A28 00B0+00 1/1 0/0 0/0 .text - * checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseGetOffWallCheck(cXyz* param_0, cXyz* param_1, s16 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs.s" -} -#pragma pop - -/* 800EF198-800EF35C 0E9AD8 01C4+00 2/2 0/0 0/0 .text checkHorseGetOffDirection__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseGetOffDirection() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseGetOffDirection__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF35C-800EF394 0E9C9C 0038+00 4/4 0/0 0/0 .text boarForceGetOff__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::boarForceGetOff() { - nofralloc -#include "asm/d/a/d_a_alink/boarForceGetOff__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF394-800EF450 0E9CD4 00BC+00 2/2 0/0 0/0 .text horseGetOffEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::horseGetOffEnd() { - nofralloc -#include "asm/d/a/d_a_alink/horseGetOffEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF450-800EF598 0E9D90 0148+00 12/12 0/0 0/0 .text checkNextActionHorse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionHorse() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionHorse__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF598-800EF6B0 0E9ED8 0118+00 2/2 0/0 0/0 .text checkHorseGetOff__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseGetOff() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseGetOff__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF6B0-800EF884 0E9FF0 01D4+00 3/3 0/0 0/0 .text checkHorseGetOffAndSetDoStatus__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHorseGetOffAndSetDoStatus() { - nofralloc -#include "asm/d/a/d_a_alink/checkHorseGetOffAndSetDoStatus__9daAlink_cFv.s" -} -#pragma pop - -/* 800EF884-800EF95C 0EA1C4 00D8+00 2/2 0/0 0/0 .text setHorseGetOff__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseGetOff(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setHorseGetOff__9daAlink_cFi.s" -} -#pragma pop - -/* 800EF95C-800EFDC4 0EA29C 0468+00 1/1 0/0 0/0 .text procHorseRideInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseRideInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseRideInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800EFDC4-800F038C 0EA704 05C8+00 1/0 0/0 0/0 .text procHorseRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseRide() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800F038C-800F0620 0EACCC 0294+00 1/1 0/0 0/0 .text procHorseGetOffInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGetOffInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGetOffInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800F0620-800F0980 0EAF60 0360+00 1/0 0/0 0/0 .text procHorseGetOff__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGetOff() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGetOff__9daAlink_cFv.s" -} -#pragma pop - -/* 800F0980-800F0AA4 0EB2C0 0124+00 16/16 0/0 0/0 .text procHorseWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F0AA4-800F0C6C 0EB3E4 01C8+00 1/0 0/0 0/0 .text procHorseWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseWait() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800F0C6C-800F0CE4 0EB5AC 0078+00 1/1 0/0 0/0 .text procHorseTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F0CE4-800F1060 0EB624 037C+00 1/0 0/0 0/0 .text procHorseTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1060-800F10F8 0EB9A0 0098+00 1/1 0/0 0/0 .text procHorseJumpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseJumpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseJumpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F10F8-800F1188 0EBA38 0090+00 1/0 0/0 0/0 .text procHorseJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseJump() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseJump__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1188-800F1204 0EBAC8 007C+00 1/1 0/0 0/0 .text procHorseLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1204-800F1294 0EBB44 0090+00 1/0 0/0 0/0 .text procHorseLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseLand() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseLand__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1294-800F12F8 0EBBD4 0064+00 1/1 0/0 0/0 .text procHorseSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F12F8-800F13D8 0EBC38 00E0+00 1/0 0/0 0/0 .text procHorseSubjectivity__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 800F13D8-800F1688 0EBD18 02B0+00 1/1 0/0 0/0 .text procHorseCutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCutInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1688-800F1894 0EBFC8 020C+00 1/0 0/0 0/0 .text procHorseCut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCut() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCut__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1894-800F194C 0EC1D4 00B8+00 3/3 0/0 0/0 .text procHorseCutChargeReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCutChargeReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCutChargeReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F194C-800F1AAC 0EC28C 0160+00 1/0 0/0 0/0 .text procHorseCutChargeReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCutChargeReady() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCutChargeReady__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1AAC-800F1BA4 0EC3EC 00F8+00 3/3 0/0 0/0 .text procHorseCutTurnInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCutTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCutTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1BA4-800F1D18 0EC4E4 0174+00 1/0 0/0 0/0 .text procHorseCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseCutTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 800F1D18-800F2028 0EC658 0310+00 2/2 0/0 0/0 .text - * procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 800F2028-800F2150 0EC968 0128+00 1/0 0/0 0/0 .text procHorseDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2150-800F21B4 0ECA90 0064+00 1/1 0/0 0/0 .text procHorseBowSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBowSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBowSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F21B4-800F224C 0ECAF4 0098+00 1/0 0/0 0/0 .text procHorseBowSubject__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBowSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBowSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F224C-800F22A8 0ECB8C 005C+00 1/1 0/0 0/0 .text procHorseBowMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBowMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBowMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F22A8-800F2334 0ECBE8 008C+00 1/0 0/0 0/0 .text procHorseBowMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBowMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2334-800F2390 0ECC74 005C+00 2/2 0/0 0/0 .text procHorseGrabMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGrabMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGrabMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2390-800F2454 0ECCD0 00C4+00 1/0 0/0 0/0 .text procHorseGrabMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGrabMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGrabMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2454-800F24C8 0ECD94 0074+00 1/1 0/0 0/0 .text procHorseBoomerangSubjectInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBoomerangSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F24C8-800F25B4 0ECE08 00EC+00 1/0 0/0 0/0 .text procHorseBoomerangSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBoomerangSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F25B4-800F2628 0ECEF4 0074+00 1/1 0/0 0/0 .text procHorseBoomerangMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBoomerangMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2628-800F26F4 0ECF68 00CC+00 1/0 0/0 0/0 .text procHorseBoomerangMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBoomerangMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBoomerangMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F26F4-800F2770 0ED034 007C+00 1/1 0/0 0/0 .text procHorseHookshotSubjectInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHookshotSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2770-800F2824 0ED0B0 00B4+00 1/0 0/0 0/0 .text procHorseHookshotSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHookshotSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2824-800F2898 0ED164 0074+00 1/1 0/0 0/0 .text procHorseHookshotMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHookshotMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2898-800F2934 0ED1D8 009C+00 1/0 0/0 0/0 .text procHorseHookshotMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHookshotMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2934-800F2AD8 0ED274 01A4+00 1/1 0/0 0/0 .text procHorseBottleDrinkInit__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBottleDrinkInit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBottleDrinkInit__9daAlink_cFUs.s" -} -#pragma pop - -/* 800F2AD8-800F2B4C 0ED418 0074+00 1/0 0/0 0/0 .text procHorseBottleDrink__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseBottleDrink() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseBottleDrink__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2B4C-800F2C78 0ED48C 012C+00 1/1 0/0 0/0 .text procHorseKandelaarPourInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseKandelaarPourInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseKandelaarPourInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2C78-800F2D84 0ED5B8 010C+00 1/0 0/0 0/0 .text procHorseKandelaarPour__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseKandelaarPour() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseKandelaarPour__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2D84-800F2DE4 0ED6C4 0060+00 2/2 0/0 0/0 .text procHorseComebackInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseComebackInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseComebackInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2DE4-800F2EE0 0ED724 00FC+00 1/0 0/0 0/0 .text procHorseComeback__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseComeback() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseComeback__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2EE0-800F2F98 0ED820 00B8+00 2/2 0/0 0/0 .text procHorseRunInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseRunInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseRunInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F2F98-800F3430 0ED8D8 0498+00 1/0 0/0 0/0 .text procHorseRun__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseRun() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseRun__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3430-800F3580 0EDD70 0150+00 1/1 0/0 0/0 .text - * procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi.s" -} -#pragma pop - -/* 800F3580-800F36E4 0EDEC0 0164+00 1/0 0/0 0/0 .text procHorseHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseHang() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseHang__9daAlink_cFv.s" -} -#pragma pop - -/* 800F36E4-800F3754 0EE024 0070+00 1/0 0/0 0/0 .text procHorseGetKeyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGetKeyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGetKeyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3754-800F3818 0EE094 00C4+00 1/0 0/0 0/0 .text procHorseGetKey__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseGetKey() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseGetKey__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3818-800F3894 0EE158 007C+00 1/0 0/0 0/0 .text procHorseLookDownInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseLookDownInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseLookDownInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3894-800F38E8 0EE1D4 0054+00 1/0 0/0 0/0 .text procHorseLookDown__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHorseLookDown() { - nofralloc -#include "asm/d/a/d_a_alink/procHorseLookDown__9daAlink_cFv.s" -} -#pragma pop - -/* 800F38E8-800F3998 0EE228 00B0+00 1/1 0/0 0/0 .text procBoarRunInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoarRunInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoarRunInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3998-800F3BB0 0EE2D8 0218+00 1/0 0/0 0/0 .text procBoarRun__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoarRun() { - nofralloc -#include "asm/d/a/d_a_alink/procBoarRun__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3BB0-800F3BDC 0EE4F0 002C+00 1/1 0/0 2/2 .text getCanoeMaxSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3BDC-800F3BEC 0EE51C 0010+00 0/0 0/0 1/1 .text getCanoeBackMaxSpeed__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeBackMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3BEC-800F3C18 0EE52C 002C+00 0/0 0/0 1/1 .text getCanoeCres__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeCres() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3C18-800F3C44 0EE558 002C+00 2/2 0/0 0/0 .text getCanoeSpeedRate__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeSpeedRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3C44-800F3CCC 0EE584 0088+00 0/0 0/0 1/1 .text getCanoeMaxRotSpeed__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeMaxRotSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeMaxRotSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3CCC-800F3CD8 0EE60C 000C+00 1/1 0/0 1/1 .text getCanoeLocalPaddleTop__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoeLocalPaddleTop() { - nofralloc -#include "asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3CD8-800F3CF8 0EE618 0020+00 3/3 0/0 0/0 .text daAlink_searchCanoe__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 800F3CF8-800F3D58 0EE638 0060+00 0/0 2/2 0/0 .text checkCanoeRideTandem__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeRideTandem() { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3D58-800F3DA0 0EE698 0048+00 7/7 0/0 0/0 .text checkFishingRodAndLureItem__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFishingRodAndLureItem() const { - nofralloc -#include "asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3DA0-800F3DFC 0EE6E0 005C+00 4/4 0/0 0/0 .text initFishingRodHand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initFishingRodHand() { - nofralloc -#include "asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3DFC-800F3E4C 0EE73C 0050+00 1/1 0/0 1/1 .text getCanoePaddleMatrix__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCanoePaddleMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s" -} -#pragma pop - -/* 800F3E4C-800F3EB8 0EE78C 006C+00 0/0 0/0 4/4 .text - * checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFishingRodGrab(fopAc_ac_c* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800F3EB8-800F3F38 0EE7F8 0080+00 0/0 0/0 2/2 .text - * checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoePaddleGrab(fopAc_ac_c* param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800F3F38-800F3FC4 0EE878 008C+00 0/0 0/0 1/1 .text checkCanoeFishingRodGrabOrPut__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCanoeFishingRodGrabOrPut() const { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s" -} -#pragma pop - -/* 800F3FC4-800F4008 0EE904 0044+00 2/2 0/0 0/0 .text initCanoeRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initCanoeRide() { - nofralloc -#include "asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4008-800F40E4 0EE948 00DC+00 2/2 0/0 0/0 .text checkCanoeJumpRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkCanoeJumpRide() { - nofralloc -#include "asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800F40E4-800F4140 0EEA24 005C+00 2/2 0/0 0/0 .text setArmReelAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArmReelAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4140-800F4490 0EEA80 0350+00 1/1 0/0 0/0 .text setFishingWaitAction__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFishingWaitAction() { - nofralloc -#include "asm/d/a/d_a_alink/setFishingWaitAction__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4490-800F4564 0EEDD0 00D4+00 3/3 0/0 0/0 .text setFishGetFace__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFishGetFace() { - nofralloc -#include "asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4564-800F459C 0EEEA4 0038+00 3/3 0/0 0/0 .text - * setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800F459C-800F47D8 0EEEDC 023C+00 20/20 0/0 0/0 .text setSyncCanoePos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSyncCanoePos() { - nofralloc -#include "asm/d/a/d_a_alink/setSyncCanoePos__9daAlink_cFv.s" -} -#pragma pop - -/* 800F47D8-800F4924 0EF118 014C+00 19/19 0/0 0/0 .text canoeCommon__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::canoeCommon() { - nofralloc -#include "asm/d/a/d_a_alink/canoeCommon__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4924-800F4A50 0EF264 012C+00 10/10 0/0 0/0 .text checkNextActionCanoe__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionCanoe() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4A50-800F4B90 0EF390 0140+00 2/2 0/0 0/0 .text procCanoeRideInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRideInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4B90-800F4C78 0EF4D0 00E8+00 1/0 0/0 0/0 .text procCanoeRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRide() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4C78-800F4D84 0EF5B8 010C+00 4/4 0/0 0/0 .text - * procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800F4D84-800F4DF8 0EF6C4 0074+00 1/0 0/0 0/0 .text procCanoeJumpRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeJumpRide() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s" -} -#pragma pop - -/* 800F4DF8-800F5048 0EF738 0250+00 2/2 0/0 0/0 .text procCanoeGetOffInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeGetOffInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeGetOffInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F5048-800F51E4 0EF988 019C+00 1/1 0/0 0/0 .text procCanoeGetOff__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeGetOff() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeGetOff__9daAlink_cFv.s" -} -#pragma pop - -/* 800F51E4-800F542C 0EFB24 0248+00 15/15 0/0 0/0 .text procCanoeWaitInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800F542C-800F571C 0EFD6C 02F0+00 1/0 0/0 0/0 .text procCanoeWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800F571C-800F5A1C 0F005C 0300+00 3/3 0/0 0/0 .text procCanoeRowInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRowInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRowInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800F5A1C-800F5D04 0F035C 02E8+00 1/0 0/0 0/0 .text procCanoeRow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRow() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRow__9daAlink_cFv.s" -} -#pragma pop - -/* 800F5D04-800F5DB8 0F0644 00B4+00 1/1 0/0 0/0 .text procCanoePaddleShiftInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleShiftInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddleShiftInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800F5DB8-800F5EA8 0F06F8 00F0+00 1/0 0/0 0/0 .text procCanoePaddleShift__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleShift() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddleShift__9daAlink_cFv.s" -} -#pragma pop - -/* 800F5EA8-800F5FEC 0F07E8 0144+00 3/3 0/0 0/0 .text procCanoePaddlePutInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddlePutInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddlePutInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800F5FEC-800F6140 0F092C 0154+00 1/0 0/0 0/0 .text procCanoePaddlePut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddlePut() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddlePut__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6140-800F6188 0F0A80 0048+00 2/2 0/0 0/0 .text procCanoePaddleGrabInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleGrabInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddleGrabInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6188-800F6320 0F0AC8 0198+00 1/0 0/0 0/0 .text procCanoePaddleGrab__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoePaddleGrab() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoePaddleGrab__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6320-800F6394 0F0C60 0074+00 1/1 0/0 0/0 .text procCanoeRodGrabInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRodGrabInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRodGrabInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6394-800F6464 0F0CD4 00D0+00 1/0 0/0 0/0 .text procCanoeRodGrab__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeRodGrab() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeRodGrab__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6464-800F659C 0F0DA4 0138+00 6/6 0/0 0/0 .text procCanoeFishingWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F659C-800F67C0 0F0EDC 0224+00 1/0 0/0 0/0 .text procCanoeFishingWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800F67C0-800F6874 0F1100 00B4+00 1/1 0/0 0/0 .text procCanoeFishingReelInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingReelInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingReelInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6874-800F69D4 0F11B4 0160+00 1/0 0/0 0/0 .text procCanoeFishingReel__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingReel() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingReel__9daAlink_cFv.s" -} -#pragma pop - -/* 800F69D4-800F6A70 0F1314 009C+00 1/1 0/0 0/0 .text procCanoeFishingGetInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingGetInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingGetInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6A70-800F6BEC 0F13B0 017C+00 1/0 0/0 0/0 .text procCanoeFishingGet__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeFishingGet() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeFishingGet__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6BEC-800F6C30 0F152C 0044+00 1/1 0/0 0/0 .text procCanoeSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6C30-800F6D10 0F1570 00E0+00 1/0 0/0 0/0 .text procCanoeSubjectivity__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6D10-800F6D64 0F1650 0054+00 1/1 0/0 0/0 .text procCanoeBowSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBowSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBowSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6D64-800F6DF0 0F16A4 008C+00 1/0 0/0 0/0 .text procCanoeBowSubject__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBowSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBowSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6DF0-800F6E44 0F1730 0054+00 1/1 0/0 0/0 .text procCanoeBowMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBowMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBowMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6E44-800F6EB0 0F1784 006C+00 1/0 0/0 0/0 .text procCanoeBowMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBowMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBowMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6EB0-800F6EFC 0F17F0 004C+00 2/2 0/0 0/0 .text procCanoeGrabMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeGrabMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeGrabMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6EFC-800F6FA4 0F183C 00A8+00 1/0 0/0 0/0 .text procCanoeGrabMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeGrabMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeGrabMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F6FA4-800F7010 0F18E4 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangSubjectInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBoomerangSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7010-800F70F0 0F1950 00E0+00 1/0 0/0 0/0 .text procCanoeBoomerangSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBoomerangSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F70F0-800F715C 0F1A30 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBoomerangMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F715C-800F7208 0F1A9C 00AC+00 1/0 0/0 0/0 .text procCanoeBoomerangMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBoomerangMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBoomerangMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7208-800F7274 0F1B48 006C+00 1/1 0/0 0/0 .text procCanoeHookshotSubjectInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeHookshotSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7274-800F731C 0F1BB4 00A8+00 1/0 0/0 0/0 .text procCanoeHookshotSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeHookshotSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 800F731C-800F7388 0F1C5C 006C+00 1/1 0/0 0/0 .text procCanoeHookshotMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeHookshotMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7388-800F7404 0F1CC8 007C+00 1/0 0/0 0/0 .text procCanoeHookshotMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeHookshotMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7404-800F7550 0F1D44 014C+00 1/1 0/0 0/0 .text procCanoeBottleDrinkInit__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBottleDrinkInit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBottleDrinkInit__9daAlink_cFUs.s" -} -#pragma pop - -/* 800F7550-800F75BC 0F1E90 006C+00 1/0 0/0 0/0 .text procCanoeBottleDrink__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeBottleDrink() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeBottleDrink__9daAlink_cFv.s" -} -#pragma pop - -/* 800F75BC-800F7684 0F1EFC 00C8+00 1/1 0/0 0/0 .text procCanoeKandelaarPourInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeKandelaarPourInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeKandelaarPourInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7684-800F7708 0F1FC4 0084+00 1/0 0/0 0/0 .text procCanoeKandelaarPour__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCanoeKandelaarPour() { - nofralloc -#include "asm/d/a/d_a_alink/procCanoeKandelaarPour__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7708-800F7760 0F2048 0058+00 2/2 0/0 0/0 .text setGroundFishingRodActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGroundFishingRodActor() { - nofralloc -#include "asm/d/a/d_a_alink/setGroundFishingRodActor__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7760-800F7814 0F20A0 00B4+00 1/1 0/0 0/0 .text procFishingCastInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFishingCastInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFishingCastInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7814-800F7988 0F2154 0174+00 1/0 0/0 0/0 .text procFishingCast__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFishingCast() { - nofralloc -#include "asm/d/a/d_a_alink/procFishingCast__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7988-800F7AA8 0F22C8 0120+00 1/1 0/0 0/0 .text procFishingFoodInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFishingFoodInit() { - nofralloc -#include "asm/d/a/d_a_alink/procFishingFoodInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7AA8-800F7C50 0F23E8 01A8+00 1/0 0/0 0/0 .text procFishingFood__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procFishingFood() { - nofralloc -#include "asm/d/a/d_a_alink/procFishingFood__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7C50-800F7C74 0F2590 0024+00 2/2 0/0 0/0 .text getCrawlMoveAnmSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7C74-800F7CE8 0F25B4 0074+00 2/2 0/0 0/0 .text getCrawlMoveSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7CE8-800F7E48 0F2628 0160+00 4/4 0/0 0/0 .text setCrawlMoveDirectionArrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveDirectionArrow() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s" -} -#pragma pop - -/* 800F7E48-800F81C0 0F2788 0378+00 2/2 0/0 0/0 .text changeCrawlAutoMoveProc__9daAlink_cFP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeCrawlAutoMoveProc(cXyz* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeCrawlAutoMoveProc__9daAlink_cFP4cXyz.s" -} -#pragma pop - -/* 800F81C0-800F85C0 0F2B00 0400+00 2/2 0/0 0/0 .text - * getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3, - int param_4, u8* param_5) { - nofralloc -#include "asm/d/a/d_a_alink/getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc.s" -} -#pragma pop - -/* 800F85C0-800F8700 0F2F00 0140+00 2/2 0/0 0/0 .text crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s" -} -#pragma pop - -/* 800F8700-800F88F8 0F3040 01F8+00 2/2 0/0 0/0 .text - * checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2, cXyz* param_3, - s16* param_4, s16* param_5) { - nofralloc -#include "asm/d/a/d_a_alink/checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs.s" -} -#pragma pop - -/* 800F88F8-800F89E0 0F3238 00E8+00 6/6 0/0 0/0 .text decideCrawlDoStatus__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::decideCrawlDoStatus() { - nofralloc -#include "asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s" -} -#pragma pop - -/* 800F89E0-800F8A50 0F3320 0070+00 3/3 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotCrawlStand(cXyz* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s" -} -#pragma pop - -/* 800F8A50-800F8B00 0F3390 00B0+00 2/2 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s" -} -#pragma pop - -/* 800F8B00-800F8D04 0F3440 0204+00 2/2 0/0 0/0 .text - * checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkCrawlInHoll(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3) { - nofralloc -#include "asm/d/a/d_a_alink/checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi.s" -} -#pragma pop - -/* 800F8D04-800F8DBC 0F3644 00B8+00 2/2 0/0 0/0 .text setCrawlMoveHoll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveHoll() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s" -} -#pragma pop - -/* 800F8DBC-800F8F08 0F36FC 014C+00 1/1 0/0 0/0 .text setCrawlMoveAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlMoveAngle() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s" -} -#pragma pop - -/* 800F8F08-800F8F84 0F3848 007C+00 6/6 0/0 0/0 .text stopHalfMoveAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::stopHalfMoveAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 800F8F84-800F9210 0F38C4 028C+00 2/2 0/0 0/0 .text setCrawlAutoMoveAimPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCrawlAutoMoveAimPos() { - nofralloc -#include "asm/d/a/d_a_alink/setCrawlAutoMoveAimPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9210-800F9384 0F3B50 0174+00 2/2 0/0 0/0 .text procCrawlStartInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlStartInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlStartInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9384-800F9474 0F3CC4 00F0+00 1/0 0/0 0/0 .text procCrawlStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlStart() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9474-800F95B8 0F3DB4 0144+00 3/3 0/0 0/0 .text procCrawlMoveInit__9daAlink_cFss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlMoveInit__9daAlink_cFss.s" -} -#pragma pop - -/* 800F95B8-800F99FC 0F3EF8 0444+00 1/0 0/0 0/0 .text procCrawlMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F99FC-800F9ABC 0F433C 00C0+00 1/1 0/0 0/0 .text procCrawlAutoMoveInit__9daAlink_cFiP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlAutoMoveInit__9daAlink_cFiP4cXyz.s" -} -#pragma pop - -/* 800F9ABC-800F9D7C 0F43FC 02C0+00 1/0 0/0 0/0 .text procCrawlAutoMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlAutoMove() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlAutoMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9D7C-800F9F30 0F46BC 01B4+00 1/1 0/0 0/0 .text procCrawlEndInit__9daAlink_cFiss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlEndInit__9daAlink_cFiss.s" -} -#pragma pop - -/* 800F9F30-800F9FDC 0F4870 00AC+00 1/0 0/0 0/0 .text procCrawlEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCrawlEnd() { - nofralloc -#include "asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9FDC-800F9FFC 0F491C 0020+00 2/2 0/0 0/0 .text getHangMoveAnmSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getHangMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getHangMoveAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800F9FFC-800FA070 0F493C 0074+00 3/3 0/0 0/0 .text getHangDirectionFromAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getHangDirectionFromAngle() { - nofralloc -#include "asm/d/a/d_a_alink/getHangDirectionFromAngle__9daAlink_cFv.s" -} -#pragma pop - -/* 800FA070-800FA338 0F49B0 02C8+00 2/2 0/0 0/0 .text hangMoveBgCheck__9daAlink_cFsP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/hangMoveBgCheck__9daAlink_cFsP4cXyz.s" -} -#pragma pop - -/* 800FA338-800FA5C8 0F4C78 0290+00 3/3 0/0 0/0 .text changeHangMoveProc__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeHangMoveProc(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeHangMoveProc__9daAlink_cFi.s" -} -#pragma pop - -/* 800FA5C8-800FA6E4 0F4F08 011C+00 5/5 0/0 0/0 .text checkHangFootWall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHangFootWall() { - nofralloc -#include "asm/d/a/d_a_alink/checkHangFootWall__9daAlink_cFv.s" -} -#pragma pop - -/* 800FA6E4-800FA78C 0F5024 00A8+00 10/10 0/0 0/0 .text setHangGroundY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHangGroundY() { - nofralloc -#include "asm/d/a/d_a_alink/setHangGroundY__9daAlink_cFv.s" -} -#pragma pop - -/* 800FA78C-800FA85C 0F50CC 00D0+00 5/5 0/0 0/0 .text changeHangEndProc__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeHangEndProc() { - nofralloc -#include "asm/d/a/d_a_alink/changeHangEndProc__9daAlink_cFv.s" -} -#pragma pop - -/* 800FA85C-800FAA7C 0F519C 0220+00 3/3 0/0 0/0 .text checkHangStartSideWall__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHangStartSideWall(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkHangStartSideWall__9daAlink_cFs.s" -} -#pragma pop - -/* 800FAA7C-800FAE14 0F53BC 0398+00 3/3 0/0 0/0 .text procHangStartInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangStartInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHangStartInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FAE14-800FAECC 0F5754 00B8+00 1/0 0/0 0/0 .text procHangStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangStart() { - nofralloc -#include "asm/d/a/d_a_alink/procHangStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FAECC-800FB1A4 0F580C 02D8+00 1/1 0/0 0/0 .text procHangFallStartInit__9daAlink_cFP8cM3dGPla - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHangFallStartInit__9daAlink_cFP8cM3dGPla.s" -} -#pragma pop - -/* 800FB1A4-800FB2A0 0F5AE4 00FC+00 1/0 0/0 0/0 .text procHangFallStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangFallStart() { - nofralloc -#include "asm/d/a/d_a_alink/procHangFallStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FB2A0-800FB328 0F5BE0 0088+00 1/1 0/0 0/0 .text procHangUpInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangUpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHangUpInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FB328-800FB43C 0F5C68 0114+00 1/0 0/0 0/0 .text procHangUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangUp() { - nofralloc -#include "asm/d/a/d_a_alink/procHangUp__9daAlink_cFv.s" -} -#pragma pop - -/* 800FB43C-800FB544 0F5D7C 0108+00 3/3 0/0 0/0 .text procHangWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHangWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FB544-800FB650 0F5E84 010C+00 1/0 0/0 0/0 .text procHangWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangWait() { - nofralloc -#include "asm/d/a/d_a_alink/procHangWait__9daAlink_cFv.s" -} -#pragma pop - -/* 800FB650-800FB790 0F5F90 0140+00 3/3 0/0 0/0 .text procHangMoveInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHangMoveInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FB790-800FBBC8 0F60D0 0438+00 1/0 0/0 0/0 .text procHangMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHangMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800FBBC8-800FBCD4 0F6508 010C+00 6/6 0/0 0/0 .text procHangClimbInit__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangClimbInit(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHangClimbInit__9daAlink_cFf.s" -} -#pragma pop - -/* 800FBCD4-800FBE04 0F6614 0130+00 1/0 0/0 0/0 .text procHangClimb__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangClimb() { - nofralloc -#include "asm/d/a/d_a_alink/procHangClimb__9daAlink_cFv.s" -} -#pragma pop - -/* 800FBE04-800FC0D8 0F6744 02D4+00 3/3 0/0 0/0 .text procHangWallCatchInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangWallCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHangWallCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC0D8-800FC178 0F6A18 00A0+00 1/0 0/0 0/0 .text procHangWallCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangWallCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procHangWallCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC178-800FC240 0F6AB8 00C8+00 4/4 0/0 0/0 .text procHangReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHangReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC240-800FC2F4 0F6B80 00B4+00 1/0 0/0 0/0 .text procHangReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangReady() { - nofralloc -#include "asm/d/a/d_a_alink/procHangReady__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC2F4-800FC390 0F6C34 009C+00 2/2 0/0 0/0 .text procHangLeverDownInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangLeverDownInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHangLeverDownInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC390-800FC568 0F6CD0 01D8+00 1/0 0/0 0/0 .text procHangLeverDown__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHangLeverDown() { - nofralloc -#include "asm/d/a/d_a_alink/procHangLeverDown__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC568-800FC5A4 0F6EA8 003C+00 1/0 0/0 0/0 .text changeDragonActor__9daAlink_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeDragonActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeDragonActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800FC5A4-800FC6B4 0F6EE4 0110+00 1/1 0/0 0/0 .text setDragonHangPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDragonHangPos() { - nofralloc -#include "asm/d/a/d_a_alink/setDragonHangPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC6B4-800FC748 0F6FF4 0094+00 1/1 0/0 0/0 .text setOctaIealHangPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setOctaIealHangPos() { - nofralloc -#include "asm/d/a/d_a_alink/setOctaIealHangPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC748-800FC77C 0F7088 0034+00 2/2 0/0 0/0 .text setBossBodyHangPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBossBodyHangPos() { - nofralloc -#include "asm/d/a/d_a_alink/setBossBodyHangPos__9daAlink_cFv.s" -} -#pragma pop - -/* 800FC77C-800FC870 0F70BC 00F4+00 1/1 0/0 0/0 .text - * procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 800FC870-800FCF58 0F71B0 06E8+00 1/0 0/0 0/0 .text procBossBodyHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBossBodyHang() { - nofralloc -#include "asm/d/a/d_a_alink/procBossBodyHang__9daAlink_cFv.s" -} -#pragma pop - -/* 800FCF58-800FCF84 0F7898 002C+00 2/2 0/0 0/0 .text getLadderUnitCount__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getLadderUnitCount() const { - nofralloc -#include "asm/d/a/d_a_alink/getLadderUnitCount__9daAlink_cCFv.s" -} -#pragma pop - -/* 800FCF84-800FD048 0F78C4 00C4+00 1/1 0/0 0/0 .text setLadderInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLadderInit() { - nofralloc -#include "asm/d/a/d_a_alink/setLadderInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD048-800FD1F0 0F7988 01A8+00 1/1 0/0 0/0 .text setLadderPosInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLadderPosInit() { - nofralloc -#include "asm/d/a/d_a_alink/setLadderPosInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD1F0-800FD288 0F7B30 0098+00 2/2 0/0 0/0 .text setLadderPos__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLadderPos(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setLadderPos__9daAlink_cFi.s" -} -#pragma pop - -/* 800FD288-800FD2AC 0F7BC8 0024+00 2/2 0/0 0/0 .text getLadderMoveAnmSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getLadderMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getLadderMoveAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD2AC-800FD4A8 0F7BEC 01FC+00 3/3 0/0 0/0 .text changeLadderMoveProc__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeLadderMoveProc(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeLadderMoveProc__9daAlink_cFi.s" -} -#pragma pop - -/* 800FD4A8-800FD5E4 0F7DE8 013C+00 5/5 0/0 0/0 .text setMoveBGLadderCorrect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMoveBGLadderCorrect() { - nofralloc -#include "asm/d/a/d_a_alink/setMoveBGLadderCorrect__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD5E4-800FD648 0F7F24 0064+00 8/8 0/0 0/0 .text checkLadderFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLadderFall() { - nofralloc -#include "asm/d/a/d_a_alink/checkLadderFall__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD648-800FD7B0 0F7F88 0168+00 2/2 0/0 0/0 .text procLadderUpStartInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderUpStartInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderUpStartInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD7B0-800FD824 0F80F0 0074+00 1/0 0/0 0/0 .text procLadderUpStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderUpStart() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderUpStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD824-800FD8E8 0F8164 00C4+00 2/2 0/0 0/0 .text procLadderUpEndInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderUpEndInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procLadderUpEndInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FD8E8-800FD9CC 0F8228 00E4+00 1/0 0/0 0/0 .text procLadderUpEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderUpEnd() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderUpEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 800FD9CC-800FDB74 0F830C 01A8+00 2/2 0/0 0/0 .text procLadderDownStartInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderDownStartInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderDownStartInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FDB74-800FDC18 0F84B4 00A4+00 1/0 0/0 0/0 .text procLadderDownStart__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderDownStart() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderDownStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FDC18-800FDCCC 0F8558 00B4+00 1/1 0/0 0/0 .text procLadderDownEndInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderDownEndInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procLadderDownEndInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FDCCC-800FDD90 0F860C 00C4+00 1/0 0/0 0/0 .text procLadderDownEnd__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderDownEnd() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderDownEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 800FDD90-800FDF50 0F86D0 01C0+00 3/3 0/0 0/0 .text procLadderMoveInit__9daAlink_cFiiP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procLadderMoveInit__9daAlink_cFiiP4cXyz.s" -} -#pragma pop - -/* 800FDF50-800FE010 0F8890 00C0+00 1/0 0/0 0/0 .text procLadderMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLadderMove() { - nofralloc -#include "asm/d/a/d_a_alink/procLadderMove__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE010-800FE034 0F8950 0024+00 3/3 0/0 0/0 .text getClimbMoveUpDownAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getClimbMoveUpDownAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getClimbMoveUpDownAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE034-800FE058 0F8974 0024+00 4/4 0/0 0/0 .text getClimbMoveSideAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getClimbMoveSideAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getClimbMoveSideAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE058-800FE114 0F8998 00BC+00 9/9 0/0 0/0 .text checkClimbCode__9daAlink_cFR13cBgS_PolyInfo - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkClimbCode(cBgS_PolyInfo& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbCode__9daAlink_cFR13cBgS_PolyInfo.s" -} -#pragma pop - -/* 800FE114-800FE174 0F8A54 0060+00 1/1 0/0 0/0 .text setClimbInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setClimbInit() { - nofralloc -#include "asm/d/a/d_a_alink/setClimbInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE174-800FE3C4 0F8AB4 0250+00 8/8 0/0 0/0 .text setClimbShapeOffset__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setClimbShapeOffset() { - nofralloc -#include "asm/d/a/d_a_alink/setClimbShapeOffset__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE3C4-800FE438 0F8D04 0074+00 1/1 0/0 0/0 .text getClimbDirectionFromAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getClimbDirectionFromAngle() { - nofralloc -#include "asm/d/a/d_a_alink/getClimbDirectionFromAngle__9daAlink_cFv.s" -} -#pragma pop - -/* 800FE438-800FE5A0 0F8D78 0168+00 3/3 0/0 0/0 .text changeClimbMoveProc__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeClimbMoveProc(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeClimbMoveProc__9daAlink_cFi.s" -} -#pragma pop - -/* 800FE5A0-800FE6E8 0F8EE0 0148+00 2/2 0/0 0/0 .text checkClimbMoveUpDownProc__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkClimbMoveUpDownProc(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbMoveUpDownProc__9daAlink_cFi.s" -} -#pragma pop - -/* 800FE6E8-800FE868 0F9028 0180+00 2/2 0/0 0/0 .text checkClimbMoveSideProc__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkClimbMoveSideProc(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbMoveSideProc__9daAlink_cFi.s" -} -#pragma pop - -/* 800FE868-800FEB90 0F91A8 0328+00 6/6 0/0 0/0 .text setMoveBGClimbCorrect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMoveBGClimbCorrect() { - nofralloc -#include "asm/d/a/d_a_alink/setMoveBGClimbCorrect__9daAlink_cFv.s" -} -#pragma pop - -/* 800FEB90-800FEC70 0F94D0 00E0+00 1/1 0/0 0/0 .text - * checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBgCorrectClimbMove(cXyz* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz.s" -} -#pragma pop - -/* 800FEC70-800FED50 0F95B0 00E0+00 2/2 0/0 0/0 .text checkClimbRoof__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkClimbRoof(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbRoof__9daAlink_cFf.s" -} -#pragma pop - -/* 800FED50-800FEEC0 0F9690 0170+00 2/2 0/0 0/0 .text checkClimbGround__9daAlink_cFP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkClimbGround__9daAlink_cFP4cXyzf.s" -} -#pragma pop - -/* 800FEEC0-800FF28C 0F9800 03CC+00 5/5 0/0 0/0 .text checkBgClimbMove__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBgClimbMove(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkBgClimbMove__9daAlink_cFi.s" -} -#pragma pop - -/* 800FF28C-800FF450 0F9BCC 01C4+00 2/2 0/0 0/0 .text setClimbStartNotGround__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setClimbStartNotGround() { - nofralloc -#include "asm/d/a/d_a_alink/setClimbStartNotGround__9daAlink_cFv.s" -} -#pragma pop - -/* 800FF450-800FF704 0F9D90 02B4+00 2/2 0/0 0/0 .text procClimbUpStartInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbUpStartInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procClimbUpStartInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FF704-800FF818 0FA044 0114+00 1/0 0/0 0/0 .text procClimbUpStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbUpStart() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbUpStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FF818-800FF9A8 0FA158 0190+00 1/1 0/0 0/0 .text procClimbDownStartInit__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbDownStartInit(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procClimbDownStartInit__9daAlink_cFs.s" -} -#pragma pop - -/* 800FF9A8-800FFAB0 0FA2E8 0108+00 1/0 0/0 0/0 .text procClimbDownStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbDownStart() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbDownStart__9daAlink_cFv.s" -} -#pragma pop - -/* 800FFAB0-800FFC58 0FA3F0 01A8+00 1/1 0/0 0/0 .text procClimbMoveUpDownInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbMoveUpDownInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procClimbMoveUpDownInit__9daAlink_cFi.s" -} -#pragma pop - -/* 800FFC58-800FFDB0 0FA598 0158+00 1/0 0/0 0/0 .text procClimbMoveUpDown__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbMoveUpDown() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbMoveUpDown__9daAlink_cFv.s" -} -#pragma pop - -/* 800FFDB0-800FFF4C 0FA6F0 019C+00 1/1 0/0 0/0 .text procClimbMoveSideInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbMoveSideInit() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbMoveSideInit__9daAlink_cFv.s" -} -#pragma pop - -/* 800FFF4C-801000F8 0FA88C 01AC+00 1/0 0/0 0/0 .text procClimbMoveSide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbMoveSide() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbMoveSide__9daAlink_cFv.s" -} -#pragma pop - -/* 801000F8-80100258 0FAA38 0160+00 7/7 0/0 0/0 .text procClimbWaitInit__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbWaitInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procClimbWaitInit__9daAlink_cFii.s" -} -#pragma pop - -/* 80100258-801003E4 0FAB98 018C+00 1/0 0/0 0/0 .text procClimbWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbWait() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbWait__9daAlink_cFv.s" -} -#pragma pop - -/* 801003E4-80100464 0FAD24 0080+00 2/2 0/0 0/0 .text procClimbToRoofInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbToRoofInit() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbToRoofInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80100464-801005CC 0FADA4 0168+00 1/0 0/0 0/0 .text procClimbToRoof__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procClimbToRoof() { - nofralloc -#include "asm/d/a/d_a_alink/procClimbToRoof__9daAlink_cFv.s" -} -#pragma pop - -/* 801005CC-801005F0 0FAF0C 0024+00 2/2 0/0 0/0 .text getRoofHangFMoveAnmSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getRoofHangFMoveAnmSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getRoofHangFMoveAnmSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 801005F0-80100614 0FAF30 0024+00 2/2 0/0 0/0 .text getRoofHangSMoveAnmSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getRoofHangSMoveAnmSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getRoofHangSMoveAnmSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 80100614-80100668 0FAF54 0054+00 3/3 0/0 0/0 .text - * setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo.s" -} -#pragma pop - -/* 80100668-80100770 0FAFA8 0108+00 3/3 0/0 0/0 .text checkRoofHangMovePos__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkRoofHangMovePos() { - nofralloc -#include "asm/d/a/d_a_alink/checkRoofHangMovePos__9daAlink_cFv.s" -} -#pragma pop - -/* 80100770-801008EC 0FB0B0 017C+00 5/5 0/0 0/0 .text commonRoofHangProc__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonRoofHangProc() { - nofralloc -#include "asm/d/a/d_a_alink/commonRoofHangProc__9daAlink_cFv.s" -} -#pragma pop - -/* 801008EC-80100A10 0FB22C 0124+00 5/5 0/0 0/0 .text checkNextActionRoofHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionRoofHang() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionRoofHang__9daAlink_cFv.s" -} -#pragma pop - -/* 80100A10-80100AE4 0FB350 00D4+00 2/2 0/0 0/0 .text - * procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& param_1, - int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi.s" -} -#pragma pop - -/* 80100AE4-80100BB4 0FB424 00D0+00 1/0 0/0 0/0 .text procRoofHangStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangStart() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangStart__9daAlink_cFv.s" -} -#pragma pop - -/* 80100BB4-80100D38 0FB4F4 0184+00 4/4 0/0 0/0 .text procRoofHangWaitInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80100D38-80100DA4 0FB678 006C+00 1/0 0/0 0/0 .text procRoofHangWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangWait() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangWait__9daAlink_cFv.s" -} -#pragma pop - -/* 80100DA4-80100EEC 0FB6E4 0148+00 1/1 0/0 0/0 .text procRoofHangFrontMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangFrontMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangFrontMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80100EEC-8010121C 0FB82C 0330+00 1/0 0/0 0/0 .text procRoofHangFrontMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangFrontMove() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangFrontMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8010121C-80101308 0FBB5C 00EC+00 1/1 0/0 0/0 .text procRoofHangSideMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangSideMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangSideMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80101308-801013B8 0FBC48 00B0+00 1/0 0/0 0/0 .text procRoofHangSideMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangSideMove() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangSideMove__9daAlink_cFv.s" -} -#pragma pop - -/* 801013B8-80101534 0FBCF8 017C+00 1/1 0/0 0/0 .text procRoofHangTurnInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80101534-8010163C 0FBE74 0108+00 1/0 0/0 0/0 .text procRoofHangTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofHangTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofHangTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8010163C-801016AC 0FBF7C 0070+00 2/2 0/0 0/0 .text setRoofHangSwitch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRoofHangSwitch() { - nofralloc -#include "asm/d/a/d_a_alink/setRoofHangSwitch__9daAlink_cFv.s" -} -#pragma pop - -/* 801016AC-801017AC 0FBFEC 0100+00 1/1 0/0 0/0 .text - * procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 801017AC-80101874 0FC0EC 00C8+00 1/0 0/0 0/0 .text procRoofSwitchHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procRoofSwitchHang() { - nofralloc -#include "asm/d/a/d_a_alink/procRoofSwitchHang__9daAlink_cFv.s" -} -#pragma pop - -/* 80101874-80101890 0FC1B4 001C+00 2/2 0/0 0/0 .text getHangPos__13daObjSwHang_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObjSwHang_c::getHangPos() { - nofralloc -#include "asm/d/a/d_a_alink/getHangPos__13daObjSwHang_cFv.s" -} -#pragma pop - -/* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkZoraWearMaskDraw() { - nofralloc -#include "asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s" -} -#pragma pop - -/* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkAcceptUseItemInWater(u16 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s" -} -#pragma pop - -/* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text swimDeleteItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swimDeleteItem() { - nofralloc -#include "asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s" -} -#pragma pop - -/* 801019B8-80101A18 0FC2F8 0060+00 11/11 0/0 0/0 .text getZoraSwim__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getZoraSwim() const { - nofralloc -#include "asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s" -} -#pragma pop - -/* 80101A18-80101AA8 0FC358 0090+00 6/6 0/0 0/0 .text getSwimFrontMaxSpeed__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSwimFrontMaxSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 80101AA8-80101B44 0FC3E8 009C+00 5/5 0/0 0/0 .text getSwimMaxFallSpeed__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSwimMaxFallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 80101B44-80101C94 0FC484 0150+00 1/1 0/0 0/0 .text checkOxygenTimer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkOxygenTimer() { - nofralloc -#include "asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s" -} -#pragma pop - -/* 80101C94-80101CB8 0FC5D4 0024+00 3/3 0/0 0/0 .text offOxygenTimer__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offOxygenTimer() { - nofralloc -#include "asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s" -} -#pragma pop - -/* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkPossibleWaterInMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s" -} -#pragma pop - -/* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text - * setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s" -} -#pragma pop - -/* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text swimBgCheck__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swimBgCheck(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/swimBgCheck__9daAlink_cFf.s" -} -#pragma pop - -/* 801023E4-801029C8 0FCD24 05E4+00 3/3 0/0 0/0 .text setSpeedAndAngleSwim__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpeedAndAngleSwim() { - nofralloc -#include "asm/d/a/d_a_alink/setSpeedAndAngleSwim__9daAlink_cFv.s" -} -#pragma pop - -/* 801029C8-80102B1C 0FD308 0154+00 3/3 0/0 0/0 .text checkNextActionSwim__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionSwim() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s" -} -#pragma pop - -/* 80102B1C-80103058 0FD45C 053C+00 3/3 0/0 0/0 .text checkSwimAction__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimAction(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimAction__9daAlink_cFi.s" -} -#pragma pop - -/* 80103058-801032C8 0FD998 0270+00 7/7 0/0 0/0 .text checkSwimUpAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimUpAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimUpAction__9daAlink_cFv.s" -} -#pragma pop - -/* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::swimOutAfter(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s" -} -#pragma pop - -/* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text checkSwimFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimFall() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s" -} -#pragma pop - -/* 801033CC-80103698 0FDD0C 02CC+00 1/1 0/0 0/0 .text checkSwimOutAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimOutAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimOutAction__9daAlink_cFv.s" -} -#pragma pop - -/* 80103698-80103EE0 0FDFD8 0848+00 4/4 0/0 0/0 .text setSwimMoveAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwimMoveAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setSwimMoveAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80103EE0-80103F08 0FE820 0028+00 5/5 0/0 0/0 .text checkSwimButtonAccept__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimButtonAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s" -} -#pragma pop - -/* 80103F08-80103F24 0FE848 001C+00 4/4 0/0 0/0 .text checkUpSwimButtonAccept__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpSwimButtonAccept() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s" -} -#pragma pop - -/* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimButtonMove() { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80103F94-80103FE8 0FE8D4 0054+00 3/3 0/0 0/0 .text checkZoraSwimMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkZoraSwimMove() { - nofralloc -#include "asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text checkSwimNeckUpDown__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSwimNeckUpDown() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s" -} -#pragma pop - -/* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwimUpDownOffset() { - nofralloc -#include "asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s" -} -#pragma pop - -/* 801040F8-801041E8 0FEA38 00F0+00 2/2 0/0 0/0 .text procSwimUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801041E8-801042F8 0FEB28 0110+00 1/0 0/0 0/0 .text procSwimUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimUp() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s" -} -#pragma pop - -/* 801042F8-801044B4 0FEC38 01BC+00 15/15 0/0 0/0 .text procSwimWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 801044B4-80104670 0FEDF4 01BC+00 1/0 0/0 0/0 .text procSwimWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimWait() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s" -} -#pragma pop - -/* 80104670-801047B8 0FEFB0 0148+00 9/9 0/0 0/0 .text procSwimMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801047B8-80104958 0FF0F8 01A0+00 1/0 0/0 0/0 .text procSwimMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80104958-80104AA0 0FF298 0148+00 4/4 0/0 0/0 .text procSwimDiveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimDiveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimDiveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80104AA0-80104C50 0FF3E0 01B0+00 1/0 0/0 0/0 .text procSwimDive__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimDive() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimDive__9daAlink_cFv.s" -} -#pragma pop - -/* 80104C50-80104D7C 0FF590 012C+00 1/1 0/0 0/0 .text procSwimHookshotSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 80104EB8-80104FC4 0FF7F8 010C+00 1/1 0/0 0/0 .text procSwimHookshotMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80104FC4-8010519C 0FF904 01D8+00 1/0 0/0 0/0 .text procSwimHookshotMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8010519C-80105728 0FFADC 058C+00 1/1 0/0 0/0 .text - * procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 80105728-801058A0 100068 0178+00 1/0 0/0 0/0 .text procSwimDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwimDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procSwimDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 801058A0-80105A00 1001E0 0160+00 2/2 0/0 0/0 .text procOctaIealSpitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procOctaIealSpitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procOctaIealSpitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text procOctaIealSpit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procOctaIealSpit() { - nofralloc -#include "asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s" -} -#pragma pop - -/* 80105A84-80105A98 1003C4 0014+00 1/1 0/0 0/0 .text daAlink_searchIceLeaf__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchIceLeaf(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80105A98-80105ABC 1003D8 0024+00 3/3 0/0 0/0 .text checkSnowCode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSnowCode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s" -} -#pragma pop - -/* 80105ABC-80105B10 1003FC 0054+00 1/1 0/0 1/1 .text - * checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s" -} -#pragma pop - -/* 80105B10-80105B58 100450 0048+00 2/2 0/0 0/0 .text checkBoardRestart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoardRestart() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s" -} -#pragma pop - -/* 80105B58-80106534 100498 09DC+00 7/7 0/0 0/0 .text boardCommon__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::boardCommon(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/boardCommon__9daAlink_cFi.s" -} -#pragma pop - -/* 80106534-8010658C 100E74 0058+00 6/6 0/0 0/0 .text setCommonBoardAnime__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCommonBoardAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s" -} -#pragma pop - -/* 8010658C-80106618 100ECC 008C+00 5/5 0/0 0/0 .text checkNextActionBoard__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionBoard() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s" -} -#pragma pop - -/* 80106618-80106650 100F58 0038+00 2/2 0/0 0/0 .text checkBoardSwordTriggerAction__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkBoardSwordTriggerAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s" -} -#pragma pop - -/* 80106650-801066B8 100F90 0068+00 3/3 0/0 0/0 .text - * commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s" -} -#pragma pop - -/* 801066B8-801066EC 100FF8 0034+00 1/1 0/0 0/0 .text getBoardRowAnmSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getBoardRowAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 801066EC-80106774 10102C 0088+00 3/3 0/0 0/0 .text setBoardLandAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBoardLandAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setBoardLandAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80106774-801069D0 1010B4 025C+00 1/1 0/0 0/0 .text procBoardRideInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRideInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRideInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801069D0-80106A38 101310 0068+00 1/0 0/0 0/0 .text procBoardRide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRide() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s" -} -#pragma pop - -/* 80106A38-80106BCC 101378 0194+00 13/13 0/0 0/0 .text - * procBoardWaitInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardWaitInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBoardWaitInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 80106BCC-80106E88 10150C 02BC+00 1/0 0/0 0/0 .text procBoardWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardWait() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardWait__9daAlink_cFv.s" -} -#pragma pop - -/* 80106E88-80106F00 1017C8 0078+00 1/1 0/0 0/0 .text procBoardRowInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80106F00-80107060 101840 0160+00 1/0 0/0 0/0 .text procBoardRow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardRow() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardRow__9daAlink_cFv.s" -} -#pragma pop - -/* 80107060-801070DC 1019A0 007C+00 1/1 0/0 0/0 .text procBoardTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801070DC-80107218 101A1C 013C+00 1/0 0/0 0/0 .text procBoardTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 80107218-80107300 101B58 00E8+00 4/4 0/0 0/0 .text procBoardJumpInit__9daAlink_cFfi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardJumpInit(f32 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procBoardJumpInit__9daAlink_cFfi.s" -} -#pragma pop - -/* 80107300-801073D0 101C40 00D0+00 1/0 0/0 0/0 .text procBoardJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardJump() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s" -} -#pragma pop - -/* 801073D0-80107418 101D10 0048+00 1/1 0/0 0/0 .text procBoardSubjectivityInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80107418-801074AC 101D58 0094+00 1/0 0/0 0/0 .text procBoardSubjectivity__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 801074AC-8010755C 101DEC 00B0+00 3/3 0/0 0/0 .text procBoardCutInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardCutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardCutInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010755C-801075D4 101E9C 0078+00 1/0 0/0 0/0 .text procBoardCut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardCut() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s" -} -#pragma pop - -/* 801075D4-80107744 101F14 0170+00 2/2 0/0 0/0 .text procBoardCutTurnInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardCutTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardCutTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80107744-80107900 102084 01BC+00 1/0 0/0 0/0 .text procBoardCutTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBoardCutTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procBoardCutTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 80107900-801083C8 102240 0AC8+00 1/0 0/0 0/0 .text draw__Q29daAlink_c14hsChainShape_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void draw__Q29daAlink_c14hsChainShape_cFv() { - // asm void daAlink_c::hsChainShape_c::draw() { - nofralloc -#include "asm/d/a/d_a_alink/draw__Q29daAlink_c14hsChainShape_cFv.s" -} -#pragma pop - -/* 801083C8-8010859C 102D08 01D4+00 1/1 0/0 0/0 .text - * hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* param_0, fopAc_ac_c* param_1, - dCcD_GObjInf* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s" -} -#pragma pop - -/* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text - * daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* player, dCcD_GObjInf* param_1, - fopAc_ac_c* param_2, dCcD_GObjInf* param_3) { - ((daAlink_c*)player)->hookshotAtHitCallBack(param_1, param_2, param_3); -} - -/* 801085BC-80108600 102EFC 0044+00 1/0 0/0 0/0 .text getHookshotTopPos__9daAlink_cFv */ -cXyz* daAlink_c::getHookshotTopPos() { - if (checkHookshotItem(mEquipItem)) { - return &mHookshotTopPos; - } - - return NULL; -} - -/* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */ -bool daAlink_c::checkHookshotReturnMode() const { - return checkHookshotItem(mEquipItem) && - (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6); -} - -/* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv - */ -bool daAlink_c::checkHookshotShootReturnMode() const { - return (checkHookshotItem(mEquipItem) && mHookshotMode == 3) || checkHookshotReturnMode(); -} - -/* 801086DC-8010871C 10301C 0040+00 6/6 0/0 0/0 .text resetHookshotMode__9daAlink_cFv */ -void daAlink_c::resetHookshotMode() { - mHookshotMode = 0; - initLockAt(); - mSearchBallScale = __float_max[0]; -} - -/* 8010871C-80108784 10305C 0068+00 0/0 0/0 1/1 .text - * setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c */ -bool daAlink_c::setEnemyBombHookshot(fopAc_ac_c* actor) { - if (field_0x284c.getActor() != NULL) { - cancelHookshotCarry(); - field_0x284c.setData(actor); - fopAcM_setHookCarryNow(actor); - return true; - } - return false; -} - -/* 80108784-801087B0 1030C4 002C+00 3/3 0/0 0/0 .text checkLv7BossRoom__9daAlink_cFv */ -bool daAlink_c::checkLv7BossRoom() { - return checkStageName("D_MN07A"); -} - -/* 801087B0-80108828 1030F0 0078+00 6/6 0/0 0/0 .text - * checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo */ -bool daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& poly) { - if (dComIfG_Bgsp().ChkPolyHSStick(poly)) { - dBgW_Base* bgw = dComIfG_Bgsp().GetBgWBasePointer(poly); - if (bgw != NULL && bgw->ChkPushPullOk()) { - return true; - } - } - - return false; -} - -/* 80108828-80108864 103168 003C+00 4/4 0/0 0/0 .text cancelHookshotCarry__9daAlink_cFv - */ -void daAlink_c::cancelHookshotCarry() { - if (field_0x284c.getActor() != NULL) { - fopAcM_cancelHookCarryNow(field_0x284c.getActor()); - field_0x284c.clearData(); - } -} - -/* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */ -void daAlink_c::changeHookshotDrawModel() { - if (mEquipItem == HOOKSHOT && field_0x3020 == 1) { - J3DModel* old_item = mHeldItemModel; - mHeldItemModel = field_0x0710; - field_0x0710 = old_item; - - J3DModel* old_item2 = field_0x070c; - field_0x070c = field_0x0714; - field_0x0714 = old_item2; - } -} - -/* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */ -BOOL daAlink_c::checkHookshotRoofLv7Boss() { - return mCargoCarryActor.getActor() != NULL && - fopAcM_GetName(mCargoCarryActor.getActor()) == PROC_B_DR; -} - -/* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text checkChaseHookshot__9daAlink_cFv */ -BOOL daAlink_c::checkChaseHookshot() { - if (field_0x2804 == NULL) { - if (mTargetedActor != NULL) { - field_0x2804 = mTargetedActor; - } else { - field_0x2804 = this; - } - } else if (field_0x2804 != mTargetedActor) { - field_0x2804 = this; - } - - if (mTargetedActor != NULL) { - s16 actorName = fopAcM_GetName(mTargetedActor); - return field_0x2804 == mTargetedActor && - (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || - actorName == PROC_B_DR || actorName == PROC_E_PH); - } - - return false; -} - -/* 80108980-801089E8 1032C0 0068+00 2/2 0/0 0/0 .text checkOctaIealSpecialCollect__9daAlink_cFv */ -BOOL daAlink_c::checkOctaIealSpecialCollect() { - return mProcID == PROC_HOOKSHOT_FLY && checkHookshotItem(mEquipItem) && checkBossOctaIealRoom(); -} - -/* 801089E8-80108A18 103328 0030+00 5/5 0/0 0/0 .text checkBossOctaIealRoom__9daAlink_cFv - */ -BOOL daAlink_c::checkBossOctaIealRoom() { - return checkStageName("D_MN01A"); -} - -/* 80108A18-80108A3C 103358 0024+00 19/19 0/0 0/0 .text checkHookshotWait__9daAlink_cCFv - */ -BOOL daAlink_c::checkHookshotWait() const { - return mHookshotMode == 0 || mHookshotMode == 1; -} - -/* 80108A3C-80108A90 10337C 0054+00 1/1 0/0 0/0 .text setHookshotCatchNow__9daAlink_cFv - */ -// matches with literals -#ifdef NONMATCHING -void daAlink_c::setHookshotCatchNow() { - field_0x3026 = 5; - dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f)); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotCatchNow() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotCatchNow__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz - */ -bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset) { - if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { - fopAc_ac_c* carryActor = mCargoCarryActor.getActor(); - - if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) && - actorID == mCargoCarryActor.getID()) { - field_0x37c8 = *offset; - return true; - } - } - - fopAc_ac_c* actor = field_0x284c.getActor(); - if (actor != NULL && fopAcM_checkHookCarryNow(actor) && actorID == field_0x284c.getID()) { - field_0x37f8 = *offset; - return true; - } - - return false; -} - -/* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text setHookshotModel__9daAlink_cFv */ -void daAlink_c::setHookshotModel() { - J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E); - - JKRHeap* heap = setItemHeap(); - field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false); - - J3DModelData* heldItem_modelData = loadAramBmd(0x316, 0x5C00); - mHeldItemModel = initModel(heldItem_modelData, 0x80000, 0); - - J3DModelData* modelData = loadAramBmd(0x318, 0x3800); - field_0x070c = initModel(modelData, 0x80000, 0); - field_0x0710 = initModel(mHeldItemModel->getModelData(), 0x80000, 0); - field_0x0714 = initModel(field_0x070c->getModelData(), 0x80000, 0); - - field_0x0768 = loadAramBmd(0x317, 0x1000); - field_0x770 = new hsChainShape_c(); - field_0x076c = new Z2SoundObjSimple(); - - mpHookshotLinChk = new dBgS_ObjLinChk(); - mpHookshotLinChk->OffFullGrp(); - mpHookshotLinChk->OnWaterGrp(); - - J3DAnmTransform* bck2 = (J3DAnmTransform*)loadAram(0x17F, 0x800); - field_0x74C.init(bck2, 0, 2, lit_6040, 0, -1, false); - mDoExt_setCurrentHeap(heap); - - resetHookshotMode(); - field_0x770->setUserArea((u32)this); - field_0x2f94 = 1; - if (mEquipItem == W_HOOKSHOT) { - field_0x2f95 = 6; - } - - field_0x3020 = 0; - field_0x3024 = 0; - - field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); - field_0x122C[0].OffAtNoHitMark(); - field_0x122C[0].SetAtAtp(0); - field_0x122C[0].SetR(lit_7808); - field_0x122C[0].SetAtSe(8); - field_0x122C[0].SetAtType(0x4000); - field_0x122C[0].SetAtHitMark(1); - field_0x122C[0].OnAtSetBit(); - field_0x122C[0].SetAtHitCallback(daAlink_hookshotAtHitCallBack); - field_0x122C[0].SetAtMtrl(0); - field_0x076c->init(&mHookshotTopPos, 1); -} - -/* 80108DB4-80108EEC 1036F4 0138+00 6/6 0/0 0/0 .text setHookshotSight__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotSight() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotSight__9daAlink_cFv.s" -} -#pragma pop - -/* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text cancelHookshotShot__9daAlink_cFv */ -void daAlink_c::cancelHookshotShot() { - if (checkHookshotItem(mEquipItem) && - (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) { - if (mProcID != PROC_HOOKSHOT_MOVE && mProcID != PROC_HOOKSHOT_FLY && mProcID != PROC_HOOKSHOT_SUBJECT) { - mHookshotMode = 6; - } - } -} - -/* 80108F64-8010903C 1038A4 00D8+00 4/4 0/0 0/0 .text cancelHookshotMove__9daAlink_cFv */ -// checkAttentionLock has weird codegen -#ifdef NONMATCHING -bool daAlink_c::cancelHookshotMove() { - if (mFastShotTime == 0 && mHookshotMode == 0) { - if (checkHookshotAnime() && - (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) { - resetUpperAnime(UPPER_NOW, -1.0f); - return 1; - } - } - - return 0; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::cancelHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/cancelHookshotMove__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 8010903C-80109070 10397C 0034+00 2/2 0/0 0/0 .text - * checkHookshotReadyMaterialOffMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkHookshotReadyMaterialOffMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s" -} -#pragma pop - -/* 80109070-801090EC 1039B0 007C+00 5/5 0/0 0/0 .text setHookshotReadyMaterial__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotReadyMaterial() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s" -} -#pragma pop - -/* 801090EC-80109170 103A2C 0084+00 8/8 0/0 0/0 .text initHookshotUpperAnimeSpeed__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initHookshotUpperAnimeSpeed(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/initHookshotUpperAnimeSpeed__9daAlink_cFi.s" -} -#pragma pop - -/* 80109170-801091E4 103AB0 0074+00 4/4 0/0 0/0 .text initHookshotReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initHookshotReady() { - nofralloc -#include "asm/d/a/d_a_alink/initHookshotReady__9daAlink_cFv.s" -} -#pragma pop - -/* 801091E4-80109284 103B24 00A0+00 1/1 0/0 0/0 .text setHookshotReadyAnime__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotReadyAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80109284-801095C8 103BC4 0344+00 3/3 0/0 0/0 .text checkUpperItemActionHookshot__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionHookshot() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionHookshot__9daAlink_cFv.s" -} -#pragma pop - -/* 801095C8-801097A0 103F08 01D8+00 7/7 0/0 0/0 .text checkNextActionHookshot__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionHookshot() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionHookshot__9daAlink_cFv.s" -} -#pragma pop - -/* 801097A0-80109890 1040E0 00F0+00 2/2 0/0 0/0 .text setHookshotReturnEnd__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotReturnEnd() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotReturnEnd__9daAlink_cFv.s" -} -#pragma pop - -/* 80109890-80109AAC 1041D0 021C+00 3/3 0/0 0/0 .text setHookshotHangMoveBGCollect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotHangMoveBGCollect() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotHangMoveBGCollect__9daAlink_cFv.s" -} -#pragma pop - -/* 80109AAC-80109BDC 1043EC 0130+00 2/2 0/0 0/0 .text setHookshotTopPosFly__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotTopPosFly() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotTopPosFly__9daAlink_cFv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804256A0-804256AC 0523C0 000C+00 0/1 0/0 0/0 .bss @29722 */ -#pragma push -#pragma force_active on -static u8 lit_29722[12]; -#pragma pop - -/* 804256AC-804256B8 0523CC 000C+00 1/2 0/0 0/0 .bss l_hookSnowSandHitScale */ -static u8 l_hookSnowSandHitScale[12]; - -/* 80109BDC-8010B2DC 10451C 1700+00 1/1 0/0 0/0 .text setHookshotPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotPos() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotPos__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B2DC-8010B35C 105C1C 0080+00 2/2 0/0 0/0 .text setHookshotRoofWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotRoofWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotRoofWaitAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B35C-8010B3AC 105C9C 0050+00 2/2 0/0 0/0 .text setHookshotWallWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHookshotWallWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setHookshotWallWaitAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B3AC-8010B644 105CEC 0298+00 2/2 0/0 0/0 .text hookshotRoofTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::hookshotRoofTurn() { - nofralloc -#include "asm/d/a/d_a_alink/hookshotRoofTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B644-8010B720 105F84 00DC+00 3/3 0/0 0/0 .text - * initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initHookshotRoofWaitActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 8010B720-8010B84C 106060 012C+00 2/2 0/0 0/0 .text checkNextHookPoint__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextHookPoint() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextHookPoint__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B84C-8010B96C 10618C 0120+00 2/2 0/0 0/0 .text checkLandHookshotHang__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLandHookshotHang() { - nofralloc -#include "asm/d/a/d_a_alink/checkLandHookshotHang__9daAlink_cFv.s" -} -#pragma pop - -/* 8010B96C-8010BA6C 1062AC 0100+00 3/3 0/0 0/0 .text commonHookshotRoofWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonHookshotRoofWait() { - nofralloc -#include "asm/d/a/d_a_alink/commonHookshotRoofWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BA6C-8010BAA8 1063AC 003C+00 2/2 0/0 0/0 .text commonHookshotWallWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonHookshotWallWait() { - nofralloc -#include "asm/d/a/d_a_alink/commonHookshotWallWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BAA8-8010BB48 1063E8 00A0+00 1/1 0/0 0/0 .text procHookshotSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BB48-8010BC08 106488 00C0+00 1/0 0/0 0/0 .text procHookshotSubject__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BC08-8010BCA4 106548 009C+00 1/1 0/0 0/0 .text procHookshotMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BCA4-8010BD90 1065E4 00EC+00 1/0 0/0 0/0 .text procHookshotMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotMove() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BD90-8010BEF0 1066D0 0160+00 2/2 0/0 0/0 .text procHookshotFlyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotFlyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotFlyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010BEF0-8010C830 106830 0940+00 2/1 0/0 0/0 .text procHookshotFly__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotFly() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotFly__9daAlink_cFv.s" -} -#pragma pop - -/* 8010C830-8010C9F4 107170 01C4+00 4/4 0/0 0/0 .text - * procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci.s" -} -#pragma pop - -/* 8010C9F4-8010CC80 107334 028C+00 1/0 0/0 0/0 .text procHookshotRoofWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofWait() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8010CC80-8010CD60 1075C0 00E0+00 1/1 0/0 0/0 .text - * procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 8010CD60-8010CF6C 1076A0 020C+00 1/0 0/0 0/0 .text procHookshotRoofShoot__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofShoot() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofShoot__9daAlink_cFv.s" -} -#pragma pop - -/* 8010CF6C-8010D034 1078AC 00C8+00 1/1 0/0 0/0 .text - * procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 8010D034-8010D174 107974 0140+00 1/0 0/0 0/0 .text procHookshotRoofBoots__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotRoofBoots() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotRoofBoots__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D174-8010D38C 107AB4 0218+00 3/3 0/0 0/0 .text procHookshotWallWaitInit__9daAlink_cFisi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotWallWaitInit__9daAlink_cFisi.s" -} -#pragma pop - -/* 8010D38C-8010D5F4 107CCC 0268+00 1/0 0/0 0/0 .text procHookshotWallWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotWallWait() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotWallWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D5F4-8010D6CC 107F34 00D8+00 1/1 0/0 0/0 .text procHookshotWallShootInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotWallShootInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotWallShootInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D6CC-8010D93C 10800C 0270+00 1/0 0/0 0/0 .text procHookshotWallShoot__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHookshotWallShoot() { - nofralloc -#include "asm/d/a/d_a_alink/procHookshotWallShoot__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D93C-8010D94C 10827C 0010+00 0/0 0/0 1/1 .text getSpinnerGravity__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerGravity() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerGravity__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010D94C-8010D95C 10828C 0010+00 0/0 0/0 1/1 .text getSpinnerMaxFallSpeed__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerMaxFallSpeed() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerMaxFallSpeed__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010D95C-8010D96C 10829C 0010+00 0/0 0/0 1/1 .text getSpinnerJumpRate__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerJumpRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerJumpRate__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010D96C-8010D9B0 1082AC 0044+00 1/1 0/0 2/2 .text getSpinnerRideMoveTime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideMoveTime() { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideMoveTime__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D9B0-8010D9F4 1082F0 0044+00 1/1 0/0 3/3 .text getSpinnerRideSpeedF__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideSpeedF() { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideSpeedF__9daAlink_cFv.s" -} -#pragma pop - -/* 8010D9F4-8010DA04 108334 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideDecSpeedMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideDecSpeedMax__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010DA04-8010DA14 108344 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMin__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideDecSpeedMin() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideDecSpeedMin__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010DA14-8010DA24 108354 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedRate__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideDecSpeedRate() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideDecSpeedRate__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010DA24-8010DA34 108364 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMax__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideRotAngleMax() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideRotAngleMax__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010DA34-8010DA44 108374 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMin__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getSpinnerRideRotAngleMin() const { - nofralloc -#include "asm/d/a/d_a_alink/getSpinnerRideRotAngleMin__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010DA44-8010DA98 108384 0054+00 1/0 0/0 0/0 .text onSpinnerPathForceRemove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::onSpinnerPathForceRemove() { - nofralloc -#include "asm/d/a/d_a_alink/onSpinnerPathForceRemove__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DA98-8010DAFC 1083D8 0064+00 1/0 0/0 0/0 .text checkSpinnerPathMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSpinnerPathMove() { - nofralloc -#include "asm/d/a/d_a_alink/checkSpinnerPathMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DAFC-8010DB28 10843C 002C+00 2/2 0/0 0/0 .text checkLv4BossRoom__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLv4BossRoom() { - nofralloc -#include "asm/d/a/d_a_alink/checkLv4BossRoom__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DB28-8010DBC8 108468 00A0+00 1/0 0/0 0/0 .text checkSpinnerTriggerAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSpinnerTriggerAttack() { - nofralloc -#include "asm/d/a/d_a_alink/checkSpinnerTriggerAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DBC8-8010DC64 108508 009C+00 2/2 0/0 0/0 .text setSpinnerSyncPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpinnerSyncPos() { - nofralloc -#include "asm/d/a/d_a_alink/setSpinnerSyncPos__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DC64-8010DDCC 1085A4 0168+00 1/1 0/0 0/0 .text procSpinnerReadyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSpinnerReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DDCC-8010DE64 10870C 0098+00 1/0 0/0 0/0 .text procSpinnerReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSpinnerReady() { - nofralloc -#include "asm/d/a/d_a_alink/procSpinnerReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DE64-8010DE78 1087A4 0014+00 1/1 0/0 0/0 .text setSpinnerStatus__9daAlink_cFUcUc - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpinnerStatus(u8 param_0, u8 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSpinnerStatus__9daAlink_cFUcUc.s" -} -#pragma pop - -/* 8010DE78-8010DF4C 1087B8 00D4+00 2/2 0/0 0/0 .text procSpinnerWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSpinnerWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSpinnerWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8010DF4C-8010E48C 10888C 0540+00 1/0 0/0 0/0 .text procSpinnerWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSpinnerWait() { - nofralloc -#include "asm/d/a/d_a_alink/procSpinnerWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8010E48C-8010E52C 108DCC 00A0+00 1/1 0/0 0/0 .text bottleModelCallBack__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::bottleModelCallBack() { - nofralloc -#include "asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s" -} -#pragma pop - -/* 8010E52C-8010E568 108E6C 003C+00 1/1 0/0 0/0 .text daAlink_bottleModelCallBack__FP8J3DJointi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_bottleModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s" -} -#pragma pop - -/* 8010E568-8010E584 108EA8 001C+00 1/0 0/0 0/0 .text getBottleOpenAppearItem__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 daAlink_c::getBottleOpenAppearItem() const { - nofralloc -#include "asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s" -} -#pragma pop - -/* 8010E584-8010E5D8 108EC4 0054+00 2/2 0/0 0/0 .text checkOilBottleItemNotGet__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkOilBottleItemNotGet(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s" -} -#pragma pop - -/* 8010E5D8-8010EAC4 108F18 04EC+00 7/7 0/0 0/0 .text setBottleModel__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBottleModel(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBottleModel__9daAlink_cFUs.s" -} -#pragma pop - -/* 8010EAC4-8010F45C 109404 0998+00 3/3 0/0 0/0 .text commonBottleDrink__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonBottleDrink(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonBottleDrink__9daAlink_cFi.s" -} -#pragma pop - -/* 8010F45C-8010F54C 109D9C 00F0+00 2/2 0/0 0/0 .text makeFairy__9daAlink_cFP4cXyzUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::makeFairy(cXyz* param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s" -} -#pragma pop - -/* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text procBottleDrinkInit__9daAlink_cFUs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleDrinkInit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s" -} -#pragma pop - -/* 8010F698-8010F6F4 109FD8 005C+00 1/0 0/0 0/0 .text procBottleDrink__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleDrink() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s" -} -#pragma pop - -/* 8010F6F4-8010F8E4 10A034 01F0+00 1/1 0/0 0/0 .text procBottleOpenInit__9daAlink_cFUs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleOpenInit(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleOpenInit__9daAlink_cFUs.s" -} -#pragma pop - -/* 8010F8E4-8010FC38 10A224 0354+00 1/0 0/0 0/0 .text procBottleOpen__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleOpen() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleOpen__9daAlink_cFv.s" -} -#pragma pop - -/* 8010FC38-8010FF58 10A578 0320+00 4/4 0/0 0/0 .text - * procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci.s" -} -#pragma pop - -/* 8010FF58-801102D0 10A898 0378+00 1/0 0/0 0/0 .text procBottleSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleSwing() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleSwing__9daAlink_cFv.s" -} -#pragma pop - -/* 801102D0-80110518 10AC10 0248+00 2/2 0/0 0/0 .text procBottleGetInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleGetInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80110518-80110648 10AE58 0130+00 1/0 0/0 0/0 .text procBottleGet__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBottleGet() { - nofralloc -#include "asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s" -} -#pragma pop - -/* 80110648-80110654 10AF88 000C+00 0/0 1/0 0/0 .text Insect_Release__9dInsect_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dInsect_c::Insect_Release() { - nofralloc -#include "asm/d/a/d_a_alink/Insect_Release__9dInsect_cFv.s" -} -#pragma pop - -/* 80110654-80110668 10AF94 0014+00 1/1 0/0 0/0 .text daAlink_searchTagKandelaar__FP10fopAc_ac_cPv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchTagKandelaar(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80110668-801106E8 10AFA8 0080+00 1/1 0/0 0/0 .text daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchTagKtOnFire(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 801106E8-8011078C 10B028 00A4+00 1/0 0/0 0/0 .text setKandelaarMtx__9daAlink_cFPA4_fii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setKandelaarMtx(f32 (*param_0)[4], int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s" -} -#pragma pop - -/* 8011078C-801107BC 10B0CC 0030+00 2/2 0/0 0/0 .text checkWaterInKandelaarOffset__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s" -} -#pragma pop - -/* 801107BC-80110840 10B0FC 0084+00 2/2 0/0 0/0 .text checkWaterInKandelaar__9daAlink_cFf - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWaterInKandelaar(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s" -} -#pragma pop - -/* 80110840-8011087C 10B180 003C+00 13/13 0/0 0/0 .text offKandelaarModel__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::offKandelaarModel() { - nofralloc -#include "asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s" -} -#pragma pop - -/* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkUseKandelaar(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s" -} -#pragma pop - -/* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daAlink_cCFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkKandelaarSwing(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s" -} -#pragma pop - -/* 801108EC-80110BEC 10B22C 0300+00 1/1 0/0 0/0 .text kandelaarModelCallBack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::kandelaarModelCallBack() { - nofralloc -#include "asm/d/a/d_a_alink/kandelaarModelCallBack__9daAlink_cFv.s" -} -#pragma pop - -/* 80110BEC-80110C28 10B52C 003C+00 1/1 0/0 0/0 .text daAlink_kandelaarModelCallBack__FP8J3DJointi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s" -} -#pragma pop - -/* 80110C28-80110C6C 10B568 0044+00 1/0 0/0 0/0 .text getKandelaarFlamePos__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getKandelaarFlamePos() { - nofralloc -#include "asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s" -} -#pragma pop - -/* 80110C6C-80110C94 10B5AC 0028+00 3/3 0/0 0/0 .text checkKandelaarEquipAnime__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkKandelaarEquipAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 80110C94-80110E80 10B5D4 01EC+00 1/1 0/0 0/0 .text preKandelaarDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::preKandelaarDraw() { - nofralloc -#include "asm/d/a/d_a_alink/preKandelaarDraw__9daAlink_cFv.s" -} -#pragma pop - -/* 80110E80-80110E84 10B7C0 0004+00 0/0 3/0 0/0 .text - * setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 */ -void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - /* empty function */ -} - -/* 80110E84-80110F88 10B7C4 0104+00 4/4 0/0 0/0 .text setKandelaarModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setKandelaarModel() { - nofralloc -#include "asm/d/a/d_a_alink/setKandelaarModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80110F88-80110FE0 10B8C8 0058+00 3/3 0/0 0/0 .text resetOilBottleModel__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetOilBottleModel() { - nofralloc -#include "asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80110FE0-801110B8 10B920 00D8+00 3/3 0/0 0/0 .text commonKandelaarPourInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonKandelaarPourInit() { - nofralloc -#include "asm/d/a/d_a_alink/commonKandelaarPourInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801110B8-8011130C 10B9F8 0254+00 3/3 0/0 0/0 .text commonKandelaarPour__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::commonKandelaarPour(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/commonKandelaarPour__9daAlink_cFi.s" -} -#pragma pop - -/* 8011130C-80111440 10BC4C 0134+00 1/1 0/0 0/0 .text initKandelaarSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initKandelaarSwing() { - nofralloc -#include "asm/d/a/d_a_alink/initKandelaarSwing__9daAlink_cFv.s" -} -#pragma pop - -/* 80111440-801115CC 10BD80 018C+00 2/1 0/0 0/0 .text procKandelaarSwingInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarSwingInit() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarSwingInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801115CC-8011167C 10BF0C 00B0+00 1/0 0/0 0/0 .text procKandelaarSwing__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarSwing() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s" -} -#pragma pop - -/* 8011167C-80111724 10BFBC 00A8+00 1/1 0/0 0/0 .text procKandelaarPourInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarPourInit() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80111724-8011174C 10C064 0028+00 1/0 0/0 0/0 .text procKandelaarPour__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procKandelaarPour() { - nofralloc -#include "asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s" -} -#pragma pop - -/* 8011174C-80111770 10C08C 0024+00 1/1 0/0 0/0 .text daAlink_searchWhistle__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchWhistle(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchWhistle__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80111770-80111784 10C0B0 0014+00 1/1 0/0 0/0 .text daAlink_searchHawk__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchHawk(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchHawk__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 8045069C-804506A4 -00001 0008+00 1/1 0/0 0/0 .sdata grassWhistleArcName$33096 */ -SECTION_SDATA static void* grassWhistleArcName[2] = { - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0xAD), - (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0xB4), -}; - -/* 80111784-8011181C 10C0C4 0098+00 1/1 0/0 0/0 .text setGrassWhistleModel__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGrassWhistleModel(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGrassWhistleModel__9daAlink_cFi.s" -} -#pragma pop - -/* 8011181C-80111894 10C15C 0078+00 1/1 0/0 0/0 .text setHorseWhistleModel__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseWhistleModel() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseWhistleModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80111894-801119D8 10C1D4 0144+00 2/2 0/0 0/0 .text procGrassWhistleGetInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleGetInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGrassWhistleGetInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801119D8-80111A9C 10C318 00C4+00 1/0 0/0 0/0 .text procGrassWhistleGet__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleGet() { - nofralloc -#include "asm/d/a/d_a_alink/procGrassWhistleGet__9daAlink_cFv.s" -} -#pragma pop - -/* 80111A9C-80111CA4 10C3DC 0208+00 2/2 0/0 0/0 .text - * procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s16 param_3, - cXyz* param_4) { - nofralloc -#include "asm/d/a/d_a_alink/procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz.s" -} -#pragma pop - -/* 80111CA4-80111FF0 10C5E4 034C+00 1/0 0/0 0/0 .text procGrassWhistleWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGrassWhistleWait() { - nofralloc -#include "asm/d/a/d_a_alink/procGrassWhistleWait__9daAlink_cFv.s" -} -#pragma pop - -/* 80111FF0-801120C8 10C930 00D8+00 2/2 0/0 0/0 .text procCoHorseCallWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoHorseCallWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 801120C8-801121B4 10CA08 00EC+00 1/0 0/0 0/0 .text procCoHorseCallWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoHorseCallWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCoHorseCallWait__9daAlink_cFv.s" -} -#pragma pop - -/* 801121B4-80112220 10CAF4 006C+00 1/0 0/0 0/0 .text procHawkCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80112220-80112278 10CB60 0058+00 1/0 0/0 0/0 .text procHawkCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 80112278-80112304 10CBB8 008C+00 2/2 0/0 0/0 .text procHawkSubjectInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80112304-8011243C 10CC44 0138+00 1/0 0/0 0/0 .text procHawkSubject__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHawkSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procHawkSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getIronBallCenterPos() { - nofralloc -#include "asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s" -} -#pragma pop - -/* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::getIronBallBgHit() const { - nofralloc -#include "asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s" -} -#pragma pop - -/* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallThrowMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s" -} -#pragma pop - -/* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallThrowReturnMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s" -} -#pragma pop - -/* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text checkIronBallReturn__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkIronBallReturn() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s" -} -#pragma pop - -/* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkIronBallGroundStop() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s" -} -#pragma pop - -/* 80112568-80112628 10CEA8 00C0+00 5/5 0/0 0/0 .text setIronBallWaitUpperAnime__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallWaitUpperAnime(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s" -} -#pragma pop - -/* 80112628-801126F8 10CF68 00D0+00 1/1 0/0 0/0 .text checkIronBallDelete__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallDelete() { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s" -} -#pragma pop - -/* 801126F8-80112768 10D038 0070+00 2/2 0/0 0/0 .text setIronBallReturn__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallReturn(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s" -} -#pragma pop - -/* 80112768-801127F0 10D0A8 0088+00 2/2 0/0 0/0 .text setIronBallBgCheckPos__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallBgCheckPos() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s" -} -#pragma pop - -/* 801127F0-80112C80 10D130 0490+00 1/1 0/0 0/0 .text setIronBallModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallModel() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80112C80-80112C84 10D5C0 0004+00 2/2 2/2 0/0 .text __ct__5csXyzFv */ -extern "C" void __ct__5csXyzFv() { - /* empty function */ -} - -/* 80112C84-80112E7C 10D5C4 01F8+00 1/1 0/0 0/0 .text - * setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallGroundVec(cXyz const* param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz.s" -} -#pragma pop - -/* 80112E7C-80113CA0 10D7BC 0E24+00 1/1 0/0 0/0 .text setIronBallChainPos__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallChainPos() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallChainPos__9daAlink_cFv.s" -} -#pragma pop - -/* 80113CA0-80113D58 10E5E0 00B8+00 1/1 0/0 0/0 .text checkIronBallReturnChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkIronBallReturnChange() { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s" -} -#pragma pop - -/* 80113D58-801150E4 10E698 138C+00 1/1 0/0 0/0 .text setIronBallPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallPos() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallPos__9daAlink_cFv.s" -} -#pragma pop - -/* 801150E4-8011510C 10FA24 0028+00 10/10 0/0 0/0 .text checkIronBallAnime__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkIronBallAnime() const { - nofralloc -#include "asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s" -} -#pragma pop - -/* 8011510C-801151E0 10FA4C 00D4+00 1/1 0/0 0/0 .text setIronBallReadyAnime__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallReadyAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 801151E0-80115254 10FB20 0074+00 2/2 0/0 0/0 .text setIronBallBaseAnime__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setIronBallBaseAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80115254-801153F8 10FB94 01A4+00 1/1 0/0 0/0 .text checkUpperItemActionIronBall__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkUpperItemActionIronBall() { - nofralloc -#include "asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s" -} -#pragma pop - -/* 801153F8-801154E4 10FD38 00EC+00 2/2 0/0 0/0 .text checkNextActionIronBall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionIronBall() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s" -} -#pragma pop - -/* 801154E4-80115564 10FE24 0080+00 1/1 0/0 0/0 .text procIronBallSubjectInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallSubjectInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80115564-801155EC 10FEA4 0088+00 1/0 0/0 0/0 .text procIronBallSubject__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallSubject() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s" -} -#pragma pop - -/* 801155EC-80115674 10FF2C 0088+00 1/1 0/0 0/0 .text procIronBallMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80115674-8011577C 10FFB4 0108+00 1/0 0/0 0/0 .text procIronBallMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallMove() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8011577C-80115860 1100BC 00E4+00 1/1 0/0 0/0 .text procIronBallThrowInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallThrowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80115860-801159F0 1101A0 0190+00 1/0 0/0 0/0 .text procIronBallThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 801159F0-80115AA0 110330 00B0+00 2/2 0/0 0/0 .text procIronBallReturnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallReturnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80115AA0-80115C20 1103E0 0180+00 1/0 0/0 0/0 .text procIronBallReturn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procIronBallReturn() { - nofralloc -#include "asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s" -} -#pragma pop - -/* 80115C20-80115C50 110560 0030+00 72/72 0/0 0/0 .text checkEventRun__9daAlink_cCFv */ -BOOL daAlink_c::checkEventRun() const { - return i_dComIfGp_event_runCheck() || checkPlayerDemoMode(); -} - -/* 80115C50-80115D08 110590 00B8+00 2/2 0/0 0/0 .text createNpcTks__9daAlink_cFP4cXyziUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::createNpcTks(cXyz* param_0, int param_1, u32 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/createNpcTks__9daAlink_cFP4cXyziUl.s" -} -#pragma pop - -/* 80115D08-80115EC0 110648 01B8+00 1/0 0/0 0/0 .text checkSetNpcTks__9daAlink_cFP4cXyzii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/checkSetNpcTks__9daAlink_cFP4cXyzii.s" -} -#pragma pop - -/* 80115EC0-80116E60 110800 0FA0+00 1/1 0/0 0/0 .text checkDemoAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDemoAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkDemoAction__9daAlink_cFv.s" -} -#pragma pop - -/* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text checkDemoMoveMode__9daAlink_cCFUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDemoMoveMode(u32 param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s" -} -#pragma pop - -/* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoMoveData__9daAlink_cFPUlPC4cXyz.s" -} -#pragma pop - -/* 80117064-801171F4 1119A4 0190+00 1/1 0/0 0/0 .text setNoDrawSwordShield__9daAlink_cFiUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setNoDrawSwordShield__9daAlink_cFiUs.s" -} -#pragma pop - -/* 801171F4-80117B90 111B34 099C+00 1/1 0/0 0/0 .text setDemoData__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoData() { - nofralloc -#include "asm/d/a/d_a_alink/setDemoData__9daAlink_cFv.s" -} -#pragma pop - -/* 80117B90-80117C34 1124D0 00A4+00 1/1 0/0 0/0 .text resetDemoBck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetDemoBck() { - nofralloc -#include "asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s" -} -#pragma pop - -/* 80117C34-80117C90 112574 005C+00 3/3 0/0 0/0 .text endHighModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::endHighModel() { - nofralloc -#include "asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80117C90-80117CF8 1125D0 0068+00 21/21 0/0 0/0 .text resetSpecialEvent__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetSpecialEvent() { - nofralloc -#include "asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s" -} -#pragma pop - -/* 80117CF8-801180EC 112638 03F4+00 4/4 0/0 0/0 .text endDemoMode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::endDemoMode() { - nofralloc -#include "asm/d/a/d_a_alink/endDemoMode__9daAlink_cFv.s" -} -#pragma pop - -/* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text getDemoLookActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getDemoLookActor() { - nofralloc -#include "asm/d/a/d_a_alink/getDemoLookActor__9daAlink_cFv.s" -} -#pragma pop - -/* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text checkFlyAtnWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFlyAtnWait() { - nofralloc -#include "asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s" -} -#pragma pop - -/* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text setGetItemFace__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGetItemFace(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGetItemFace__9daAlink_cFUs.s" -} -#pragma pop - -/* 801182D4-80118308 112C14 0034+00 2/2 0/0 0/0 .text checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkGrabTalkActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 80118308-8011856C 112C48 0264+00 2/2 0/0 0/0 .text setTalkStartBack__9daAlink_cFP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTalkStartBack(cXyz* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setTalkStartBack__9daAlink_cFP4cXyz.s" -} -#pragma pop - -/* 8011856C-80118654 112EAC 00E8+00 4/4 0/0 0/0 .text setShapeAngleToTalkActor__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShapeAngleToTalkActor() { - nofralloc -#include "asm/d/a/d_a_alink/setShapeAngleToTalkActor__9daAlink_cFv.s" -} -#pragma pop - -/* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTalkAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 801186D4-80118778 113014 00A4+00 2/2 0/0 0/0 .text setTradeItemAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTradeItemAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80118778-801187B4 1130B8 003C+00 3/3 0/0 0/0 .text setTradeItemOutHand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setTradeItemOutHand() { - nofralloc -#include "asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s" -} -#pragma pop - -/* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkEndMessage(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s" -} -#pragma pop - -/* 80118840-801188B0 113180 0070+00 1/1 0/0 0/0 .text setDemoRightHandIndex__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoRightHandIndex(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s" -} -#pragma pop - -/* 801188B0-8011894C 1131F0 009C+00 1/1 0/0 0/0 .text setDemoLeftHandIndex__9daAlink_cFUs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoLeftHandIndex(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s" -} -#pragma pop - -/* 8011894C-801189F8 11328C 00AC+00 1/1 0/0 0/0 .text setDemoRide__9daAlink_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoRide(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s" -} -#pragma pop - -/* 801189F8-80118AD0 113338 00D8+00 1/1 0/0 0/0 .text - * setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs.s" -} -#pragma pop - -/* 80118AD0-80118B34 113410 0064+00 1/1 0/0 0/0 .text checkFinalBattle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkFinalBattle() { - nofralloc -#include "asm/d/a/d_a_alink/checkFinalBattle__9daAlink_cFv.s" -} -#pragma pop - -/* 80118B34-80118BF4 113474 00C0+00 3/3 0/0 0/0 .text checkRestartDead__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkRestartDead(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/checkRestartDead__9daAlink_cFii.s" -} -#pragma pop - -/* 80118BF4-80118C98 113534 00A4+00 2/2 0/0 0/0 .text setDeadRideSyncPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDeadRideSyncPos() { - nofralloc -#include "asm/d/a/d_a_alink/setDeadRideSyncPos__9daAlink_cFv.s" -} -#pragma pop - -/* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text checkDeadHP__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkDeadHP() { - nofralloc -#include "asm/d/a/d_a_alink/checkDeadHP__9daAlink_cFv.s" -} -#pragma pop - -/* 80118D7C-80118FF8 1136BC 027C+00 3/3 0/0 0/0 .text checkDeadAction__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkDeadAction(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkDeadAction__9daAlink_cFi.s" -} -#pragma pop - -/* 80118FF8-801190A4 113938 00AC+00 1/1 0/0 0/0 .text - * setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHighModelBck(mDoExt_bckAnm* param_0, u16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s" -} -#pragma pop - -/* 801190A4-80119134 1139E4 0090+00 1/1 0/0 0/0 .text setHighModelFaceBtk__9daAlink_cFUs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHighModelFaceBtk(u16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setHighModelFaceBtk__9daAlink_cFUs.s" -} -#pragma pop - -/* 80119134-801191C4 113A74 0090+00 1/1 0/0 0/0 .text - * setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs.s" -} -#pragma pop - -/* 801191C4-80119464 113B04 02A0+00 1/1 0/0 0/0 .text - * setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setStickAnmData(J3DAnmBase* param_0, int param_1, int param_2, u16 param_3, - int param_4) { - nofralloc -#include "asm/d/a/d_a_alink/setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804256B8-804256CC 0523D8 0014+00 1/1 0/0 0/0 .bss dummy$36763 */ -static u8 dummy[20]; - -/* 80119464-801195C0 113DA4 015C+00 1/1 0/0 0/0 .text - * daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_c_getDemoIDData(dDemo_actor_c* param_0, int* param_1, int* param_2, - int* param_3, u16* param_4, int* param_5, int* param_6) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi.s" -} -#pragma pop - -/* 801195C0-801195F8 113F00 0038+00 7/0 0/0 0/0 .text procDemoCommon__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDemoCommon() { - nofralloc -#include "asm/d/a/d_a_alink/procDemoCommon__9daAlink_cFv.s" -} -#pragma pop - -/* 801195F8-801196D8 113F38 00E0+00 1/1 0/0 0/0 .text procCoToolDemoInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoToolDemoInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801196D8-80119D98 114018 06C0+00 1/0 0/0 0/0 .text procCoToolDemo__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoToolDemo() { - nofralloc -#include "asm/d/a/d_a_alink/procCoToolDemo__9daAlink_cFv.s" -} -#pragma pop - -/* 80119D98-80119F64 1146D8 01CC+00 1/1 0/0 0/0 .text procCoTalkInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTalkInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTalkInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80119F64-8011A214 1148A4 02B0+00 1/0 0/0 0/0 .text procCoTalk__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTalk() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTalk__9daAlink_cFv.s" -} -#pragma pop - -/* 8011A214-8011A42C 114B54 0218+00 1/0 0/0 0/0 .text procCoOpenTreasureInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoOpenTreasureInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoOpenTreasureInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011A42C-8011A4C0 114D6C 0094+00 1/0 0/0 0/0 .text procCoOpenTreasure__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoOpenTreasure() { - nofralloc -#include "asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s" -} -#pragma pop - -/* 8011A4C0-8011A5CC 114E00 010C+00 1/0 0/0 0/0 .text procCoUnequipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoUnequipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoUnequipInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011A5CC-8011A688 114F0C 00BC+00 1/0 0/0 0/0 .text procCoUnequip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoUnequip() { - nofralloc -#include "asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s" -} -#pragma pop - -/* 8011A688-8011A6FC 114FC8 0074+00 4/4 0/0 0/0 .text setGetSubBgm__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setGetSubBgm(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setGetSubBgm__9daAlink_cFi.s" -} -#pragma pop - -/* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */ -// register issues. probably wrong order of operations -#ifdef NONMATCHING -bool daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { - int itemNo = i_itemNo; - if (itemNo == LINKS_SAVINGS) { - itemNo = PURPLE_RUPEE; - } - - if (itemNo - 4 < 0 || itemNo - 4 >= 4) { - return false; - } - - u16 curRupees = i_dComIfGs_getRupee(); - int tmp = itemNo - 4; - return dComIfGs_getRupeeMax() > (u16)rupeeCount[tmp] + curRupees; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkTreasureRupeeReturn(int param_0) const { - nofralloc -#include "asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s" -} -#pragma pop -#endif - -/* 8011A798-8011AC28 1150D8 0490+00 2/1 0/0 0/0 .text procCoGetItemInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGetItemInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGetItemInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011AC28-8011B3F0 115568 07C8+00 1/0 0/0 0/0 .text procCoGetItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGetItem() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGetItem__9daAlink_cFv.s" -} -#pragma pop - -/* 8011B3F0-8011B46C 115D30 007C+00 1/0 0/0 0/0 .text procCoTurnBackInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTurnBackInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011B46C-8011B57C 115DAC 0110+00 1/0 0/0 0/0 .text procCoTurnBack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTurnBack() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTurnBack__9daAlink_cFv.s" -} -#pragma pop - -/* 8011B57C-8011B71C 115EBC 01A0+00 1/0 0/0 0/0 .text procDoorOpenInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDoorOpenInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDoorOpenInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011B71C-8011B914 11605C 01F8+00 1/0 0/0 0/0 .text procDoorOpen__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDoorOpen() { - nofralloc -#include "asm/d/a/d_a_alink/procDoorOpen__9daAlink_cFv.s" -} -#pragma pop - -/* 8011B914-8011BA20 116254 010C+00 1/1 0/0 0/0 .text procCoLookWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLookWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BA20-8011BABC 116360 009C+00 1/0 0/0 0/0 .text procCoLookWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLookWait() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BABC-8011BB40 1163FC 0084+00 1/0 0/0 0/0 .text procCoDemoPushPullWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoDemoPushPullWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BB40-8011BC14 116480 00D4+00 1/0 0/0 0/0 .text procCoDemoPushMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoDemoPushMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BC14-8011BC74 116554 0060+00 2/2 0/0 0/0 .text setMonkeyMoveAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMonkeyMoveAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BC74-8011BD18 1165B4 00A4+00 1/0 0/0 0/0 .text procMonkeyMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMonkeyMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BD18-8011BD6C 116658 0054+00 1/0 0/0 0/0 .text procMonkeyMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMonkeyMove() { - nofralloc -#include "asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BD6C-8011BDF0 1166AC 0084+00 1/0 0/0 0/0 .text procDemoBoomerangCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDemoBoomerangCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BDF0-8011BE54 116730 0064+00 1/0 0/0 0/0 .text procDemoBoomerangCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDemoBoomerangCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 8011BE54-8011C1B4 116794 0360+00 2/2 0/0 0/0 .text procCoDeadInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoDeadInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procCoDeadInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8011C1B4-8011C62C 116AF4 0478+00 1/0 0/0 0/0 .text procCoDead__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoDead() { - nofralloc -#include "asm/d/a/d_a_alink/procCoDead__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C62C-8011C760 116F6C 0134+00 1/0 0/0 0/0 .text procCoLookAroundInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLookAroundInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookAroundInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C760-8011C81C 1170A0 00BC+00 1/0 0/0 0/0 .text procCoLookAround__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoLookAround() { - nofralloc -#include "asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C81C-8011C890 11715C 0074+00 1/0 0/0 0/0 .text procBossAtnWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procBossAtnWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C890-8011C904 1171D0 0074+00 1/0 0/0 0/0 .text procCoQuakeWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoQuakeWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C904-8011C9D0 117244 00CC+00 1/0 0/0 0/0 .text procCoCaughtInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoCaughtInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011C9D0-8011CA4C 117310 007C+00 1/0 0/0 0/0 .text procLookUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CA4C-8011CA98 11738C 004C+00 1/0 0/0 0/0 .text procLookUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookUp() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CA98-8011CB20 1173D8 0088+00 1/0 0/0 0/0 .text procLookUpToGetItemInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookUpToGetItemInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CB20-8011CBD4 117460 00B4+00 1/0 0/0 0/0 .text procLookUpToGetItem__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookUpToGetItem() { - nofralloc -#include "asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CBD4-8011CCA8 117514 00D4+00 1/0 0/0 0/0 .text procHandPatInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHandPatInit() { - nofralloc -#include "asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CCA8-8011CDE0 1175E8 0138+00 1/0 0/0 0/0 .text procHandPat__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procHandPat() { - nofralloc -#include "asm/d/a/d_a_alink/procHandPat__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CDE0-8011CF60 117720 0180+00 1/0 0/0 0/0 .text procCoFogDeadInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoFogDeadInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoFogDeadInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011CF60-8011D0A0 1178A0 0140+00 1/0 0/0 0/0 .text procCoFogDead__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoFogDead() { - nofralloc -#include "asm/d/a/d_a_alink/procCoFogDead__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D0A0-8011D110 1179E0 0070+00 1/0 0/0 0/0 .text procWolfSmellWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSmellWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D110-8011D1F4 117A50 00E4+00 1/0 0/0 0/0 .text procCoNodInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoNodInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D1F4-8011D268 117B34 0074+00 1/0 0/0 0/0 .text procCoNod__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoNod() { - nofralloc -#include "asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D268-8011D304 117BA8 009C+00 1/0 0/0 0/0 .text procCoEyeAwayInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoEyeAwayInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D304-8011D3CC 117C44 00C8+00 1/0 0/0 0/0 .text procCoGlareInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGlareInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D3CC-8011D474 117D0C 00A8+00 1/0 0/0 0/0 .text procCoGlare__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGlare() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D474-8011D4D4 117DB4 0060+00 1/0 0/0 0/0 .text procGoatStopReadyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoatStopReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D4D4-8011D544 117E14 0070+00 1/0 0/0 0/0 .text procGoatStopReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGoatStopReady() { - nofralloc -#include "asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D544-8011D64C 117E84 0108+00 2/1 0/0 0/0 .text procCoGetReadySitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGetReadySitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGetReadySitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D64C-8011D6D0 117F8C 0084+00 1/0 0/0 0/0 .text procCoGetReadySit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoGetReadySit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D6D0-8011D7D4 118010 0104+00 1/0 0/0 0/0 .text procCoTwGateInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTwGateInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTwGateInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D7D4-8011D82C 118114 0058+00 1/0 0/0 0/0 .text procCoTwGate__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoTwGate() { - nofralloc -#include "asm/d/a/d_a_alink/procCoTwGate__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D82C-8011D8F8 11816C 00CC+00 1/0 0/0 0/0 .text procWolfSnowEscapeInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSnowEscapeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011D8F8-8011DB04 118238 020C+00 1/0 0/0 0/0 .text procWolfSnowEscape__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSnowEscape() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSnowEscape__9daAlink_cFv.s" -} -#pragma pop - -/* 8011DB04-8011DB9C 118444 0098+00 1/0 0/0 0/0 .text procZoraMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procZoraMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011DB9C-8011DDD4 1184DC 0238+00 1/0 0/0 0/0 .text procZoraMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procZoraMove() { - nofralloc -#include "asm/d/a/d_a_alink/procZoraMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8011DDD4-8011DED8 118714 0104+00 1/0 0/0 0/0 .text procLookAroundTurnInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookAroundTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procLookAroundTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011DED8-8011DF68 118818 0090+00 1/0 0/0 0/0 .text procLookAroundTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procLookAroundTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8011DF68-8011E060 1188A8 00F8+00 1/0 0/0 0/0 .text procTradeItemOutInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTradeItemOutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E060-8011E3D8 1189A0 0378+00 1/0 0/0 0/0 .text procTradeItemOut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procTradeItemOut() { - nofralloc -#include "asm/d/a/d_a_alink/procTradeItemOut__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text checkLetterItem__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkLetterItem(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s" -} -#pragma pop - -/* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text procNotUseItemInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procNotUseItemInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procNotUseItemInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8011E57C-8011E6E0 118EBC 0164+00 1/0 0/0 0/0 .text procNotUseItem__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procNotUseItem() { - nofralloc -#include "asm/d/a/d_a_alink/procNotUseItem__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E6E0-8011E748 119020 0068+00 1/0 0/0 0/0 .text procSwordReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E748-8011E83C 119088 00F4+00 1/0 0/0 0/0 .text procSwordReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordReady() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E83C-8011E8E0 11917C 00A4+00 2/2 0/0 0/0 .text setSwordPushAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordPushAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E8E0-8011E960 119220 0080+00 1/0 0/0 0/0 .text procSwordPushInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordPushInit() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E960-8011E9F8 1192A0 0098+00 1/0 0/0 0/0 .text procSwordPush__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procSwordPush() { - nofralloc -#include "asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s" -} -#pragma pop - -/* 8011E9F8-8011EA78 119338 0080+00 1/0 0/0 0/0 .text procGanonFinishInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procGanonFinishInit() { - nofralloc -#include "asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ -bool daAlink_c::procGanonFinish() { - i_onEndResetFlg1(GANON_FINISH); - mCurrent.mPosition = field_0x37c8; - if (mFrameCtrl1[0].checkAnmEnd()) { - setSingleAnimeBaseMorf(ANM_GANON_FINISH, lit_6041); - } - return true; -} - -/* 8011EAE8-8011EB8C 119428 00A4+00 1/0 0/0 0/0 .text procCutFastReadyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFastReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011EB8C-8011EBDC 1194CC 0050+00 1/0 0/0 0/0 .text procCutFastReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCutFastReady() { - nofralloc -#include "asm/d/a/d_a_alink/procCutFastReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8011EBDC-8011EC60 11951C 0084+00 1/0 0/0 0/0 .text procMasterSwordStickInit__9daAlink_cFv */ -int daAlink_c::procMasterSwordStickInit() { - if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_STICK)) { - return 0; - } - - setSingleAnimeBase(ANM_MASTER_SWORD_STICK_INIT); - voiceStart(Z2SE_AL_V_MSTR_SW_STICK); - mNormalSpeed = FLOAT_LABEL(lit_6108); - mCurrent.mAngle.y = mCollisionRot.y; - mCommonCounter = 0; - - return 1; -} - -/* 8011EC60-8011ED18 1195A0 00B8+00 1/0 0/0 0/0 .text procMasterSwordStick__9daAlink_cFv - */ -int daAlink_c::procMasterSwordStick() { - daPy_frameCtrl_c* fCtrl = &mFrameCtrl1[0]; - - if (mCommonCounter != 0) { - dComIfGp_evmng_cutEnd(field_0x3184); - } else if (fCtrl->checkAnmEnd()) { - mCommonCounter = 1; - setSingleAnimeBaseMorf(ANM_MASTER_SWORD_STICK, lit_6041); - dComIfGp_evmng_cutEnd(field_0x3184); - } else if (fCtrl->getFrame() >= lit_14621) { - field_0x2f93 = 5; - } - - return 1; -} - -/* 8011ED18-8011ED8C 119658 0074+00 1/0 0/0 0/0 .text procMasterSwordPullInit__9daAlink_cFv */ -int daAlink_c::procMasterSwordPullInit() { - if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_PULL)) { - return 0; - } - - setSingleAnimeBase(ANM_MASTER_SWORD_PULL_INIT); - voiceStart(Z2SE_AL_V_MSTR_SW_PULLOUT); - field_0x3010 = 0; - - return 1; -} - -/* 8011ED8C-8011EE40 1196CC 00B4+00 1/0 0/0 0/0 .text procMasterSwordPull__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procMasterSwordPull() { - nofralloc -#include "asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s" -} -#pragma pop - -/* 8011EE40-8011EE94 119780 0054+00 5/5 0/0 0/0 .text checkLv7DungeonShop__9daAlink_cFv - */ -BOOL daAlink_c::checkLv7DungeonShop() { - return checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 16; -} - -/* 8011EE94-8011EFB8 1197D4 0124+00 1/1 0/0 0/0 .text procDungeonWarpReadyInit__9daAlink_cFv */ -int daAlink_c::procDungeonWarpReadyInit() { - if (!dComIfGp_event_compulsory(this, NULL, -1)) { - return 0; - } - - u32 id; - if (checkItemSetButton(DUNGEON_EXIT) != 2) { - id = fopAcM_create(PROC_OBJ_TKS, 0, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); - } else { - id = fopAcM_create(PROC_NPC_TKC, 2, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); - } - - if (id == -1) { - return 0; - } - - mDemo.i_setSpecialDemoType(); - commonProcInit(PROC_DUNGEON_WARP_READY); - setSingleAnimeBase(ANM_DUNGEON_WARP_READY_INIT); - mNormalSpeed = FLOAT_LABEL(lit_6108); - mCurrent.mAngle.y = mCollisionRot.y; - field_0x32cc = id; - mCommonCounter = 0; - keepItemData(); - - return 1; -} - -/* 8011EFB8-8011F084 1198F8 00CC+00 1/0 0/0 0/0 .text procDungeonWarpReady__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpReady() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarpReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8011F084-8011F0F4 1199C4 0070+00 1/0 0/0 0/0 .text procDungeonWarpInit__9daAlink_cFv - */ -#ifdef NONMATCHING -bool daAlink_c::procDungeonWarpInit() { - if (!commonProcInitNotSameProc(DUNEGON_WARP_START) { - mCommonCounter = 0; - field_0x3012 = 0; - setSpecialGravity(0.0f, mMaxFallSpeed, 0); - field_0x300e = 0; - field_0x3010 = 0; - } - - return 1; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 8011F0F4-8011F360 119A34 026C+00 1/0 0/0 0/0 .text procDungeonWarp__9daAlink_cFv */ -// matches with literals -#ifdef NONMATCHING -int daAlink_c::procDungeonWarp() { - mCommonCounter += 0x200; - - if (mCommonCounter > 0x4000) { - mCommonCounter = 0x4000; - } else { - mCurrent.mPosition.y += 1.0f; - } - - f32 sin = cM_ssin(mCommonCounter); - mCollisionRot.y += (s16)(14336.0f * sin); - field_0x300e = 8.0f * sin + 24.0f * (1.0f - mScale.x); - - if (field_0x3012 != 0) { - return 1; - } else { - if (mCommonCounter == 0x4000) { - if (field_0x3010 == 0) { - dComIfGp_particle_set(0xA61, &mCurrent.mPosition, &mTevStr, NULL, NULL); - field_0x3010 = 1; - } - - cLib_addCalc(&mScale.x, 0.0f, 0.5f, 0.4f, 0.005f); - cLib_addCalc(&mScale.y, 2.5f, 0.5f, 0.5f, 0.1f); - - if (mScale.x < 0.01f) { - i_onNoResetFlg0(FLG0_UNK_8000000); - if (checkItemGet(DUNGEON_EXIT, 1)) { - int escape = dStage_stagInfo_GetEscapeWarp(i_dComIfGp_getStage()->getStagInfo()); - dStage_changeScene(escape, 0.0f, 12, -1, mCollisionRot.y, -1); - dMeter2Info_warpOutProc(); - } else { - dungeonReturnWarp(); - dMeter2Info_warpInProc(); - } - - field_0x3012 = 1; - } - mCurrent.mPosition.y += 5.0f; - field_0x2b98 = (1.0f - mScale.y) * 100.0f; - } else if (mCommonCounter >= 0x2000) { - cLib_chaseF(&mScale.x, 0.8f, 0.01f); - } - - mScale.z = mScale.x; - field_0x0650->setBaseScale(mScale); - } - - return 1; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int daAlink_c::procDungeonWarp() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarp__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 8011F360-8011F460 119CA0 0100+00 2/1 0/0 0/0 .text procDungeonWarpSceneStartInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpSceneStartInit() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarpSceneStartInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8011F460-8011F5D4 119DA0 0174+00 1/0 0/0 0/0 .text procDungeonWarpSceneStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procDungeonWarpSceneStart() { - nofralloc -#include "asm/d/a/d_a_alink/procDungeonWarpSceneStart__9daAlink_cFv.s" -} -#pragma pop - -/* 8011F5D4-8011F658 119F14 0084+00 2/2 0/0 0/0 .text daAlink_searchPortal__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchPortal__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 8011F658-8011F7D8 119F98 0180+00 1/1 0/0 0/0 .text checkAcceptWarp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkAcceptWarp() { - nofralloc -#include "asm/d/a/d_a_alink/checkAcceptWarp__9daAlink_cFv.s" -} -#pragma pop - -/* 8011F7D8-8011F8B8 11A118 00E0+00 2/2 0/0 0/0 .text dungeonReturnWarp__9daAlink_cFv */ -void daAlink_c::dungeonReturnWarp() { - cXyz pos = dComIfGs_getWarpPlayerPos(); - s16 angle = dComIfGs_getWarpPlayerAngleY(); - s8 room = dComIfGs_getWarpRoomNo(); - char name[8]; - strcpy(name, dComIfGs_getWarpStageName()); - - dComIfGs_setRestartRoom(pos, angle, room); - dComIfGp_setNextStage(name, -1, dComIfGs_getRestartRoomNo(), -1, FLOAT_LABEL(lit_6108), 12, 0, - 0, 0, 1, 0); - u32 data = setParamData(dComIfGs_getRestartRoomNo(), 0, 0xCA, 0); - dComIfGs_setRestartRoomParam(data); -} - -/* 8011F8B8-8011F9EC 11A1F8 0134+00 1/0 0/0 0/0 .text skipPortalObjWarp__9daAlink_cFv */ -void daAlink_c::skipPortalObjWarp() { - if (mProcID == PROC_WARP && field_0x300e <= 0) { - return; - } - - if (i_checkNoResetFlg3(FLG3_UNK_2000000) && - (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { - dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), mCollisionRot.y, - -1); - } else { - u32 data = setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0); - dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), - dMeter2Info_getWarpRoomNo(), data); - dComIfGp_setNextStage(dMeter2Info_getWarpStageName(), -4, dMeter2Info_getWarpRoomNo(), -1, - FLOAT_LABEL(lit_6108), 0, 1, 0, mCollisionRot.y, 1, 0); - } - - if (mProcID == PROC_WARP) { - field_0x300e = -1; - } -} - -/* 8011F9EC-8011FBC0 11A32C 01D4+00 1/1 0/0 0/0 .text checkWarpStart__9daAlink_cFv */ -void daAlink_c::checkWarpStart() { - if (dMeter2Info_getWarpStatus() != 0) { - if (dMeter2Info_getWarpStatus() == 3 || dComIfGp_event_compulsory(this, 0, 0xFFFF)) { - i_onNoResetFlg0(0x4000); - if (dMeter2Info_getWarpStatus() == 3) { - const char* portal; - if (!i_checkMidnaRide()) { - if (dComIfGp_TargetWarpPt_get() == 3) { - mEvtInfo.setArchiveName("Obj_kbrg"); - portal = kBridgePortal; - } else if (dComIfGp_TargetWarpPt_get() == 6) { - mEvtInfo.setArchiveName("Obj_obrg"); - portal = oBridgePortal; - } else if (dComIfGp_TargetWarpPt_get() == 9) { - mEvtInfo.setArchiveName("M_VolcBom"); - portal = volcBomPortal; - } else if (dComIfGp_TargetWarpPt_get() == 8) { - mEvtInfo.setArchiveName("SCanCrs"); - portal = cannonPortal; - } else { - portal = defaultPortal; - } - } else { - dComIfGp_TargetWarpPt_set(0xFF); - portal = defaultPortal; - } - fopAcM_orderOtherEvent(this, portal, 0xFFFF, 1, 1); - } else { - mDemo.i_setSpecialDemoType(); - if (dMeter2Info_getWarpStatus() == 1) { - stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); - u32 tmp = dStage_stagInfo_GetEscapeWarp(stag_info); - dStage_changeScene(tmp, FLOAT_LABEL(lit_6108), 0, -1, mCollisionRot.y, -1); - } else { - dungeonReturnWarp(); - } - } - } - g_meter2_info.resetWarpStatus(); - } -} - -/* 8011FBC0-8011FD4C 11A500 018C+00 3/3 0/0 0/0 .text warpModelTexScroll__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::warpModelTexScroll() { - nofralloc -#include "asm/d/a/d_a_alink/warpModelTexScroll__9daAlink_cFv.s" -} -#pragma pop - -/* 8011FD4C-80120124 11A68C 03D8+00 2/2 0/0 0/0 .text procCoWarpInit__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoWarpInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procCoWarpInit__9daAlink_cFii.s" -} -#pragma pop - -/* 80120124-80120440 11AA64 031C+00 1/0 0/0 0/0 .text procCoWarp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procCoWarp() { - nofralloc -#include "asm/d/a/d_a_alink/procCoWarp__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_demo.inc" /* 80120440-80120474 11AD80 0034+00 1/0 0/0 0/0 .text commonWaitTurnInit__9daAlink_cFv */ void daAlink_c::commonWaitTurnInit() { @@ -32095,3502 +16597,177 @@ void daAlink_c::commonFallInit(int param_0) { if (i_checkWolf()) { procWolfFallInit(param_0, daAlinkHIO_wlAutoJump_c0::m.field_0x54); } else { - procFallInit(param_0, daAlinkHIO_autoJump_c0::m.field_0x70); + procFallInit(param_0, daAlinkHIO_autoJump_c0::m.mFallInterpolation); } } -/* 80120580-80120634 11AEC0 00B4+00 21/21 0/0 0/0 .text - * setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ -// matches with literal -#ifdef NONMATCHING -void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) { - *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &mTevStr, param_3, NULL, 0xFF, - NULL, 0xFF, NULL, NULL, NULL); - dComIfGp_particle_levelEmitterOnEventMove(*param_0); - dComIfGp_particle_getEmitter(*param_0); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3) { - nofralloc -#include "asm/d/a/d_a_alink/setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" -} -#pragma pop -#endif +#include "d/a/d_a_alink_effect.inc" -/* 80120634-801206C4 11AF74 0090+00 4/4 0/0 0/0 .text - * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */ -void daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, - cXyz const* param_3, csXyz const* param_4) { - *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr, - param_4, NULL, 0, NULL, -1, NULL); - dComIfGp_particle_levelEmitterOnEventMove(*param_0); - dComIfGp_particle_getEmitter(*param_0); -} - -/* 801206C4-80120778 11B004 00B4+00 2/2 0/0 0/0 .text - * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2, - csXyz const* param_3) { - nofralloc -#include "asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" -} -#pragma pop - -/* 80120778-801207BC 11B0B8 0044+00 9/9 0/0 0/0 .text stopDrawParticle__9daAlink_cFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::stopDrawParticle(u32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s" -} -#pragma pop - -/* 801207BC-80120880 11B0FC 00C4+00 1/0 0/0 0/0 .text setEffectFrontRollParam__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffectFrontRollParam() { - nofralloc -#include "asm/d/a/d_a_alink/setEffectFrontRollParam__9daAlink_cFv.s" -} -#pragma pop - -/* 80120880-80120B00 11B1C0 0280+00 1/0 0/0 0/0 .text setEffectSlipParam__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffectSlipParam() { - nofralloc -#include "asm/d/a/d_a_alink/setEffectSlipParam__9daAlink_cFv.s" -} -#pragma pop - -/* 80120B00-80120DB0 11B440 02B0+00 1/0 0/0 0/0 .text setEffectRunParam__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffectRunParam() { - nofralloc -#include "asm/d/a/d_a_alink/setEffectRunParam__9daAlink_cFv.s" -} -#pragma pop - -/* 80120DB0-80121000 11B6F0 0250+00 1/0 0/0 0/0 .text setEffectSmallLandParam__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffectSmallLandParam() { - nofralloc -#include "asm/d/a/d_a_alink/setEffectSmallLandParam__9daAlink_cFv.s" -} -#pragma pop - -/* 80121000-80121004 11B940 0004+00 1/0 0/0 0/0 .text setEffectLandParam__9daAlink_cFv */ -void daAlink_c::setEffectLandParam() { - /* empty function */ -} - -/* 80121004-801211C0 11B944 01BC+00 1/0 0/0 0/0 .text setEffectSumouParam__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffectSumouParam() { - nofralloc -#include "asm/d/a/d_a_alink/setEffectSumouParam__9daAlink_cFv.s" -} -#pragma pop - -/* 801211C0-80121214 11BB00 0054+00 46/46 0/0 0/0 .text setFootEffectProcType__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFootEffectProcType(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setFootEffectProcType__9daAlink_cFi.s" -} -#pragma pop - -/* 80121214-80121304 11BB54 00F0+00 1/1 0/0 0/0 .text setWolfFootOn__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfFootOn(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfFootOn__9daAlink_cFi.s" -} -#pragma pop - -/* 80121304-80121388 11BC44 0084+00 1/1 0/0 0/0 .text setFootMark__9daAlink_cFP4cXyzUsi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFootMark(cXyz* param_0, u16 param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setFootMark__9daAlink_cFP4cXyzUsi.s" -} -#pragma pop - -/* 80121388-801221F0 11BCC8 0E68+00 1/1 0/0 0/0 .text setEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801221F0-801225E8 11CB30 03F8+00 1/1 0/0 0/0 .text setSumouEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSumouEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setSumouEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801225E8-80122654 11CF28 006C+00 1/1 0/0 0/0 .text setWaterfallEffect__9daAlink_cFPC4cXyzPUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterfallEffect(cXyz const* param_0, u32* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFPC4cXyzPUl.s" -} -#pragma pop - -/* 80122654-8012277C 11CF94 0128+00 1/1 0/0 0/0 .text setWaterfallEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterfallEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 8012277C-801228F4 11D0BC 0178+00 1/1 0/0 0/0 .text setMagneBootsEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMagneBootsEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setMagneBootsEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801228F4-80122BBC 11D234 02C8+00 1/1 0/0 0/0 .text setSwordChargeEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordChargeEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordChargeEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80122BBC-80122F18 11D4FC 035C+00 1/1 0/0 0/0 .text setElecDamageEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setElecDamageEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setElecDamageEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80122F18-80122F78 11D858 0060+00 1/1 0/0 0/0 .text clearCutTurnEffectID__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::clearCutTurnEffectID() { - nofralloc -#include "asm/d/a/d_a_alink/clearCutTurnEffectID__9daAlink_cFv.s" -} -#pragma pop - -/* 80122F78-801233A4 11D8B8 042C+00 1/1 0/0 0/0 .text setCutTurnEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutTurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setCutTurnEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801233A4-80123434 11DCE4 0090+00 1/1 0/0 0/0 .text setHorseCutTurnEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setHorseCutTurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setHorseCutTurnEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80123434-801236BC 11DD74 0288+00 1/1 0/0 0/0 .text setCutLargeJumpLandEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutLargeJumpLandEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setCutLargeJumpLandEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801236BC-801237A8 11DFFC 00EC+00 1/1 0/0 0/0 .text setBootsLightEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBootsLightEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setBootsLightEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801237A8-801238FC 11E0E8 0154+00 1/1 0/0 0/0 .text setLightningSwordEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setLightningSwordEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setLightningSwordEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801238FC-801239B0 11E23C 00B4+00 1/1 0/0 0/0 .text setWolfRollAttackEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfRollAttackEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfRollAttackEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801239B0-80123BF0 11E2F0 0240+00 1/1 0/0 0/0 .text setWolfDigEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfDigEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfDigEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80123BF0-80123C8C 11E530 009C+00 2/2 0/0 0/0 .text - * setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfSwimEndEffect(JPABaseEmitter** param_0, JPABaseEmitter** param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter.s" -} -#pragma pop - -/* 80123C8C-80123D88 11E5CC 00FC+00 1/1 0/0 0/0 .text setWolfLockAttackEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfLockAttackEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfLockAttackEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80123D88-80123ED0 11E6C8 0148+00 1/1 0/0 0/0 .text setWolfJumpAttackEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfJumpAttackEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfJumpAttackEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80123ED0-80124144 11E810 0274+00 2/2 0/0 0/0 .text - * setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk.s" -} -#pragma pop - -/* 80124144-801241E0 11EA84 009C+00 9/9 0/0 0/0 .text setCutWaterDropEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setCutWaterDropEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801241E0-801244E4 11EB20 0304+00 1/1 0/0 0/0 .text setWaterDropEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWaterDropEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWaterDropEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801244E4-801245EC 11EE24 0108+00 1/1 0/0 0/0 .text setSwordUpColorEffect__9daAlink_cFv - */ -// matches with literals -#ifdef NONMATCHING -void daAlink_c::setSwordUpColorEffect() { - f32 max_intensity; - if (mSwordUpTimer != 0) { - max_intensity = 1.0f; - } else { - max_intensity = 0.0f; - } - cLib_chaseF(&mSwordUpColorIntensity, max_intensity, 0.1f); - - for (int i = 0; i < 2; i++) { - field_0x32b0[i].mColor.r = mSwordUpColorIntensity * swordUpColor[i].r; - field_0x32b0[i].mColor.g = mSwordUpColorIntensity * swordUpColor[i].g; - field_0x32b0[i].mColor.b = mSwordUpColorIntensity * swordUpColor[i].b; - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordUpColorEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordUpColorEffect__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 801245EC-80124738 11EF2C 014C+00 1/1 0/0 0/0 .text setSwordCutSplash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSwordCutSplash() { - nofralloc -#include "asm/d/a/d_a_alink/setSwordCutSplash__9daAlink_cFv.s" -} -#pragma pop - -/* 80124738-801247A8 11F078 0070+00 1/1 0/0 0/0 .text setMetamorphoseEffectStartLink__9daAlink_cFv - */ -void daAlink_c::setMetamorphoseEffectStartLink() { - setEmitter(&field_0x31f8, 0x24F, &field_0x37c8, NULL); - setEmitter(&field_0x31fc, 0x250, &field_0x37c8, NULL); - setEmitter(&field_0x3200, 0x6E8, &cXyz::Zero, NULL); -} - -/* 801247A8-801248A8 11F0E8 0100+00 1/1 0/0 0/0 .text setMetamorphoseEffect__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setMetamorphoseEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setMetamorphoseEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801248A8-80124A2C 11F1E8 0184+00 1/1 0/0 0/0 .text setRunSplash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setRunSplash() { - nofralloc -#include "asm/d/a/d_a_alink/setRunSplash__9daAlink_cFv.s" -} -#pragma pop - -/* 80124A2C-80124B68 11F36C 013C+00 1/0 0/0 0/0 .text - * execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle() { - // asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* - // param_1) { - nofralloc -#include "asm/d/a/d_a_alink/execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle.s" -} -#pragma pop - -/* 80124B68-80124BA4 11F4A8 003C+00 2/2 0/0 0/0 .text resetFairyEffect__9daAlink_cFv */ -void daAlink_c::resetFairyEffect() { - stopDrawParticle(field_0x3258); - stopDrawParticle(field_0x325c); -} - -/* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text setBottleEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBottleEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setBottleEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80124E28-80124EA8 11F768 0080+00 2/2 0/0 0/0 .text clearFirePointDamageEffect__9daAlink_cFi */ -void daAlink_c::clearFirePointDamageEffect(int i) { - firePointEff_c* fire_eff = &field_0x32d8[i]; - - if (fire_eff->field_0x0 != 0) { - stopDrawParticle(fire_eff->field_0x4); - stopDrawParticle(fire_eff->field_0x8); - } - fire_eff->field_0x0 = 0; - fire_eff->field_0x24 = cXyz::Zero; -} - -/* 80124EA8-80124FA4 11F7E8 00FC+00 1/1 0/0 0/0 .text initFirePointDamageEffectAll__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initFirePointDamageEffectAll() { - nofralloc -#include "asm/d/a/d_a_alink/initFirePointDamageEffectAll__9daAlink_cFv.s" -} -#pragma pop - -/* 80124FA4-80125128 11F8E4 0184+00 1/1 0/0 0/0 .text - * initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initFirePointDamageEffect(cXyz const* param_0, dCcD_GObjInf* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf.s" -} -#pragma pop - -/* 80125128-80125338 11FA68 0210+00 1/1 0/0 0/0 .text setFirePointDamageEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFirePointDamageEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setFirePointDamageEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80125338-80125524 11FC78 01EC+00 1/1 0/0 0/0 .text setFreezeEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setFreezeEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setFreezeEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 80125524-801255BC 11FE64 0098+00 1/1 0/0 0/0 .text setWoodShieldBurnEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWoodShieldBurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801255BC-80125628 11FEFC 006C+00 3/3 0/0 0/0 .text clearWoodShieldBurnEffect__9daAlink_cFv */ -#ifdef NONMATCHING -void daAlink_c::clearWoodShieldBurnEffect() { - if (field_0x2fcb != 0) { - for (int i = 0; i < 2; i++) { - stopDrawParticle(field_0x3260[i].field_0x0); - } - field_0x2fcb = 0; - } -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::clearWoodShieldBurnEffect() { - nofralloc -#include "asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 80125628-801256EC 11FF68 00C4+00 1/1 0/0 0/0 .text setWoodShieldBurnOutEffect__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWoodShieldBurnOutEffect() { - nofralloc -#include "asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s" -} -#pragma pop - -/* 801256EC-80125778 12002C 008C+00 2/2 0/0 0/0 .text - * initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz */ -void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, cXyz const* param_3, - cXyz const* param_4) { - field_0x24 = param_0; - field_0x1c = param_1; - field_0x2c = *param_4; - field_0x38[0] = *param_2; - field_0x308[0] = *param_3; - field_0x38[1] = field_0x38[0]; - field_0x308[1] = field_0x308[0]; - field_0x14 = 0; -} - -/* 80125778-8012589C 1200B8 0124+00 1/1 0/0 0/0 .text - * setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void setBezierPos(cXyz const* param_0, cXyz const* param_1, cXyz const* param_2, - cXyz const* param_3, f32 param_4, cXyz* param_5) { - nofralloc -#include "asm/d/a/d_a_alink/setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz.s" -} -#pragma pop - -/* 8012589C-80125B0C 1201DC 0270+00 1/1 0/0 0/0 .text - * copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_blur_c::copyBlur(cXyz const* param_0, cXyz const* param_1, cXyz const* param_2) { - nofralloc -#include "asm/d/a/d_a_alink/copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz.s" -} -#pragma pop - -/* 80125B0C-80125BF4 12044C 00E8+00 1/1 0/0 0/0 .text traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804256CC-804256EC 0523EC 0020+00 1/1 0/0 0/0 .bss texObj$42524 */ -static u8 texObj[32]; - -/* 804506A4-804506A8 000124 0004+00 1/1 0/0 0/0 .sdata nColor0$42525 */ -SECTION_SDATA static u8 nColor0[4] = { - 0xFF, - 0xFF, - 0xFF, - 0x14, -}; - -/* 80125BF4-80125F14 120534 0320+00 1/0 0/0 0/0 .text draw__14daAlink_blur_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void draw__14daAlink_blur_cFv() { - // asm void daAlink_blur_c::draw() { - nofralloc -#include "asm/d/a/d_a_alink/draw__14daAlink_blur_cFv.s" -} -#pragma pop - -/* 80125F14-80126350 120854 043C+00 1/1 0/0 0/0 .text create__20daAlink_lockCursor_cFv */ -BOOL daAlink_lockCursor_c::create() { - JKRArchive* arc = dComIfG_getObjectResInfo(l_arcName)->getArchive(); - - f32 tmp = FLOAT_LABEL(lit_6108); - field_0x2c = tmp; - field_0x4 = false; - field_0x30 = tmp; - - mScrn = new J2DScreen(); - if (mScrn == NULL) { - return false; - } - - mScrn->setPriority("zelda_v_cursor_new_yellow.blo", 0x100000, arc); - dPaneClass_showNullPane(mScrn); - - void* tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bpk", arc); - field_0x24 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(tmpData); - if (field_0x24 == NULL) { - return false; - } - - tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bck", arc); - field_0x28 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(tmpData); - if (field_0x28 == NULL) { - return false; - } - - tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow_02.brk", arc); - field_0x1c = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); - if (field_0x1c == NULL) { - return false; - } - - tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.brk", arc); - field_0x20 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); - if (field_0x20 == NULL) { - return false; - } - - field_0xc = mScrn->search('n_all'); - mCursor0 = mScrn->search('cursor0'); - mCursor1 = mScrn->search('cursor1'); - mCursor2 = mScrn->search('cursor2'); - - field_0x28->searchUpdateMaterialID(mScrn); - field_0xc->setAnimation(field_0x28); - mCursor0->setAnimation(field_0x28); - mCursor1->setAnimation(field_0x28); - mCursor2->setAnimation(field_0x28); - field_0x28->setFrame(FLOAT_LABEL(lit_6108)); - - field_0x24->searchUpdateMaterialID(mScrn); - mCursor0->setAnimation(field_0x24); - mCursor1->setAnimation(field_0x24); - mCursor2->setAnimation(field_0x24); - mScrn->search('flash')->setAnimation(field_0x24); - field_0x24->setFrame(FLOAT_LABEL(lit_6108)); - - field_0x1c->searchUpdateMaterialID(mScrn); - field_0x20->searchUpdateMaterialID(mScrn); - mCursor0->setAnimation(field_0x1c); - mCursor1->setAnimation(field_0x1c); - mCursor2->setAnimation(field_0x1c); - mCursor0->setAnimation(field_0x20); - mCursor1->setAnimation(field_0x20); - mCursor2->setAnimation(field_0x20); - f32 tmp2 = FLOAT_LABEL(lit_6108); - field_0x1c->setFrame(tmp2); - field_0x20->setFrame(tmp2); - - mScrn->animation(); - mScrn->setUserInfo('n_43'); - field_0xc->setUserInfo(0x20); - return true; -} - -/* 80126350-80126354 120C90 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTevRegKey */ -// void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) { -extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey() { - /* empty function */ -} - -/* 80126354-80126358 120C94 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP11J2DAnmColor */ -// void J2DPane::setAnimation(J2DAnmColor* param_0) { -extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor() { - /* empty function */ -} - -/* 80126358-80126424 120C98 00CC+00 1/1 0/0 0/0 .text update__20daAlink_lockCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_lockCursor_c::update() { - nofralloc -#include "asm/d/a/d_a_alink/update__20daAlink_lockCursor_cFv.s" -} -#pragma pop - -/* 80126424-80126650 120D64 022C+00 1/0 0/0 0/0 .text draw__20daAlink_lockCursor_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void draw__20daAlink_lockCursor_cFv() { - // asm void daAlink_lockCursor_c::draw() { - nofralloc -#include "asm/d/a/d_a_alink/draw__20daAlink_lockCursor_cFv.s" -} -#pragma pop - -/* 80126650-801266C0 120F90 0070+00 1/1 0/0 0/0 .text create__15daAlink_sight_cFv */ -bool daAlink_sight_c::create() { - if (!mLockCursor.create()) { - return false; - } - ResTIMG* data = (ResTIMG*)dComIfG_getObjectRes(l_arcName, daAlink_c::getSightBti()); - setSightImage(data); - return true; -} - -/* 801266C0-80126710 121000 0050+00 1/0 0/0 0/0 .text draw__15daAlink_sight_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -extern "C" asm void draw__15daAlink_sight_cFv() { - // asm void daAlink_sight_c::draw() { - nofralloc -#include "asm/d/a/d_a_alink/draw__15daAlink_sight_cFv.s" -} -#pragma pop - -/* 80126710-80126740 121050 0030+00 2/2 0/0 0/0 .text onLockFlg__15daAlink_sight_cFv */ -// matches with literals -#ifdef NONMATCHING -void daAlink_sight_c::onLockFlg() { - if (mLockFlag) { - return; - } - mLockFlag = true; - mLockCursor.initFrame(); -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_sight_c::onLockFlg() { - nofralloc -#include "asm/d/a/d_a_alink/onLockFlg__15daAlink_sight_cFv.s" -} -#pragma pop -#endif - -/* 80126740-80126928 121080 01E8+00 2/2 0/0 0/0 .text changeCommon__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeCommon() { - nofralloc -#include "asm/d/a/d_a_alink/changeCommon__9daAlink_cFv.s" -} -#pragma pop - -/* 80126928-80126F3C 121268 0614+00 2/2 0/0 0/0 .text changeWolf__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeWolf() { - nofralloc -#include "asm/d/a/d_a_alink/changeWolf__9daAlink_cFv.s" -} -#pragma pop - -/* 80126F3C-80127C54 12187C 0D18+00 2/2 0/0 0/0 .text changeLink__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeLink(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeLink__9daAlink_cFi.s" -} -#pragma pop - -/* 80127C54-80127CAC 122594 0058+00 2/2 0/0 0/0 .text onWolfEyeUp__9daAlink_cFv */ -void daAlink_c::onWolfEyeUp() { - if (mWolfEyeUp == 0) { - mZ2Link.setWolfEyeOpen(true); - mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; - field_0x2fd2 = 20; - } -} - -/* 80127CAC-80127CF0 1225EC 0044+00 5/5 0/0 0/0 .text offWolfEyeUp__9daAlink_cFv */ -void daAlink_c::offWolfEyeUp() { - if (mWolfEyeUp != 0) { - mWolfEyeUp = 0; - field_0x2fd2 = 20; - mZ2Link.setWolfEyeOpen(false); - } -} - -/* 80127CF0-80127D14 122630 0024+00 1/1 0/0 0/0 .text wolfSenseTrigger__9daAlink_cFv */ -BOOL daAlink_c::wolfSenseTrigger() { - return itemTriggerCheck(BTN_X); -} - -/* 80127D14-80127D2C 122654 0018+00 1/1 0/0 0/0 .text setWolfSenceStatus__9daAlink_cFUc - */ -void daAlink_c::setWolfSenceStatus(u8 status) { - dComIfGp_setXStatus(status, 0); -} - -/* 80127D2C-80127D50 12266C 0024+00 1/1 0/0 0/0 .text wolfClawTrigger__9daAlink_cFv */ -void daAlink_c::wolfClawTrigger() { - itemTriggerCheck(BTN_Y); -} - -/* 80127D50-80127D68 122690 0018+00 2/2 0/0 0/0 .text setWolfDigStatus__9daAlink_cFUc */ -void daAlink_c::setWolfDigStatus(u8 flag) { - dComIfGp_setYStatus(13, flag); -} - -/* 80127D68-80127DC4 1226A8 005C+00 4/4 0/0 0/0 .text checkWolfShapeReverse__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL daAlink_c::checkWolfShapeReverse() const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s" -} -#pragma pop - -/* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text checkWolfSideStep__9daAlink_cCFv */ -BOOL daAlink_c::checkWolfSideStep() const { - return field_0x2f98 != 0 && - ((mProcID == PROC_WOLF_ATN_AC_MOVE && !i_checkModeFlg(1)) || mProcID == PROC_WOLF_SIDESTEP_LAND || - mProcID == PROC_WOLF_BACKJUMP_LAND); -} - -/* 80127E08-80127F20 122748 0118+00 1/1 0/0 0/0 .text setWolfTailAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfTailAngle() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfTailAngle__9daAlink_cFv.s" -} -#pragma pop - -/* 80127F20-80127F50 122860 0030+00 5/5 0/0 0/0 .text checkWolfSlowDash__9daAlink_cFv */ -BOOL daAlink_c::checkWolfSlowDash() { - return field_0x2fc7 == 1 || field_0x2fc7 == 3 || field_0x3174 == 11; -} - -/* 80127F50-80128478 122890 0528+00 1/1 0/0 0/0 .text setSpeedAndAngleWolf__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpeedAndAngleWolf() { - nofralloc -#include "asm/d/a/d_a_alink/setSpeedAndAngleWolf__9daAlink_cFv.s" -} -#pragma pop - -/* 80128478-80128798 122DB8 0320+00 2/2 0/0 0/0 .text setSpeedAndAngleWolfAtn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpeedAndAngleWolfAtn() { - nofralloc -#include "asm/d/a/d_a_alink/setSpeedAndAngleWolfAtn__9daAlink_cFv.s" -} -#pragma pop - -/* 80128798-8012880C 1230D8 0074+00 4/4 0/0 0/0 .text checkWolfAtnWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfAtnWait() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfAtnWait__9daAlink_cFv.s" -} -#pragma pop - -/* void daAlink_c::checkWolfAtnWait() { - return checkEnemyGroup(mTargetedActor) && mDemo.getDemoMode() == 0x17 || mTargetedActor != NULL -|| fopAcM_GetName(mTargetedActor) == 0x262 || -} */ - -/* 8012880C-80128844 12314C 0038+00 27/27 0/0 0/0 .text - * checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM */ -BOOL daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM anm_id) const { - return mUnderAnime[0].checkNoSetArcNo() && - m_wlAnmDataTable[anm_id].field_0x0 == mUnderAnime[0].getIdx(); -} - -/* 80128844-80128F0C 123184 06C8+00 11/11 0/0 0/0 .text setBlendWolfMoveAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBlendWolfMoveAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 80128F0C-80128F5C 12384C 0050+00 2/2 0/0 0/0 .text checkWolfAtnMoveBack__9daAlink_cFs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfAtnMoveBack(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s" -} -#pragma pop - -/* 80128F5C-80129114 12389C 01B8+00 5/5 0/0 0/0 .text setWolfAtnMoveDirection__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfAtnMoveDirection() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfAtnMoveDirection__9daAlink_cFv.s" -} -#pragma pop - -/* 80129114-8012933C 123A54 0228+00 2/2 0/0 0/0 .text setBlendWolfAtnMoveAnime__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBlendWolfAtnMoveAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBlendWolfAtnMoveAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 8012933C-8012948C 123C7C 0150+00 1/1 0/0 0/0 .text setBlendWolfAtnBackMoveAnime__9daAlink_cFf - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setBlendWolfAtnBackMoveAnime__9daAlink_cFf.s" -} -#pragma pop - -/* 8012948C-80129678 123DCC 01EC+00 3/3 0/0 0/0 .text - * setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2, - daAlink_c::daAlink_WANM param_3, - daAlink_c::daAlink_WANM param_4, int param_5, f32 param_6) { - nofralloc -#include "asm/d/a/d_a_alink/setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif.s" -} -#pragma pop - -/* 80129678-801296A8 123FB8 0030+00 35/35 0/0 0/0 .text - * setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBase(daAlink_c::daAlink_WANM param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s" -} -#pragma pop - -/* 801296A8-801296D8 123FE8 0030+00 3/3 0/0 0/0 .text - * setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" -} -#pragma pop - -/* 801296D8-80129704 124018 002C+00 44/44 0/0 0/0 .text - * setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM param_0, f32 param_1, - f32 param_2) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s" -} -#pragma pop - -/* 80129704-80129848 124044 0144+00 29/29 0/0 0/0 .text - * setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM param_0, f32 param_1, f32 param_2, - s16 param_3, f32 param_4) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf.s" -} -#pragma pop - -/* 80129848-8012987C 124188 0034+00 53/53 0/0 0/0 .text - * setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSingleAnimeWolfParam(daAlink_c::daAlink_WANM param_0, - daAlinkHIO_anm_c const* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s" -} -#pragma pop - -/* 8012987C-80129958 1241BC 00DC+00 5/5 0/0 0/0 .text checkWolfLandAction__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLandAction(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s" -} -#pragma pop - -/* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv - */ -BOOL daAlink_c::checkMidnaUseAbility() const { - return i_dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check(); -} - -/* 801299A8-80129A80 1242E8 00D8+00 1/1 0/0 0/0 .text checkWolfUseAbility__9daAlink_cFv - */ -void daAlink_c::checkWolfUseAbility() { - if (mProcID == PROC_WOLF_GIANT_PUZZLE) { - return; - } - - if (checkMidnaLockJumpPoint() != NULL && !i_checkMidnaRide()) { - offWolfEyeUp(); - } else { - if (i_dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && - mWolfEyeUp < daAlinkHIO_wolf_c0::m.mSensesLingerTime && wolfSenseTrigger()) { - if (mWolfEyeUp == 0) { - onWolfEyeUp(); - } else { - offWolfEyeUp(); - } - } - } -} - -/* 80129A80-80129B44 1243C0 00C4+00 13/13 0/0 0/0 .text checkWolfGroundSpecialMode__9daAlink_cFv - */ -bool daAlink_c::checkWolfGroundSpecialMode() { - if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && - i_checkEndResetFlg0(ERFLG0_UNK_1)) { - return procCoMetamorphoseInit(); - } else if (mSpecialMode == SMODE_WOLF_PUZZLE || mSpecialMode == 0x28) { - return procWolfGiantPuzzleInit(); - } else if (checkCargoCarry()) { - return procWolfCargoCarryInit(); - } else if (checkSlideAction()) { - return true; - } else if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { - return procWolfScreamWaitInit(); - } - return false; -} - -/* 80129B44-8012A02C 124484 04E8+00 46/46 0/0 0/0 .text checkNextActionWolf__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionWolf(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionWolf__9daAlink_cFi.s" -} -#pragma pop - -/* 8012A02C-8012A228 12496C 01FC+00 3/3 0/0 0/0 .text wolfSideBgCheck__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfSideBgCheck(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/wolfSideBgCheck__9daAlink_cFs.s" -} -#pragma pop - -/* 8012A228-8012A330 124B68 0108+00 4/4 0/0 0/0 .text checkWolfAttackReverse__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfAttackReverse(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfAttackReverse__9daAlink_cFi.s" -} -#pragma pop - -/* 8012A330-8012A41C 124C70 00EC+00 1/1 0/0 0/0 .text checkWolfBarrierHitReverse__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfBarrierHitReverse() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s" -} -#pragma pop - -/* 8012A41C-8012A498 124D5C 007C+00 2/2 0/0 0/0 .text - * checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s" -} -#pragma pop - -/* 8012A498-8012ACCC 124DD8 0834+00 1/1 0/0 0/0 .text wolfBgCheck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfBgCheck() { - nofralloc -#include "asm/d/a/d_a_alink/wolfBgCheck__9daAlink_cFv.s" -} -#pragma pop - -/* 8012ACCC-8012AD1C 12560C 0050+00 1/1 0/0 0/0 .text changeWolfBlendRate__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeWolfBlendRate(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s" -} -#pragma pop - -/* 8012AD1C-8012B724 12565C 0A08+00 1/1 0/0 0/0 .text setWolfFootMatrix__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfFootMatrix() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfFootMatrix__9daAlink_cFv.s" -} -#pragma pop - -/* 8012B724-8012BFA8 126064 0884+00 1/1 0/0 0/0 .text wolfFootBgCheck__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfFootBgCheck() { - nofralloc -#include "asm/d/a/d_a_alink/wolfFootBgCheck__9daAlink_cFv.s" -} -#pragma pop - -/* 8012BFA8-8012C1F4 1268E8 024C+00 6/6 0/0 0/0 .text checkWolfWaitSlipPolygon__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfWaitSlipPolygon() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfWaitSlipPolygon__9daAlink_cFv.s" -} -#pragma pop - -/* 8012C1F4-8012C308 126B34 0114+00 2/2 0/0 0/0 .text setWolfWaitSlip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfWaitSlip() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfWaitSlip__9daAlink_cFv.s" -} -#pragma pop - -/* 8012C308-8012C30C 126C48 0004+00 4/4 0/0 0/0 .text checkWolfAtnDoCharge__9daAlink_cFv - */ -void daAlink_c::checkWolfAtnDoCharge() { - /* empty function */ -} - -/* 8012C30C-8012CB0C 126C4C 0800+00 1/1 0/0 0/0 .text setWolfChainPos__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfChainPos() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfChainPos__9daAlink_cFv.s" -} -#pragma pop - -/* 8012CB0C-8012CBE4 12744C 00D8+00 1/1 0/0 0/0 .text setWolfAnmVoice__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfAnmVoice() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfAnmVoice__9daAlink_cFv.s" -} -#pragma pop - -/* 8012CBE4-8012CD28 127524 0144+00 4/4 0/0 0/0 .text procWolfServiceWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfServiceWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfServiceWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012CD28-8012CF68 127668 0240+00 1/0 0/0 0/0 .text procWolfServiceWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfServiceWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfServiceWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8012CF68-8012CFEC 1278A8 0084+00 1/1 0/0 0/0 .text procWolfTiredWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTiredWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012CFEC-8012D050 12792C 0064+00 1/0 0/0 0/0 .text procWolfTiredWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTiredWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D050-8012D104 127990 00B4+00 3/2 0/0 0/0 .text procWolfMidnaRideShockInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMidnaRideShockInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D104-8012D1A8 127A44 00A4+00 1/0 0/0 0/0 .text procWolfMidnaRideShock__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMidnaRideShock() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D1A8-8012D2A8 127AE8 0100+00 13/13 0/0 0/0 .text procWolfWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D2A8-8012D380 127BE8 00D8+00 1/0 0/0 0/0 .text procWolfWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D380-8012D3E4 127CC0 0064+00 2/2 0/0 0/0 .text procWolfMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D3E4-8012D474 127D24 0090+00 1/0 0/0 0/0 .text procWolfMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D474-8012D590 127DB4 011C+00 1/1 0/0 0/0 .text procWolfDashInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDashInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDashInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D590-8012D8C0 127ED0 0330+00 1/0 0/0 0/0 .text procWolfDash__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDash() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDash__9daAlink_cFv.s" -} -#pragma pop - -/* 8012D8C0-8012DA5C 128200 019C+00 2/2 0/0 0/0 .text procWolfDashReverseInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDashReverseInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDashReverseInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012DA5C-8012DBA8 12839C 014C+00 1/0 0/0 0/0 .text procWolfDashReverse__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDashReverse() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDashReverse__9daAlink_cFv.s" -} -#pragma pop - -/* 8012DBA8-8012DC44 1284E8 009C+00 1/1 0/0 0/0 .text procWolfAtnActorMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAtnActorMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012DC44-8012DD08 128584 00C4+00 1/0 0/0 0/0 .text procWolfAtnActorMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAtnActorMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8012DD08-8012DDB4 128648 00AC+00 1/1 0/0 0/0 .text procWolfWaitTurnInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012DDB4-8012DEC8 1286F4 0114+00 1/0 0/0 0/0 .text procWolfWaitTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8012DEC8-8012E0AC 128808 01E4+00 2/2 0/0 0/0 .text procWolfSideStepInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStepInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012E0AC-8012E1E8 1289EC 013C+00 1/0 0/0 0/0 .text procWolfSideStep__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStep() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStep__9daAlink_cFv.s" -} -#pragma pop - -/* 8012E1E8-8012E2DC 128B28 00F4+00 1/1 0/0 0/0 .text procWolfSideStepLandInit__9daAlink_cFs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepLandInit(s16 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s" -} -#pragma pop - -/* 8012E2DC-8012E398 128C1C 00BC+00 1/0 0/0 0/0 .text procWolfSideStepLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSideStepLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8012E398-8012E508 128CD8 0170+00 3/3 0/0 0/0 .text procWolfBackJumpInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJumpInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012E508-8012E5F4 128E48 00EC+00 1/0 0/0 0/0 .text procWolfBackJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJump() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s" -} -#pragma pop - -/* 8012E5F4-8012E684 128F34 0090+00 1/1 0/0 0/0 .text procWolfBackJumpLandInit__9daAlink_cFss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s" -} -#pragma pop - -/* 8012E684-8012E754 128FC4 00D0+00 1/0 0/0 0/0 .text procWolfBackJumpLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfBackJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8012E754-8012E83C 129094 00E8+00 2/2 0/0 0/0 .text procWolfHowlInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHowlInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012E83C-8012E9C8 12917C 018C+00 1/0 0/0 0/0 .text procWolfHowl__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHowl() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHowl__9daAlink_cFv.s" -} -#pragma pop - -/* 8012E9C8-8012EB94 129308 01CC+00 2/2 0/0 0/0 .text procWolfAutoJumpInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAutoJumpInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAutoJumpInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012EB94-8012EDD0 1294D4 023C+00 1/0 0/0 0/0 .text procWolfAutoJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAutoJump() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAutoJump__9daAlink_cFv.s" -} -#pragma pop - -/* 8012EDD0-8012EFB8 129710 01E8+00 12/12 0/0 0/0 .text procWolfFallInit__9daAlink_cFif - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfFallInit(int param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfFallInit__9daAlink_cFif.s" -} -#pragma pop - -/* 8012EFB8-8012F138 1298F8 0180+00 1/0 0/0 0/0 .text procWolfFall__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfFall() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfFall__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F138-8012F1F0 129A78 00B8+00 2/2 0/0 0/0 .text procWolfLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F1F0-8012F278 129B30 0088+00 1/0 0/0 0/0 .text procWolfLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F278-8012F358 129BB8 00E0+00 1/1 0/0 0/0 .text procWolfSitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012F358-8012F41C 129C98 00C4+00 1/0 0/0 0/0 .text procWolfSit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F41C-8012F500 129D5C 00E4+00 1/1 0/0 0/0 .text procWolfStepMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfStepMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfStepMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F500-8012F634 129E40 0134+00 1/0 0/0 0/0 .text procWolfStepMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfStepMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfStepMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F634-8012F6EC 129F74 00B8+00 1/1 0/0 0/0 .text procWolfSlipInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F6EC-8012F840 12A02C 0154+00 1/0 0/0 0/0 .text procWolfSlip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlip() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlip__9daAlink_cFv.s" -} -#pragma pop - -/* 8012F840-8012F9C0 12A180 0180+00 2/2 0/0 0/0 .text procWolfSlipTurnInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurnInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8012F9C0-8012FB18 12A300 0158+00 1/0 0/0 0/0 .text procWolfSlipTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8012FB18-8012FBB4 12A458 009C+00 1/1 0/0 0/0 .text procWolfSlipTurnLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8012FBB4-8012FC38 12A4F4 0084+00 1/0 0/0 0/0 .text procWolfSlipTurnLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlipTurnLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8012FC38-8012FD2C 12A578 00F4+00 2/2 0/0 0/0 .text procWolfSlideReadyInit__9daAlink_cFsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideReadyInit(s16 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideReadyInit__9daAlink_cFsi.s" -} -#pragma pop - -/* 8012FD2C-8012FE80 12A66C 0154+00 1/0 0/0 0/0 .text procWolfSlideReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideReady() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8012FE80-8012FFA4 12A7C0 0124+00 2/2 0/0 0/0 .text procWolfSlideInit__9daAlink_cFsi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideInit(s16 param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideInit__9daAlink_cFsi.s" -} -#pragma pop - -/* 8012FFA4-801300D4 12A8E4 0130+00 1/0 0/0 0/0 .text procWolfSlide__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlide() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlide__9daAlink_cFv.s" -} -#pragma pop - -/* 801300D4-80130138 12AA14 0064+00 1/1 0/0 0/0 .text procWolfSlideLandInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80130138-801301E4 12AA78 00AC+00 1/0 0/0 0/0 .text procWolfSlideLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlideLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s" -} -#pragma pop - -/* 801301E4-80130268 12AB24 0084+00 3/3 0/0 0/0 .text procWolfWaitSlipInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitSlipInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80130268-80130440 12ABA8 01D8+00 1/0 0/0 0/0 .text procWolfWaitSlip__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitSlip() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitSlip__9daAlink_cFv.s" -} -#pragma pop - -/* 80130440-801304D4 12AD80 0094+00 2/2 0/0 0/0 .text procWolfSlopeStartInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlopeStartInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s" -} -#pragma pop - -/* 801304D4-8013056C 12AE14 0098+00 1/0 0/0 0/0 .text procWolfSlopeStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSlopeStart() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s" -} -#pragma pop - -/* 8013056C-80130580 12AEAC 0014+00 1/1 0/0 0/0 .text daAlink_searchGoldWolf__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGoldWolf(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80130580-80130654 12AEC0 00D4+00 1/1 0/0 0/0 .text daAlink_searchWolfHowl__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchWolfHowl(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchWolfHowl__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80130654-80130700 12AF94 00AC+00 1/1 0/0 0/0 .text setWolfHowlNotHappen__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHowlNotHappen(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s" -} -#pragma pop - -/* 80130700-80130BC4 12B040 04C4+00 1/1 0/0 0/0 .text procWolfHowlDemoInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHowlDemoInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHowlDemoInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80130BC4-801312C8 12B504 0704+00 1/0 0/0 0/0 .text procWolfHowlDemo__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHowlDemo() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHowlDemo__9daAlink_cFv.s" -} -#pragma pop - -/* 801312C8-80131408 12BC08 0140+00 1/1 0/0 0/0 .text setWolfHowling__15daObj_Sekizoa_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daObj_Sekizoa_c::setWolfHowling() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHowling__15daObj_Sekizoa_cFv.s" -} -#pragma pop - -/* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text checkWolfRope__9daAlink_cFv */ -#ifdef NONMATCHING -bool daAlink_c::checkWolfRope() { - bool ret = false; - bool bvar1 = false; - - if (i_checkModeFlg(MODE_UNK_20000) && field_0x280c.getActor() != NULL) { - bvar1 = true; - } - - // actor is Crope - if (bvar1 && fopAcM_GetName(field_0x280c.getActor()) == 0x2BE) { - ret = true; - } - return ret; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::checkWolfRope() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s" -} -#pragma pop -#endif - -/* 80131450-80131628 12BD90 01D8+00 2/2 0/0 0/0 .text - * checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfRopeHit(dCcD_GObjInf* param_0, cXyz const* param_1, - int param_2) const { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi.s" -} -#pragma pop - -/* 80131628-801316A4 12BF68 007C+00 2/2 0/0 0/0 .text checkWolfRopeJumpHang__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfRopeJumpHang() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s" -} -#pragma pop - -/* 801316A4-80131718 12BFE4 0074+00 1/1 0/0 0/0 .text getWolfRopeMoveSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfRopeMoveSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfRopeMoveSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 80131718-801319F0 12C058 02D8+00 6/6 0/0 0/0 .text setWolfRopePosY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfRopePosY() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfRopePosY__9daAlink_cFv.s" -} -#pragma pop - -/* 801319F0-80131A6C 12C330 007C+00 5/5 0/0 0/0 .text initWolfRopeShapeAngle__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initWolfRopeShapeAngle() { - nofralloc -#include "asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s" -} -#pragma pop - -/* 80131A6C-80131AFC 12C3AC 0090+00 5/5 0/0 0/0 .text wolfRopeSwingInc__9daAlink_cFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::wolfRopeSwingInc(f32 param_0) { - nofralloc -#include "asm/d/a/d_a_alink/wolfRopeSwingInc__9daAlink_cFf.s" -} -#pragma pop - -/* 80131AFC-80131C00 12C43C 0104+00 8/8 0/0 0/0 .text setWolfRopeOffsetY__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfRopeOffsetY(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfRopeOffsetY__9daAlink_cFi.s" -} -#pragma pop - -/* 80131C00-80131C74 12C540 0074+00 2/2 0/0 0/0 .text getDirectionRopeMove__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getDirectionRopeMove() const { - nofralloc -#include "asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s" -} -#pragma pop - -/* 80131C74-80131DA0 12C5B4 012C+00 5/5 0/0 0/0 .text procWolfRopeMoveInit__9daAlink_cFii - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeMoveInit__9daAlink_cFii.s" -} -#pragma pop - -/* 80131DA0-80132738 12C6E0 0998+00 1/0 0/0 0/0 .text procWolfRopeMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80132738-80132914 12D078 01DC+00 5/5 0/0 0/0 .text procWolfRopeHangInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeHangInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeHangInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80132914-80132D68 12D254 0454+00 1/0 0/0 0/0 .text procWolfRopeHang__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeHang() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeHang__9daAlink_cFv.s" -} -#pragma pop - -/* 80132D68-80132E88 12D6A8 0120+00 1/1 0/0 0/0 .text procWolfRopeTurnInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeTurnInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeTurnInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80132E88-80133054 12D7C8 01CC+00 1/0 0/0 0/0 .text procWolfRopeTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 80133054-80133164 12D994 0110+00 1/1 0/0 0/0 .text procWolfRopeStaggerInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeStaggerInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeStaggerInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80133164-8013384C 12DAA4 06E8+00 1/0 0/0 0/0 .text procWolfRopeStagger__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeStagger() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeStagger__9daAlink_cFv.s" -} -#pragma pop - -/* 8013384C-80133930 12E18C 00E4+00 1/1 0/0 0/0 .text procWolfRopeSubjectivityInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeSubjectivityInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80133930-80133D6C 12E270 043C+00 1/0 0/0 0/0 .text procWolfRopeSubjectivity__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRopeSubjectivity() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRopeSubjectivity__9daAlink_cFv.s" -} -#pragma pop - -/* 80133D6C-80133EF0 12E6AC 0184+00 0/0 0/0 1/1 .text getWolfTagJumpTime__9daAlink_cCFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfTagJumpTime() const { - nofralloc -#include "asm/d/a/d_a_alink/getWolfTagJumpTime__9daAlink_cCFv.s" -} -#pragma pop - -/* 80133EF0-80134000 12E830 0110+00 3/3 1/1 1/1 .text checkMidnaLockJumpPoint__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm cXyz* daAlink_c::checkMidnaLockJumpPoint() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMidnaLockJumpPoint__9daAlink_cCFv.s" -} -#pragma pop - -/* 80134000-80134838 12E940 0838+00 4/4 0/0 0/0 .text - * procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 80134838-80134DB8 12F178 0580+00 1/0 0/0 0/0 .text procWolfTagJump__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTagJump() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTagJump__9daAlink_cFv.s" -} -#pragma pop - -/* 80134DB8-80134EBC 12F6F8 0104+00 1/1 0/0 0/0 .text - * procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c.s" -} -#pragma pop - -/* 80134EBC-80135050 12F7FC 0194+00 1/0 0/0 0/0 .text procWolfTagJumpLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfTagJumpLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfTagJumpLand__9daAlink_cFv.s" -} -#pragma pop - -/* 80135050-801350A4 12F990 0054+00 1/1 0/0 0/0 .text daAlink_searchGiant__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGiant(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 801350A4-80135160 12F9E4 00BC+00 1/1 0/0 0/0 .text daAlink_searchGiantTalk__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchGiantTalk(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchGiantTalk__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 80135160-801351F8 12FAA0 0098+00 1/1 0/0 0/0 .text procWolfGiantPuzzleInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procWolfGiantPuzzleInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801351F8-80135458 12FB38 0260+00 1/0 0/0 0/0 .text procWolfGiantPuzzle__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGiantPuzzle() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGiantPuzzle__9daAlink_cFv.s" -} -#pragma pop - -/* 80135458-801354C8 12FD98 0070+00 2/2 0/0 0/0 .text setWolfHangGroundY__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHangGroundY() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s" -} -#pragma pop - -/* 801354C8-801355EC 12FE08 0124+00 2/2 0/0 0/0 .text changeWolfHangEndProc__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::changeWolfHangEndProc() { - nofralloc -#include "asm/d/a/d_a_alink/changeWolfHangEndProc__9daAlink_cFv.s" -} -#pragma pop - -/* 801355EC-80135668 12FF2C 007C+00 2/2 0/0 0/0 .text procWolfHangReadyInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80135668-801356F0 12FFA8 0088+00 1/0 0/0 0/0 .text procWolfHangReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangReady() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s" -} -#pragma pop - -/* 801356F0-80135AF4 130030 0404+00 3/3 0/0 0/0 .text procWolfHangWallCatchInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangWallCatchInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangWallCatchInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80135AF4-80135CD8 130434 01E4+00 1/0 0/0 0/0 .text procWolfHangWallCatch__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangWallCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangWallCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 80135CD8-80135F00 130618 0228+00 1/1 0/0 0/0 .text - * procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla.s" -} -#pragma pop - -/* 80135F00-80136064 130840 0164+00 1/0 0/0 0/0 .text procWolfHangFallStart__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfHangFallStart() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfHangFallStart__9daAlink_cFv.s" -} -#pragma pop - -/* 80136064-801360EC 1309A4 0088+00 1/1 0/0 0/0 .text setWolfHeadDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfHeadDamage() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 801360EC-80136508 130A2C 041C+00 1/1 0/0 0/0 .text - * procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf.s" -} -#pragma pop - -/* 80136508-80136624 130E48 011C+00 1/0 0/0 0/0 .text procWolfDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 80136624-801369E4 130F64 03C0+00 2/2 0/0 0/0 .text procWolfLargeDamageUpInit__9daAlink_cFiiss - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLargeDamageUpInit__9daAlink_cFiiss.s" -} -#pragma pop - -/* 801369E4-80136C18 131324 0234+00 1/0 0/0 0/0 .text procWolfLargeDamageUp__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLargeDamageUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLargeDamageUp__9daAlink_cFv.s" -} -#pragma pop - -/* 80136C18-80136DE4 131558 01CC+00 1/1 0/0 0/0 .text procWolfLandDamageInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLandDamageInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLandDamageInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80136DE4-80136EC4 131724 00E0+00 1/0 0/0 0/0 .text procWolfLandDamage__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLandDamage() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s" -} -#pragma pop - -/* 80136EC4-80136F54 131804 0090+00 2/2 0/0 0/0 .text setWolfScreamWaitAnime__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfScreamWaitAnime() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfScreamWaitAnime__9daAlink_cFv.s" -} -#pragma pop - -/* 80136F54-80136FF8 131894 00A4+00 1/1 0/0 0/0 .text procWolfScreamWaitInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procWolfScreamWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80136FF8-801370E4 131938 00EC+00 1/0 0/0 0/0 .text procWolfScreamWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfScreamWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s" -} -#pragma pop - -/* 801370E4-8013712C 131A24 0048+00 3/3 0/0 0/0 .text getWolfLieMoveAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfLieMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 8013712C-801371A0 131A6C 0074+00 3/3 0/0 0/0 .text getWolfLieMoveSpeed__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfLieMoveSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfLieMoveSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 801371A0-801371FC 131AE0 005C+00 0/0 0/0 2/2 .text checkMidnaDisappearMode__9daAlink_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkMidnaDisappearMode() const { - nofralloc -#include "asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s" -} -#pragma pop - -/* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLieContinue(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLieContinue__9daAlink_cFi.s" -} -#pragma pop - -/* 801372B4-80137330 131BF4 007C+00 3/3 0/0 0/0 .text checkNextActionWolfFromLie__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkNextActionWolfFromLie() { - nofralloc -#include "asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s" -} -#pragma pop - -/* 80137330-801373F8 131C70 00C8+00 3/3 0/0 0/0 .text setWolfLieMoveVoice__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfLieMoveVoice(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s" -} -#pragma pop - -/* 801373F8-80137420 131D38 0028+00 2/2 0/0 0/0 .text checkWolfLieCode__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLieCode() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s" -} -#pragma pop - -/* 80137420-8013753C 131D60 011C+00 2/2 0/0 0/0 .text procWolfLieStartInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieStartInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieStartInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013753C-80137634 131E7C 00F8+00 1/0 0/0 0/0 .text procWolfLieStart__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieStart() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieStart__9daAlink_cFv.s" -} -#pragma pop - -/* 80137634-801377F0 131F74 01BC+00 5/5 0/0 0/0 .text procWolfLieMoveInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieMoveInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieMoveInit__9daAlink_cFi.s" -} -#pragma pop - -/* 801377F0-80137C90 132130 04A0+00 1/0 0/0 0/0 .text procWolfLieMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80137C90-80137D4C 1325D0 00BC+00 1/1 0/0 0/0 .text procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz.s" -} -#pragma pop - -/* 80137D4C-80138000 13268C 02B4+00 1/0 0/0 0/0 .text procWolfLieAutoMove__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLieAutoMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLieAutoMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80138000-80138188 132940 0188+00 2/2 0/0 0/0 .text setSpeedAndAngleSwimWolf__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSpeedAndAngleSwimWolf() { - nofralloc -#include "asm/d/a/d_a_alink/setSpeedAndAngleSwimWolf__9daAlink_cFv.s" -} -#pragma pop - -/* 80138188-801381F8 132AC8 0070+00 2/2 0/0 0/0 .text getWolfSwimMoveAnmSpeed__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::getWolfSwimMoveAnmSpeed() { - nofralloc -#include "asm/d/a/d_a_alink/getWolfSwimMoveAnmSpeed__9daAlink_cFv.s" -} -#pragma pop - -/* 801381F8-801383D8 132B38 01E0+00 2/2 0/0 0/0 .text decideDoStatusSwimWolf__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::decideDoStatusSwimWolf() { - nofralloc -#include "asm/d/a/d_a_alink/decideDoStatusSwimWolf__9daAlink_cFv.s" -} -#pragma pop - -/* 801383D8-80138484 132D18 00AC+00 2/2 0/0 0/0 .text procWolfSwimUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80138484-8013852C 132DC4 00A8+00 1/0 0/0 0/0 .text procWolfSwimUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s" -} -#pragma pop - -/* 8013852C-80138644 132E6C 0118+00 7/7 0/0 0/0 .text procWolfSwimWaitInit__9daAlink_cFi - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80138644-8013871C 132F84 00D8+00 1/0 0/0 0/0 .text procWolfSwimWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8013871C-801387A0 13305C 0084+00 4/4 0/0 0/0 .text procWolfSwimMoveInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 801387A0-8013890C 1330E0 016C+00 1/0 0/0 0/0 .text procWolfSwimMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimMove__9daAlink_cFv.s" -} -#pragma pop - -/* 8013890C-80138A18 13324C 010C+00 2/2 0/0 0/0 .text procWolfSwimEndWaitInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimEndWaitInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimEndWaitInit__9daAlink_cFi.s" -} -#pragma pop - -/* 80138A18-80138B6C 133358 0154+00 1/0 0/0 0/0 .text procWolfSwimEndWait__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfSwimEndWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfSwimEndWait__9daAlink_cFv.s" -} -#pragma pop - -/* 80138B6C-80138C04 1334AC 0098+00 1/0 0/0 0/0 .text - * onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s" -} -#pragma pop - -/* 80138C04-80138C44 133544 0040+00 4/4 0/0 0/0 .text resetWolfEnemyBiteAll__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetWolfEnemyBiteAll() { - nofralloc -#include "asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s" -} -#pragma pop - -/* 80138C44-80138CB8 133584 0074+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAction__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfEnemyThrowAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s" -} -#pragma pop - -/* 80138CB8-80138DC0 1335F8 0108+00 1/1 0/0 0/0 .text setWolfLockDomeModel__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfLockDomeModel() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfLockDomeModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80138DC0-80138F18 133700 0158+00 1/1 0/0 0/0 .text setWolfBallModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfBallModel() { - nofralloc -#include "asm/d/a/d_a_alink/setWolfBallModel__9daAlink_cFv.s" -} -#pragma pop - -/* 80138F18-80139048 133858 0130+00 2/2 0/0 0/0 .text resetWolfBallGrab__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetWolfBallGrab() { - nofralloc -#include "asm/d/a/d_a_alink/resetWolfBallGrab__9daAlink_cFv.s" -} -#pragma pop - -/* 80139048-8013911C 133988 00D4+00 1/1 0/0 0/0 .text checkWolfLockData__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLockData() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLockData__9daAlink_cFv.s" -} -#pragma pop - -/* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */ -bool daAlink_c::checkWolfLock(fopAc_ac_c* p_actor) const { - u32 id = fopAcM_GetID(p_actor); - - for (int i = 0; i < mWolfLockNum; i++) { - if (id == mWolfLockAcKeep[i].getID()) { - return true; - } - } - return false; -} - -/* 8013916C-801391DC 133AAC 0070+00 1/0 0/0 0/0 .text cancelWolfLock__9daAlink_cFP10fopAc_ac_c */ -bool daAlink_c::cancelWolfLock(fopAc_ac_c* p_actor) { - u32 id = fopAcM_GetID(p_actor); - - for (int i = 0; i < mWolfLockNum; i++) { - if (id == mWolfLockAcKeep[i].getID()) { - mWolfLockAcKeep[i].clearData(); - return true; - } - } - return false; -} - -/* 801391DC-801391E4 133B1C 0008+00 0/0 0/0 1/1 .text getWolfLockActorEnd__9daAlink_cFv - */ -fopAc_ac_c* daAlink_c::getWolfLockActorEnd() { - return mWolfLockAcKeep[0].getActor(); -} - -/* 801391E4-801392A8 133B24 00C4+00 1/1 0/0 0/0 .text - * searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 801392A8-801392E4 133BE8 003C+00 1/1 0/0 0/0 .text - * daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 801392E4-801393A4 133C24 00C0+00 1/1 0/0 0/0 .text checkWolfComboCnt__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfComboCnt() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfComboCnt__9daAlink_cFv.s" -} -#pragma pop - -/* 801393A4-801395B4 133CE4 0210+00 4/4 0/0 0/0 .text checkWolfAttackAction__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfAttackAction() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfAttackAction__9daAlink_cFv.s" -} -#pragma pop - -/* 801395B4-80139600 133EF4 004C+00 2/2 0/0 0/0 .text - * setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM param_0, f32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" -} -#pragma pop - -/* 80139600-801396F8 133F40 00F8+00 2/2 0/0 0/0 .text - * setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c.s" -} -#pragma pop - -/* ############################################################################################## */ -/* 804256EC-804256F8 05240C 000C+00 0/1 0/0 0/0 .bss @50952 */ -#pragma push -#pragma force_active on -static u8 lit_50952[12]; -#pragma pop - -/* 804256F8-80425708 052418 000C+04 1/2 0/0 0/0 .bss l_wolfBiteHitMarkScale */ -static u8 l_wolfBiteHitMarkScale[12 + 4 /* padding */]; - -/* 801396F8-801397A4 134038 00AC+00 1/1 0/0 0/0 .text - * setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c.s" -} -#pragma pop - -/* 801397A4-801398A8 1340E4 0104+00 1/1 0/0 0/0 .text checkWolfLockAttackChargeState__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::checkWolfLockAttackChargeState() { - nofralloc -#include "asm/d/a/d_a_alink/checkWolfLockAttackChargeState__9daAlink_cFv.s" -} -#pragma pop - -/* 801398A8-80139908 1341E8 0060+00 1/1 0/0 0/0 .text procWolfRollAttackChargeInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackChargeInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80139908-801399C4 134248 00BC+00 1/0 0/0 0/0 .text procWolfRollAttackCharge__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackCharge() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s" -} -#pragma pop - -/* 801399C4-80139A70 134304 00AC+00 1/1 0/0 0/0 .text procWolfRollAttackMoveInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackMoveInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s" -} -#pragma pop - -/* 80139A70-80139DE0 1343B0 0370+00 1/0 0/0 0/0 .text procWolfRollAttackMove__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackMove() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackMove__9daAlink_cFv.s" -} -#pragma pop - -/* 80139DE0-8013A4F8 134720 0718+00 5/5 0/0 0/0 .text procWolfJumpAttackInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013A4F8-8013A7EC 134E38 02F4+00 1/0 0/0 0/0 .text procWolfJumpAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8013A7EC-8013A8A0 13512C 00B4+00 2/2 0/0 0/0 .text procWolfJumpAttackKickInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackKickInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013A8A0-8013A8FC 1351E0 005C+00 1/0 0/0 0/0 .text procWolfJumpAttackKick__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackKick() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s" -} -#pragma pop - -/* 8013A8FC-8013AAC4 13523C 01C8+00 2/2 0/0 0/0 .text - * procWolfJumpAttackSlideLandInit__9daAlink_cFiii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int param_2) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLandInit__9daAlink_cFiii.s" -} -#pragma pop - -/* 8013AAC4-8013AC44 135404 0180+00 1/0 0/0 0/0 .text procWolfJumpAttackSlideLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackSlideLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8013AC44-8013ACF4 135584 00B0+00 1/1 0/0 0/0 .text - * procWolfJumpAttackNormalLandInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013ACF4-8013ADF0 135634 00FC+00 1/0 0/0 0/0 .text procWolfJumpAttackNormalLand__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfJumpAttackNormalLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8013ADF0-8013AFC0 135730 01D0+00 2/2 0/0 0/0 .text procWolfWaitAttackInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitAttackInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitAttackInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013AFC0-8013B2A0 135900 02E0+00 1/0 0/0 0/0 .text procWolfWaitAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfWaitAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfWaitAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8013B2A0-8013B424 135BE0 0184+00 5/5 0/0 0/0 .text procWolfRollAttackInit__9daAlink_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttackInit(int param_0, int param_1) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttackInit__9daAlink_cFii.s" -} -#pragma pop - -/* 8013B424-8013B528 135D64 0104+00 1/0 0/0 0/0 .text procWolfRollAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfRollAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfRollAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8013B528-8013B808 135E68 02E0+00 1/1 0/0 0/0 .text procWolfDownAttackInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAttackInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAttackInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013B808-8013B964 136148 015C+00 1/0 0/0 0/0 .text procWolfDownAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8013B964-8013BA44 1362A4 00E0+00 1/1 0/0 0/0 .text - * procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c.s" -} -#pragma pop - -/* 8013BA44-8013BC94 136384 0250+00 1/0 0/0 0/0 .text procWolfDownAtLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAtLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8013BC94-8013BD54 1365D4 00C0+00 1/1 0/0 0/0 .text procWolfDownAtMissLandInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtMissLandInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAtMissLandInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013BD54-8013BE24 136694 00D0+00 1/0 0/0 0/0 .text procWolfDownAtMissLand__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDownAtMissLand() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s" -} -#pragma pop - -/* 8013BE24-8013C3E4 136764 05C0+00 2/2 0/0 0/0 .text procWolfLockAttackInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLockAttackInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013C3E4-8013C630 136D24 024C+00 1/0 0/0 0/0 .text procWolfLockAttack__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttack() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLockAttack__9daAlink_cFv.s" -} -#pragma pop - -/* 8013C630-8013C7A4 136F70 0174+00 1/1 0/0 0/0 .text procWolfLockAttackTurnInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackTurnInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLockAttackTurnInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013C7A4-8013C8C8 1370E4 0124+00 1/0 0/0 0/0 .text procWolfLockAttackTurn__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfLockAttackTurn() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfLockAttackTurn__9daAlink_cFv.s" -} -#pragma pop - -/* 8013C8C8-8013C9EC 137208 0124+00 1/1 0/0 0/0 .text procWolfAttackReverseInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAttackReverseInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAttackReverseInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013C9EC-8013CB48 13732C 015C+00 1/0 0/0 0/0 .text procWolfAttackReverse__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfAttackReverse() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfAttackReverse__9daAlink_cFv.s" -} -#pragma pop - -/* 8013CB48-8013CC5C 137488 0114+00 2/2 0/0 0/0 .text procWolfEnemyThrowInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyThrowInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyThrowInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013CC5C-8013CCF4 13759C 0098+00 1/0 0/0 0/0 .text procWolfEnemyThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 8013CCF4-8013CDEC 137634 00F8+00 1/1 0/0 0/0 .text procWolfEnemyHangBiteInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyHangBiteInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013CDEC-8013D0D4 13772C 02E8+00 1/0 0/0 0/0 .text procWolfEnemyHangBite__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfEnemyHangBite() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfEnemyHangBite__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D0D4-8013D3FC 137A14 0328+00 1/1 0/0 0/0 .text procWolfGrabUpInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D3FC-8013D588 137D3C 018C+00 1/0 0/0 0/0 .text procWolfGrabUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabUp__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D588-8013D65C 137EC8 00D4+00 2/2 0/0 0/0 .text procWolfGrabPutInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabPutInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D65C-8013D818 137F9C 01BC+00 1/0 0/0 0/0 .text procWolfGrabPut__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabPut() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabPut__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D818-8013D86C 138158 0054+00 1/1 0/0 0/0 .text procWolfGrabThrowInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabThrowInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D86C-8013D930 1381AC 00C4+00 1/0 0/0 0/0 .text procWolfGrabThrow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGrabThrow() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s" -} -#pragma pop - -/* 8013D930-8013DA8C 138270 015C+00 1/1 0/0 0/0 .text procWolfPushInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfPushInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfPushInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DA8C-8013DB58 1383CC 00CC+00 1/0 0/0 0/0 .text procWolfPush__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfPush() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DB58-8013DB6C 138498 0014+00 1/1 0/0 0/0 .text daAlink_searchEnemyCargo__FP10fopAc_ac_cPv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daAlink_searchEnemyCargo(fopAc_ac_c* param_0, void* param_1) { - nofralloc -#include "asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s" -} -#pragma pop - -/* 8013DB6C-8013DC5C 1384AC 00F0+00 3/2 0/0 0/0 .text procWolfCargoCarryInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool daAlink_c::procWolfCargoCarryInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DC5C-8013DDF8 13859C 019C+00 1/0 0/0 0/0 .text procWolfCargoCarry__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfCargoCarry() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfCargoCarry__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DDF8-8013DE70 138738 0078+00 1/1 0/0 0/0 .text procWolfChainUpInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainUpInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DE70-8013DF30 1387B0 00C0+00 1/0 0/0 0/0 .text procWolfChainUp__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainUp() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s" -} -#pragma pop - -/* 8013DF30-8013E034 138870 0104+00 1/1 0/0 0/0 .text procWolfGanonCatchInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGanonCatchInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGanonCatchInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013E034-8013E240 138974 020C+00 1/0 0/0 0/0 .text procWolfGanonCatch__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGanonCatch() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGanonCatch__9daAlink_cFv.s" -} -#pragma pop - -/* 8013E240-8013E2A8 138B80 0068+00 1/1 0/0 0/0 .text procWolfChainReadyInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainReadyInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013E2A8-8013E6C0 138BE8 0418+00 1/0 0/0 0/0 .text procWolfChainReady__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainReady() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainReady__9daAlink_cFv.s" -} -#pragma pop - -/* 8013E6C0-8013E80C 139000 014C+00 1/1 0/0 0/0 .text procWolfChainWaitInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainWaitInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainWaitInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013E80C-8013ED44 13914C 0538+00 1/0 0/0 0/0 .text procWolfChainWait__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfChainWait() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfChainWait__9daAlink_cFv.s" -} -#pragma pop - -/* 8013ED44-8013F1F0 139684 04AC+00 1/1 0/0 0/0 .text procWolfDigInit__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDigInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDigInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013F1F0-8013F4A8 139B30 02B8+00 1/0 0/0 0/0 .text procWolfDig__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDig() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDig__9daAlink_cFv.s" -} -#pragma pop - -/* 8013F4A8-8013F7C4 139DE8 031C+00 2/2 0/0 0/0 .text procWolfDigThroughInit__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDigThroughInit(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDigThroughInit__9daAlink_cFi.s" -} -#pragma pop - -/* 8013F7C4-8013F90C 13A104 0148+00 1/0 0/0 0/0 .text procWolfDigThrough__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfDigThrough() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfDigThrough__9daAlink_cFv.s" -} -#pragma pop - -/* 8013F90C-8013FA14 13A24C 0108+00 1/1 0/0 0/0 .text setSmellSave__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setSmellSave() { - nofralloc -#include "asm/d/a/d_a_alink/setSmellSave__9daAlink_cFv.s" -} -#pragma pop - -/* 8013FA14-8013FC24 13A354 0210+00 1/1 0/0 0/0 .text procWolfGetSmellInit__9daAlink_cFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGetSmellInit() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGetSmellInit__9daAlink_cFv.s" -} -#pragma pop - -/* 8013FC24-8013FF28 13A564 0304+00 1/0 0/0 0/0 .text procWolfGetSmell__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::procWolfGetSmell() { - nofralloc -#include "asm/d/a/d_a_alink/procWolfGetSmell__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_wolf.inc" /* 8013FF28-8013FF90 13A868 0068+00 2/2 0/0 0/0 .text setArcName__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setArcName(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setArcName__9daAlink_cFi.s" +void daAlink_c::setArcName(int isWolf) { + if (isWolf) { + mArcName = l_wArcName; + return; + } + + if (checkCasualWearFlg()) { + mArcName = l_bArcName; + return; + } + + if (checkZoraWearFlg()) { + mArcName = l_zArcName; + return; + } + + if (checkMagicArmorWearFlg()) { + mArcName = l_mArcName; + return; + } + + mArcName = l_kArcName; +} + +inline bool checkCarvingWoodShieldEquip() { + return dComIfGs_getSelectEquipShield() == WOOD_SHIELD; +} + +inline bool checkShopWoodShieldEquip() { + return dComIfGs_getSelectEquipShield() == SHIELD; } -#pragma pop /* 8013FF90-8013FFD8 13A8D0 0048+00 2/2 0/0 0/0 .text setShieldArcName__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShieldArcName() { - nofralloc -#include "asm/d/a/d_a_alink/setShieldArcName__9daAlink_cFv.s" +void daAlink_c::setShieldArcName() { + if (checkCarvingWoodShieldEquip() || !i_checkShieldGet()) { + mShieldArcName = l_cWShdArcName; + return; + } + + if (checkShopWoodShieldEquip()) { + mShieldArcName = l_sWShdArcName; + return; + } + + mShieldArcName = l_hyShdArcName; } -#pragma pop /* 8013FFD8-80140038 13A918 0060+00 1/1 0/0 0/0 .text setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setOriginalHeap(JKRExpHeap** param_0, u32 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl.s" +void daAlink_c::setOriginalHeap(JKRExpHeap** p_heap, u32 param_1) { + if (*p_heap == NULL) { + *p_heap = + JKRExpHeap::create((param_1 + 0xF & 0xFFFFFFF0) + 0xA0, mDoExt_getGameHeap(), true); + } } -#pragma pop /* 80140038-80140064 13A978 002C+00 1/0 0/0 0/0 .text setClothesChange__9daAlink_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setClothesChange(int param_0) { - nofralloc -#include "asm/d/a/d_a_alink/setClothesChange__9daAlink_cFi.s" +void daAlink_c::setClothesChange(int param_0) { + if (i_checkWolf()) { + return; + } + + mClothesChangeWaitTimer = 4; + if (param_0 == 0) { + return; + } + + i_onNoResetFlg2(0x200000); } -#pragma pop /* 80140064-80140070 13A9A4 000C+00 0/0 1/1 0/0 .text setShieldChange__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShieldChange() { - nofralloc -#include "asm/d/a/d_a_alink/setShieldChange__9daAlink_cFv.s" +void daAlink_c::setShieldChange() { + mShieldChangeWaitTimer = 4; } -#pragma pop /* 80140070-801401F8 13A9B0 0188+00 3/3 0/0 0/0 .text loadModelDVD__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::loadModelDVD() { - nofralloc -#include "asm/d/a/d_a_alink/loadModelDVD__9daAlink_cFv.s" +int daAlink_c::loadModelDVD() { + if (mClothesChangeWaitTimer != 0) { + mClothesChangeWaitTimer--; + + if (mClothesChangeWaitTimer == 2) { + mEyeHL1.remove(); + mEyeHL2.remove(); + field_0x79c = 0; + field_0x7a0 = 0; + field_0x7a4 = 0; + field_0x7a8 = 0; + + if (!i_checkNoResetFlg2(FLG2_UNK_280000)) { + dComIfG_resDelete(&mPhaseReq, mArcName); + cPhs_Reset(&mPhaseReq); + field_0x0638->freeAll(); + + if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_METAMORPHOSE_ONLY) { + setArcName(!i_checkWolf()); + } else { + setArcName(i_checkWolf()); + } + } + } else if (mClothesChangeWaitTimer == 1) { + if (i_checkNoResetFlg2(FLG2_UNK_280000)) { + mClothesChangeWaitTimer = 0; + changeLink(1); + } else { + if (dComIfG_resLoad(&mPhaseReq, mArcName, field_0x0638) == 4) { + mClothesChangeWaitTimer = 0; + + if (mProcID == PROC_METAMORPHOSE || mProcID == PROC_METAMORPHOSE_ONLY) { + if (i_checkWolf()) { + changeLink(0); + } else { + changeWolf(); + } + } else { + changeLink(1); + } + + return 1; + } + mClothesChangeWaitTimer = 2; + } + } + } else { + return 1; + } + + return 0; } -#pragma pop /* 801401F8-80140274 13AB38 007C+00 2/2 0/0 0/0 .text setShieldModel__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::setShieldModel() { - nofralloc -#include "asm/d/a/d_a_alink/setShieldModel__9daAlink_cFv.s" +void daAlink_c::setShieldModel() { + JKRHeap* heap = mAnmHeap4.setAnimeHeap(); + mShieldModel = initModel((J3DModelData*)dComIfG_getObjectRes(mShieldArcName, 3), 0); + + mDoExt_setCurrentHeap(heap); } -#pragma pop /* 80140274-80140338 13ABB4 00C4+00 2/2 0/0 0/0 .text loadShieldModelDVD__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::loadShieldModelDVD() { - nofralloc -#include "asm/d/a/d_a_alink/loadShieldModelDVD__9daAlink_cFv.s" +int daAlink_c::loadShieldModelDVD() { + if (mShieldChangeWaitTimer != 0) { + mShieldChangeWaitTimer--; + + if (mShieldChangeWaitTimer == 2) { + mShieldModel = NULL; + dComIfG_resDelete(&mShieldPhaseReq, mShieldArcName); + cPhs_Reset(&mShieldPhaseReq); + field_0x0648->freeAll(); + setShieldArcName(); + } else if (mShieldChangeWaitTimer == 1) { + if (dComIfG_resLoad(&mShieldPhaseReq, mShieldArcName, field_0x0648) == 4) { + mShieldChangeWaitTimer = 0; + setShieldModel(); + } else { + mShieldChangeWaitTimer = 2; + } + } + } else { + return 1; + } + + return 0; } -#pragma pop /* 80140338-80140550 13AC78 0218+00 3/3 0/0 0/0 .text changeModelDataDirect__9daAlink_cFi */ @@ -35613,85 +16790,9 @@ asm void daAlink_c::changeModelDataDirectWolf(int param_0) { } #pragma pop -/* 801406A8-80140888 13AFE8 01E0+00 0/0 1/1 0/0 .text initStatusWindow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::initStatusWindow() { - nofralloc -#include "asm/d/a/d_a_alink/initStatusWindow__9daAlink_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_swindow.inc" -/* 80140888-80140984 13B1C8 00FC+00 0/0 1/1 0/0 .text statusWindowExecute__9daAlink_cFPC4cXyzs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) { - nofralloc -#include "asm/d/a/d_a_alink/statusWindowExecute__9daAlink_cFPC4cXyzs.s" -} -#pragma pop - -/* 80140984-80140AC8 13B2C4 0144+00 0/0 1/1 0/0 .text statusWindowDraw__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::statusWindowDraw() { - nofralloc -#include "asm/d/a/d_a_alink/statusWindowDraw__9daAlink_cFv.s" -} -#pragma pop - -/* 80140AC8-80140B88 13B408 00C0+00 0/0 1/1 0/0 .text resetStatusWindow__9daAlink_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daAlink_c::resetStatusWindow() { - nofralloc -#include "asm/d/a/d_a_alink/resetStatusWindow__9daAlink_cFv.s" -} -#pragma pop - -/* 80140B88-80140B98 13B4C8 0010+00 1/1 0/0 0/0 .text __ct__12daAlinkHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlinkHIO_c::daAlinkHIO_c() { - nofralloc -#include "asm/d/a/d_a_alink/__ct__12daAlinkHIO_cFv.s" -} -#pragma pop - -/* 80140B98-80140BD4 13B4D8 003C+00 1/1 0/0 0/0 .text __dt__17daAlinkHIO_wolf_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__17daAlinkHIO_wolf_cFv.s" -} -#pragma pop - -/* 80140BD4-80140C10 13B514 003C+00 1/1 0/0 0/0 .text __dt__16daAlinkHIO_cut_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlinkHIO_cut_c::~daAlinkHIO_cut_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__16daAlinkHIO_cut_cFv.s" -} -#pragma pop - -/* 80140C10-80140C80 13B550 0070+00 1/0 0/0 0/0 .text __dt__12daAlinkHIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daAlinkHIO_c::~daAlinkHIO_c() { - nofralloc -#include "asm/d/a/d_a_alink/__dt__12daAlinkHIO_cFv.s" -} -#pragma pop +#include "d/a/d_a_alink_HIO.inc" /* 80140C80-80140CDC 13B5C0 005C+00 1/0 0/0 0/0 .text __dt__8dEyeHL_cFv */ #pragma push @@ -37221,8 +18322,7 @@ SECTION_SDATA2 static f32 lit_77831[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void __sinit_d_a_alink_cpp() { - nofralloc +asm void __sinit_d_a_alink_cpp(){nofralloc #include "asm/d/a/d_a_alink/__sinit_d_a_alink_cpp.s" } #pragma pop diff --git a/src/d/a/d_a_alink_HIO.inc b/src/d/a/d_a_alink_HIO.inc new file mode 100644 index 00000000000..573328ba054 --- /dev/null +++ b/src/d/a/d_a_alink_HIO.inc @@ -0,0 +1,39 @@ +/* 80140B88-80140B98 13B4C8 0010+00 1/1 0/0 0/0 .text __ct__12daAlinkHIO_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlinkHIO_c::daAlinkHIO_c() { + nofralloc +#include "asm/d/a/d_a_alink/__ct__12daAlinkHIO_cFv.s" +} +#pragma pop + +/* 80140B98-80140BD4 13B4D8 003C+00 1/1 0/0 0/0 .text __dt__17daAlinkHIO_wolf_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__17daAlinkHIO_wolf_cFv.s" +} +#pragma pop + +/* 80140BD4-80140C10 13B514 003C+00 1/1 0/0 0/0 .text __dt__16daAlinkHIO_cut_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlinkHIO_cut_c::~daAlinkHIO_cut_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__16daAlinkHIO_cut_cFv.s" +} +#pragma pop + +/* 80140C10-80140C80 13B550 0070+00 1/0 0/0 0/0 .text __dt__12daAlinkHIO_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlinkHIO_c::~daAlinkHIO_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__12daAlinkHIO_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_HIO_data.inc b/src/d/a/d_a_alink_HIO_data.inc new file mode 100644 index 00000000000..87469b134ce --- /dev/null +++ b/src/d/a/d_a_alink_HIO_data.inc @@ -0,0 +1,1593 @@ +/* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata m__19daAlinkHIO_basic_c0 */ +daAlinkHIO_basic_c1 const daAlinkHIO_basic_c0::m = { + false, 20000, -10000, 8000, 1, 30, 400, 600, 16384, 1.0f, 4.0f, 0.7f, 3.0f, + 60.0f, 85.0f, 300.0f, 200.0f, 20.0f, 30.0f, 23.0f, 41.0f, 0.7f, 0.5f, 0.7f, 400.0f, 5000.0f, +}; + +/* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata m__18daAlinkHIO_move_c0 */ +daAlinkHIO_move_c1 const daAlinkHIO_move_c0::m = { + {11, 0.7f, 3.0f, 4.0f, 12.0f}, + 4500, + 100, + 5, + 1.0f, + 0.75f, + 1.5f, + 0.4f, + 0.8f, + 23.0f, + 1.9f, + 2.2f, + 0.6f, + 1.1f, + 1.5f, + 0.99f, + 3.0f, + 0.7f, + 0.4f, +}; + +/* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata m__21daAlinkHIO_atnMove_c0 */ +daAlinkHIO_atnMove_c1 const daAlinkHIO_atnMove_c0::m = { + 3000, 2000, 6, 1.2f, 1.1f, 1.5f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, + 0.7f, 1.4f, 0.25f, 0.7f, 15.0f, 2.5f, 8.0f, 0.5f, 0.4f, 1.0f, 1.3f, +}; + +/* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata m__26daAlinkHIO_noActAtnMove_c0 */ +daAlinkHIO_noActAtnMove_c1 const daAlinkHIO_noActAtnMove_c0::m = { + 3000, 2000, 6, 0.9f, 1.1f, 1.3f, 0.5f, 0.6f, 13.0f, 6.0f, 7.5f, + 0.7f, 1.3f, 0.25f, 0.7f, 13.0f, 2.5f, 8.0f, 0.35f, 0.4f, 0.1f, 2.3f, +}; + +/* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata m__23daAlinkHIO_frontRoll_c0 */ +daAlinkHIO_frontRoll_c1 const daAlinkHIO_frontRoll_c0::m = { + {29, 1.1f, 0.0f, 3.0f, 22.0f}, + {29, 0.8f, 3.0f, 2.0f, 25.0f}, + {33, 1.2f, 0.0f, 1.0f, 25.0f}, + 10000, + 5, + 1000, + 100, + 3.0f, + 1.3f, + 25.0f, + 10.0f, + 3.0f, + 15.0f, + 10.0f, + 12.0f, + 9.0f, + 19.0f, + 60.0f, +}; + +/* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_backJump_c0 */ +daAlinkHIO_backJump_c1 const daAlinkHIO_backJump_c0::m = { + {9, 0.7f, 0.0f, 2.0f, 12.0f}, {17, 1.0f, 2.0f, 2.0f, 3.0f}, 24.0f, 10.0f, 100.0f, 10.0f, +}; + +/* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata m__22daAlinkHIO_sideStep_c0 */ +daAlinkHIO_sideStep_c1 const daAlinkHIO_sideStep_c0::m = { + {5, 1.1f, 1.0f, 3.0f, 6.0f}, + {9, 1.0f, 0.0f, 3.0f, 2.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {9, 1.1f, 0.0f, 3.0f, 4.0f}, + 28.0f, + 22.0f, + 25.0f, + 20.0f, + 100.0f, + 10.0f, +}; + +/* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata m__19daAlinkHIO_slide_c0 */ +daAlinkHIO_slide_c1 const daAlinkHIO_slide_c0::m = { + {14, 0.75f, 0.0f, 5.0f, 15.0f}, + {6, 0.9f, 0.0f, 3.0f, 7.0f}, + {15, 1.0f, 0.0f, 3.0f, 9.0f}, + {20, 1.0f, 0.0f, 3.0f, 16.0f}, + 40.0f, + 3.0f, + 50.0f, + 27.0f, + 0.2f, + 12.0f, + 50.0f, + 3.0f, + 33.0f, + 1.2f, +}; + +/* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmV_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutNmV_c1 const daAlinkHIO_cutNmV_c0::m = { + {27, 1.2f, 2.0f, 2.0f, 16.0f}, + 5.0f, + 5.0f, + 10.0f, +}; +#pragma pop + +/* 8038D964-8038D984 019FC4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmL_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutNmL_c1 const daAlinkHIO_cutNmL_c0::m = { + {27, 1.2f, 2.0f, 2.0f, 16.0f}, + 3.0f, + 7.0f, + 13.0f, +}; +#pragma pop + +/* 8038D984-8038D9A4 019FE4 0020+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutNmR_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutNmR_c1 const daAlinkHIO_cutNmR_c0::m = { + {27, 1.2f, 3.0f, 1.0f, 16.0f}, + 3.0f, + 7.0f, + 12.5f, +}; +#pragma pop + +/* 8038D9A4-8038D9C4 01A004 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSL_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutNmSL_c1 const daAlinkHIO_cutNmSL_c0::m = { + {31, 1.1f, 3.0f, 3.0f, 17.0f}, + 10.0f, + 3.0f, + 10.0f, +}; +#pragma pop + +/* 8038D9C4-8038D9E4 01A024 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutNmSR_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutNmSR_c1 const daAlinkHIO_cutNmSR_c0::m = { + {27, 1.1f, 4.0f, 3.0f, 17.0f}, + 8.0f, + 3.0f, + 10.0f, +}; +#pragma pop + +/* 8038D9E4-8038DA10 01A044 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnL_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutFnL_c1 const daAlinkHIO_cutFnL_c0::m = { + {29, 1.0f, 0.0f, 3.0f, 27.0f}, 0.0f, 5.0f, 7.0f, 12.0f, 21.0f, 3.0f, +}; +#pragma pop + +/* 8038DA10-8038DA3C 01A070 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnV_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutFnV_c1 const daAlinkHIO_cutFnV_c0::m = { + {33, 1.0f, 0.0f, 3.0f, 20.0f}, 0.0f, 5.0f, 5.0f, 11.0f, 17.0f, 1.0f, +}; +#pragma pop + +/* 8038DA3C-8038DA68 01A09C 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnS_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutFnS_c1 const daAlinkHIO_cutFnS_c0::m = { + {31, 1.1f, 0.0f, 3.0f, 28.0f}, 0, 4, 10.0f, 10.0f, 17.0f, 23.0f, 3.0f, +}; +#pragma pop + +/* 8038DA68-8038DA94 01A0C8 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSl_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutFnSl_c1 const daAlinkHIO_cutFnSl_c0::m = { + {33, 0.9f, 2.0f, 3.0f, 25.0f}, 0, 4, 15.0f, 6.0f, 13.0f, 21.0f, 5.0f, +}; +#pragma pop + +/* 8038DA94-8038DAC0 01A0F4 002C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_cutFnSm_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutFnSm_c1 const daAlinkHIO_cutFnSm_c0::m = { + {31, 0.9f, 2.0f, 3.0f, 20.0f}, 0, 2, 5.0f, 10.0f, 17.0f, 24.0f, 5.0f, +}; +#pragma pop + +/* 8038DAC0-8038DAEC 01A120 002C+00 0/1 0/0 0/0 .rodata m__20daAlinkHIO_cutFnR_c0 */ +#pragma push +daAlinkHIO_cutFnR_c1 const daAlinkHIO_cutFnR_c0::m = { + {34, 1.1f, 0.0f, 3.0f, 25.0f}, 0.0f, 5.0f, 8.0f, 14.0f, 17.0f, 1.0f, +}; +#pragma pop + +/* 8038DAEC-8038DB40 01A14C 0054+00 3/4 0/0 0/0 .rodata m__21daAlinkHIO_cutFnJU_c0 */ +daAlinkHIO_cutFnJU_c1 const daAlinkHIO_cutFnJU_c0::m = { + {19, 1.0f, 5.0f, 2.0f, 20.0f}, + {17, 1.1f, 2.0f, 4.0f, 8.0f}, + 0.0f, + 8.0f, + 33.0f, + 2.0f, + 14.0f, + 6.0f, + 6.0f, + 200.0f, + 10.0f, + 150.0f, + 80.0f, +}; + +/* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutJump_c0 */ +daAlinkHIO_cutJump_c1 const daAlinkHIO_cutJump_c0::m = { + {17, 1.1f, 0.0f, 2.0f, 18.0f}, + {29, 1.0f, 2.0f, 0.0f, 9.0f}, + 25.0f, + 27.0f, + 15.0f, + 13.0f, + 13.0f, + 1.0f, + 3.0f, +}; + +/* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata m__21daAlinkHIO_cutTurn_c0 */ +daAlinkHIO_cutTurn_c1 const daAlinkHIO_cutTurn_c0::m = { + {47, 1.0f, 2.0f, 3.0f, 28.0f}, + {9, 0.55f, 0.0f, 3.0f, 10.0f}, + {42, 1.0f, 2.0f, 3.0f, 27.0f}, + 0.0f, + 7.0f, + 6.0f, + 22.0f, + 0.6f, + 3.0f, + 0.6f, + 3.0f, + 5.0f, + 1.2f, + 1.0f, + 10.0f, + 5.0f, + 260.0f, + 5.0f, + 7.0f, + 24.0f, + 5.0f, + 20.0f, + 400.0f, + 35.0f, + 400.0f, + 35.0f, +}; + +/* 8038DC1C-8038DC3C 01A27C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLA_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_hoCutLA_c1 const daAlinkHIO_hoCutLA_c0::m = { + {21, 0.9f, 1.0f, 2.0f, 14.0f}, + 2.0f, + 6.0f, + 6.0f, +}; +#pragma pop + +/* 8038DC3C-8038DC5C 01A29C 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutLB_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_hoCutLB_c1 const daAlinkHIO_hoCutLB_c0::m = { + {24, 0.9f, 4.0f, 2.0f, 16.0f}, + 7.0f, + 13.0f, + 6.0f, +}; +#pragma pop + +/* 8038DC5C-8038DC7C 01A2BC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRA_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_hoCutRA_c1 const daAlinkHIO_hoCutRA_c0::m = { + {24, 0.95f, 0.0f, 2.0f, 13.0f}, + 2.0f, + 6.0f, + 6.0f, +}; +#pragma pop + +/* 8038DC7C-8038DC9C 01A2DC 0020+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_hoCutRB_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_hoCutRB_c1 const daAlinkHIO_hoCutRB_c0::m = { + {11, 0.9f, 0.0f, 2.0f, 10.0f}, + 2.0f, + 11.0f, + 6.0f, +}; +#pragma pop + +/* 8038DC9C-8038DCF0 01A2FC 0054+00 3/3 0/0 0/0 .rodata m__25daAlinkHIO_hoCutCharge_c0 */ +daAlinkHIO_hoCutCharge_c1 const daAlinkHIO_hoCutCharge_c0::m = { + {6, 0.45f, 0.0f, 3.0f, 7.0f}, + {21, 1.0f, 3.0f, 3.0f, 22.0f}, + {49, 1.0f, 5.0f, 2.0f, 27.0f}, + 4, + 5, + 8.0f, + 15.0f, + 0.0f, + 25.0f, + 300.0f, +}; + +/* 8038DCF0-8038DD0C 01A350 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaL_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutDaL_c1 const daAlinkHIO_cutDaL_c0::m = { + {12, 0.8f, 1.0f, 3.0f, 10.0f}, + 2.0f, + 6.0f, +}; +#pragma pop + +/* 8038DD0C-8038DD28 01A36C 001C+00 0/3 0/0 0/0 .rodata m__20daAlinkHIO_cutDaR_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutDaR_c1 const daAlinkHIO_cutDaR_c0::m = { + {14, 1.0f, 0.0f, 5.0f, 11.0f}, + 2.0f, + 6.0f, +}; +#pragma pop + +/* 8038DD28-8038DD44 01A388 001C+00 0/3 0/0 0/0 .rodata m__25daAlinkHIO_cutDaCharge_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_cutDaCharge_c1 const daAlinkHIO_cutDaCharge_c0::m = { + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + 3.0f, + 8.0f, +}; +#pragma pop + +/* 8038DD44-8038DDB8 01A3A4 0074+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_cutDown_c0 */ +daAlinkHIO_cutDown_c1 const daAlinkHIO_cutDown_c0::m = { + {8, 1.0f, 0.0f, 3.0f, 9.0f}, + {15, 1.0f, 0.0f, 3.0f, 9.0f}, + {16, 1.3f, 1.0f, 3.0f, 17.0f}, + {73, 1.0f, 0.0f, 2.0f, 70.0f}, + {9, 0.85f, 0.0f, 3.0f, 12.0f}, + 15, + 6, + 40.0f, + 20.0f, + 10.0f, +}; + +/* 8038DDB8-8038DE18 01A418 0060+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_cutHead_c0 */ +daAlinkHIO_cutHead_c1 const daAlinkHIO_cutHead_c0::m = { + {8, 0.9f, 0.0f, 1.0f, 9.0f}, + {21, 1.0f, 0.0f, 2.0f, 22.0f}, + {16, 1.2f, 1.0f, 3.0f, 10.0f}, + -4.0f, + 300.0f, + 400.0f, + 10.0f, + 12.0f, + 2.0f, + 8.0f, + 60.0f, + 1.6f, +}; + +/* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata m__26daAlinkHIO_cutLargeJump_c0 */ +daAlinkHIO_cutLargeJump_c1 const daAlinkHIO_cutLargeJump_c0::m = { + {29, 1.3f, 0.0f, 3.0f, 30.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {16, 1.0f, 0.0f, 2.0f, 17.0f}, + {35, 1.25f, 0.0f, 0.0f, 22.0f}, + 20.0f, + 33.0f, + 2.0f, + 6.0f, + 13.0f, + 0.0f, + 10.0f, + 250.0f, + 5.0f, +}; + +/* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata m__17daAlinkHIO_cut_c0 */ +daAlinkHIO_cut_c1 const daAlinkHIO_cut_c0::m = { + {18, -1.100f, 0.0f, 3.0f, -1.0f}, + {22, 0.9f, 0.0f, 3.0f, 23.0f}, + {45, 1.0f, 0.0f, 3.0f, 15.0f}, + {47, 1.0f, 0.0f, 5.0f, 27.0f}, + 0, + 1, + 15, + 8, + 10, + 90, + 75, + 4000, + -4000, + 30, + 12.0f, + 1.250f, + 1.0f, + 1.0f, + 1.6f, + 45.0f, + 1.65f, + 65.0f, + 1.21f, + 35.0f, + 2.3f, + 2.2f, + 65.0f, + 0.0f, +}; + +/* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata m__21daAlinkHIO_gAtPush_c0 */ +daAlinkHIO_gAtPush_c1 const daAlinkHIO_gAtPush_c0::m = { + {14, 1.0f, 1.0f, 5.0f, 18.0f}, 14.0f, 1.0f, 12.0f, 14.0f, +}; + +/* 8038DF4C-8038DF70 01A5AC 0024+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_gAtKick_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_gAtKick_c1 const daAlinkHIO_gAtKick_c0::m = { + {21, 1.2f, 0.0f, 0.0f, 22.0f}, 10.0f, 6.0f, 11.0f, 18.0f, +}; +#pragma pop + +/* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_turnMove_c0 */ +daAlinkHIO_turnMove_c1 const daAlinkHIO_turnMove_c0::m = { + {27, 1.0f, 0.0f, 3.0f, 22.0f}, 5, 2500, 200, 1000, 1.1f, 19.0f, 1.5f, 25.0f, +}; + +/* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata m__19daAlinkHIO_guard_c0 */ +daAlinkHIO_guard_c1 const daAlinkHIO_guard_c0::m = { + {11, 1.0f, 0.0f, 0.0f, 12.0f}, + {11, 1.0f, 0.0f, 0.0f, 12.0f}, + {19, 1.0f, 0.0f, 3.0f, 20.0f}, + {35, 1.0f, 0.0f, 3.0f, 28.0f}, + 8000, + 5000, + 0, + 8000, + 4000, + 2.5f, + 3.0f, + 14.0f, + 20.0f, + 26.0f, + 80.0f, + 60.0f, + 40.0f, + 18.0f, +}; + +/* 8038E01C-8038E068 01A67C 004C+00 8/9 0/0 0/0 .rodata m__20daAlinkHIO_crouch_c0 */ +daAlinkHIO_crouch_c1 const daAlinkHIO_crouch_c0::m = { + {9, 1.0f, 0.0f, 3.0f, 10.0f}, + {7, -1.0f, 0.0f, 3.0f, 2.0f}, + 5, + 500, + 50, + 1.0f, + 4.0f, + 4.0f, + 4.0f, + 2.0f, + 0.5f, + 5.0f, +}; + +/* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata m__22daAlinkHIO_autoJump_c0 */ +daAlinkHIO_autoJump_c1 const daAlinkHIO_autoJump_c0::m = { + {6, 1.2f, 3.0f, 6.0f, 7.0f}, + {7, 0.9f, 1.0f, 0.0f, 5.0f}, + {4, 0.75f, 0.0f, 2.0f, 5.0f}, + {10, 0.6f, 0.0f, 2.0f, 11.0f}, + 1, + 9158, + 12287, + 8, + 16384, + 10.0f, + 10.0f, + 1.3f, + 5.0f, + 10.0f, + 3.0f, + -3.4f, + -200.0f, + 26.0f, + 3.0f, + 4.0f, + 10.0f, + 1.0f, + 170.0f, + 100.0f, + 20.0f, + 30.0f, + 20.0f, + -3.4f, + 14.0f, + -5.0f, + 23.0f, +}; + +/* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata m__23daAlinkHIO_smallJump_c0 */ +daAlinkHIO_smallJump_c1 const daAlinkHIO_smallJump_c0::m = { + {8, 0.6f, 3.0f, 3.0f, 9.0f}, + {5, 1.0f, 0.0f, 2.0f, 6.0f}, + {29, 0.85f, 0.0f, 5.0f, 6.0f}, + 6.0f, + 3.0f, + 7.0f, +}; + +/* 8038E164-8038E1B8 01A7C4 0054+00 15/15 0/0 0/0 .rodata m__23daAlinkHIO_wallCatch_c0 */ +daAlinkHIO_wallCatch_c1 const daAlinkHIO_wallCatch_c0::m = { + {19, 1.0f, 0.0f, 3.0f, 10.0f}, + {7, 1.0f, 0.0f, 3.0f, 8.0f}, + {29, 1.0f, 0.0f, 3.0f, 26.0f}, + {13, 1.0f, 1.0f, 2.0f, 14.0f}, + 4.0f, +}; + +/* 8038E1B8-8038E1E0 01A818 0028+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wallFall_c0 */ +daAlinkHIO_wallFall_c1 const daAlinkHIO_wallFall_c0::m = { + {22, 0.8f, 0.0f, 3.0f, 23.0f}, + {12, 1.0f, 0.0f, 3.0f, 13.0f}, +}; + +/* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wallMove_c0 */ +daAlinkHIO_wallMove_c1 const daAlinkHIO_wallMove_c0::m = { + 0.8f, 1.1f, 3.0f, 2.0f, 3.0f, +}; + +/* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata m__22daAlinkHIO_wallHang_c0 */ +daAlinkHIO_wallHang_c1 const daAlinkHIO_wallHang_c0::m = { + 2, 3, 50.0f, 100.0f, 150.0f, 200.0f, 250.0f, 200.0f, +}; + +/* 8038E210-8038E24C 01A870 003C+00 7/7 0/0 0/0 .rodata m__22daAlinkHIO_pushpull_c0 */ +daAlinkHIO_pushpull_c1 const daAlinkHIO_pushpull_c0::m = { + 0, 120, 7, 60, 80, 40, 2, 64, 1.0f, 5.0f, + 1.0f, 3.0f, 1.0f, 3.0f, 1.0f, 0.25f, 1.0f, 0.15f, 0.75f, +}; + +/* 8038E24C-8038E2B0 01A8AC 0064+00 1/3 0/0 0/0 .rodata m__23daAlinkHIO_damNormal_c0 */ +daAlinkHIO_damNormal_c1 const daAlinkHIO_damNormal_c0::m = { + {22, 2.3f, 0.0f, 3.0f, 20.0f}, + {19, 2.3f, 0.0f, 3.0f, 17.0f}, + {19, 2.3f, 0.0f, 3.0f, 17.0f}, + {19, 2.3f, 0.0f, 3.0f, 17.0f}, + 2000, + 5000, + 10.0f, + 0.02f, + 1.0f, + 0.5f, +}; + +/* 8038E2B0-8038E36C 01A910 00BC+00 2/4 0/0 0/0 .rodata m__22daAlinkHIO_damLarge_c0 */ +daAlinkHIO_damLarge_c1 const daAlinkHIO_damLarge_c0::m = { + {49, 0.8f, 0.0f, 3.0f, 40.0f}, + {64, 1.0f, 0.0f, 3.0f, 50.0f}, + {39, 0.8f, 0.0f, 3.0f, 33.0f}, + {39, 0.8f, 0.0f, 3.0f, 33.0f}, + {2, 0.8f, 0.0f, 1.0f, 50.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + 1300, + -5.0f, + 3.0f, + 20.0f, + 30.0f, + 15.0f, + 0.5f, +}; + +/* 8038E36C-8038E428 01A9CC 00BC+00 1/3 0/0 0/0 .rodata m__21daAlinkHIO_damHuge_c0 */ +daAlinkHIO_damHuge_c1 const daAlinkHIO_damHuge_c0::m = { + {49, 0.8f, 0.0f, 3.0f, 40.0f}, + {64, 0.8f, 0.0f, 3.0f, 50.0f}, + {39, 0.8f, 0.0f, 3.0f, 33.0f}, + {39, 0.8f, 0.0f, 3.0f, 33.0f}, + {2, 1.0f, 0.0f, 1.0f, 50.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + {2, 1.0f, 0.0f, 1.0f, 40.0f}, + 2000, + -7.5f, + 3.0f, + 80.0f, + 40.0f, + 15.0f, + 0.5f, +}; + +/* 8038E428-8038E454 01AA88 002C+00 1/1 0/0 0/0 .rodata m__22daAlinkHIO_damHorse_c0 */ +daAlinkHIO_damHorse_c1 const daAlinkHIO_damHorse_c0::m = { + {9, 2.0f, 0.0f, 3.0f, 10.0f}, + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + 2500, + 5000, +}; + +/* 8038E454-8038E49C 01AAB4 0048+00 9/9 0/0 0/0 .rodata m__21daAlinkHIO_damFall_c0 */ +daAlinkHIO_damFall_c1 const daAlinkHIO_damFall_c0::m = { + {11, 1.2f, 2.0f, 3.0f, 12.0f}, + {17, 0.8f, 0.0f, 0.0f, 12.0f}, + 10, + 25, + 4.0f, + 30.0f, + 20.0f, + 60.0f, + 4.0f, + 10.0f, + 15.0f, +}; + +/* 8038E49C-8038E4C0 01AAFC 0024+00 6/7 0/0 0/0 .rodata m__23daAlinkHIO_damCaught_c0 */ +daAlinkHIO_damCaught_c1 const daAlinkHIO_damCaught_c0::m = { + {59, 1.5f, 0.0f, 3.0f, 35.0f}, 300, 5, 0.7f, 3.0f, 1.3f, +}; + +/* 8038E4C0-8038E54C 01AB20 008C+00 1/2 0/0 0/0 .rodata m__21daAlinkHIO_damSwim_c0 */ +daAlinkHIO_damSwim_c1 const daAlinkHIO_damSwim_c0::m = { + {22, 1.2f, 0.0f, 3.0f, 18.0f}, + {19, 1.0f, 0.0f, 3.0f, 15.0f}, + {19, 1.2f, 0.0f, 3.0f, 15.0f}, + {19, 1.2f, 0.0f, 3.0f, 15.0f}, + {10, 1.0f, 0.0f, 3.0f, 11.0f}, + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + 1500, + 4000, + 8.0f, + 0.02f, + 0.25f, + 15.0f, +}; + +/* 8038E54C-8038E5A4 01ABAC 0058+00 10/12 0/0 0/0 .rodata m__20daAlinkHIO_damage_c0 */ +daAlinkHIO_damage_c1 const daAlinkHIO_damage_c0::m = { + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {9, 1.0f, 0.0f, 3.0f, 10.0f}, + 0, + 30, + 30, + 10, + 3, + 7, + 10, + 15, + 0, + 0, + 10, + 0, + 0, + 5, + 0, + 0, + 25, + 30, + 40, + 0.7f, + 35.0f, +}; + +/* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata m__19daAlinkHIO_horse_c0 */ +daAlinkHIO_horse_c1 const daAlinkHIO_horse_c0::m = { + {18, 1.2f, 0.0f, 5.0f, 19.0f}, + {22, 1.2f, 0.0f, 3.0f, 23.0f}, + {43, 1.45f, 3.0f, 3.0f, 44.0f}, + {18, 1.2f, 0.0f, 3.0f, 23.0f}, + 100, + 32767, + 30, + 25, + 5500, + -13000, + 1.2f, + 8.0f, + 8.0f, + 5.0f, +}; + +/* ############################################################################################## */ +/* 8038E610-8038E658 01AC70 0048+00 11/11 0/0 0/0 .rodata m__19daAlinkHIO_canoe_c0 */ +daAlinkHIO_canoe_c1 const daAlinkHIO_canoe_c0::m = { + {23, 1.3f, 0.0f, 3.0f, 24.0f}, + 150, + 360, + 1.0f, + 1.5f, + 9.0f, + 15.0f, + 0.2f, + 1.5f, + 2.0f, + 6.0f, + 10.0f, + 40.0f, + 30.0f, + 0.2f, +}; + +/* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata m__17daAlinkHIO_bow_c0 */ +daAlinkHIO_bow_c1 const daAlinkHIO_bow_c0::m = { + {9, 1.0f, 0.0f, 3.0f, 5.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + 10, + 30, + 70, + 5.0f, + 300.0f, + 5000.0f, + 800.0f, + 9000.0f, + 50.0f, + 200.0f, + 3000.0f, + 230.0f, + 3500.0f, + 600.0f, + 9000.0f, + 1000.0f, + 4000.0f, + 250.0f, + 800.0f, +}; + +/* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata m__18daAlinkHIO_boom_c0 */ +daAlinkHIO_boom_c1 const daAlinkHIO_boom_c0::m = { + {21, 0.9f, 3.0f, 2.0f, 22.0f}, + {25, 1.0f, 3.0f, 1.0f, 10.0f}, + 40, + 0, + 1.0f, + 3.0f, + 60.0f, + 60.0f, + 2000.0f, + 3000.0f, + 3000.0f, + 40.0f, +}; + +/* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata m__18daAlinkHIO_bomb_c0 */ +daAlinkHIO_bomb_c1 const daAlinkHIO_bomb_c0::m = { + 160, 50, 50, -4.2f, -100.0f, 0.350f, 2.0f, 20.0f, 1.3f, 225.0f, + 0.0f, -0.8f, -7.0f, 26.0f, 33.0f, 10.0f, 15.0f, 40.0f, 15.0f, 300.0f, +}; + +/* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_huLight_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_huLight_c1 const daAlinkHIO_huLight_c0::m = { + 3, 0, 181, 112, 40, -70, 1.0f, 50.0f, 350.0f, 0.0f, +}; +#pragma pop + +/* 8038E77C-8038E7CC 01ADDC 0050+00 7/8 0/0 0/0 .rodata m__23daAlinkHIO_kandelaar_c0 */ +daAlinkHIO_kandelaar_c1 const daAlinkHIO_kandelaar_c0::m = { + {30, 1.1f, 2.0f, 3.0f, 17.0f}, + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + {17, 1.0f, 0.0f, 3.0f, 18.0f}, + 80, + 40, + 20, + 40, + 30, + 10, + 3, + 200, + 0.5f, +}; + +/* 8038E7CC-8038E7F4 01AE2C 0028+00 2/2 0/0 0/0 .rodata m__21daAlinkHIO_fmChain_c0 */ +daAlinkHIO_fmChain_c1 const daAlinkHIO_fmChain_c0::m = { + {20, 1.2f, 0.0f, 3.0f, 16.0f}, + {20, -1.1f, 0.0f, 3.0f, 5.0f}, +}; + +/* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata m__24daAlinkHIO_magneBoots_c0 */ +daAlinkHIO_magneBoots_c1 const daAlinkHIO_magneBoots_c0::m = { + {29, 1.1f, 0.0f, 3.0f, 23.0f}, + 0.4f, + 1.0f, + 1.8f, + 0.7f, + 0.75f, + 0.45, + 0.6f, + 50.0f, + 10.0f, + 0.35f, + 0.3f, + 0.7f, + 0.8f, + 0.7f, +}; + +/* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_pickUp_c0 */ +daAlinkHIO_pickUp_c1 const daAlinkHIO_pickUp_c0::m = { + {18, 0.9f, 0.0f, 2.0f, 13.0f}, + {18, -1.0f, 0.0f, 1.0f, 4.0f}, + 30.0f, + 30.0f, +}; + +/* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata m__19daAlinkHIO_board_c0 */ +daAlinkHIO_board_c1 const daAlinkHIO_board_c0::m = { + {9, 2.5f, 0.0f, 3.0f, 10.0f}, + {14, 0.7f, 0.0f, 8.0f, 15.0f}, + {24, 1.6f, 5.0f, 5.0f, 25.0f}, + {24, 0.8f, 0.0f, 3.0f, 25.0f}, + 70.0f, + 4.0f, + 22.0f, + 35.0f, + 1.0f, + 4.0f, + 1.0f, + 3.0f, + 2.0f, + 30.0f, + 0.9f, + 55.0f, + 4.0f, + 3.0f, + 1.0f, + 20.0f, + 24.0f, + 35.0f, + 50.0f, +}; + +/* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata m__20daAlinkHIO_bottle_c0 */ +daAlinkHIO_bottle_c1 const daAlinkHIO_bottle_c0::m = { + {56, 1.15f, 0.0f, 3.0f, 57.0f}, {39, 1.2f, 0.0f, 3.0f, 40.0f}, {44, 1.2f, 0.0f, 3.0f, 50.0f}, + {54, 1.1f, 0.0f, 3.0f, 55.0f}, {24, 1.0f, 0.0f, 3.0f, 25.0f}, {12, 0.6f, 1.0f, 3.0f, 10.0f}, + {47, 1.0f, 0.0f, 3.0f, 48.0f}, {86, 1.0f, 0.0f, 3.0f, 87.0f}, {29, 1.2f, 0.0f, 3.0f, 30.0f}, +}; + +/* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata m__22daAlinkHIO_hookshot_c0 */ +daAlinkHIO_hookshot_c1 const daAlinkHIO_hookshot_c0::m = { + {12, 1.0f, 0.0f, 0.0f, 13.0f}, + {39, 1.0f, 0.0f, 1.0f, 11.0f}, + {28, 1.0f, 0.0f, 2.0f, 7.0f}, + 0.0f, + 1.0f, + 3.0f, + 2000.0f, + 100.0f, + 150.0f, + 60.0f, + 5.0f, + 13.0f, + 3000.0f, + 150.0f, + 225.0f, + 90.0f, +}; + +/* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata m__21daAlinkHIO_spinner_c0 */ +daAlinkHIO_spinner_c1 const daAlinkHIO_spinner_c0::m = { + {21, 0.8f, 0.0f, 3.0f, 13.0f}, + 30, + 15, + 360, + 360, + 150, + -3.7f, + -50.0f, + 0.9f, + 26.0f, + 0.5f, + 0.1f, + 0.01f, + 60.0f, +}; + +/* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata m__22daAlinkHIO_ironBall_c0 */ +daAlinkHIO_ironBall_c1 const daAlinkHIO_ironBall_c0::m = { + {19, 1.1f, 5.0f, 2.0f, 15.0f}, + 5, + 5, + 1.0f, + 1.7f, + 3.0f, + 1.5f, + 3.0f, + 1.6f, + 3.0f, + 1.7f, + 3.0f, + 1.0f, + 2.0f, + 0.5f, + -3.0f, + 7.0f, + 0.5f, + 30.0f, + 5.0f, + -0.5f, + -5.5f, + -0.5f, + -150.0f, + 3.0f, + 60.0f, + 5.0f, + -3.0f, + 80.0f, + 1.0f, + 1.5f, + 0.5f, +}; + +/* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata m__21daAlinkHIO_copyRod_c0 */ +daAlinkHIO_copyRod_c1 const daAlinkHIO_copyRod_c0::m = { + 19, 1.0f, 0.0f, 3.0f, 14.0f, 39, 1.0f, 0.0f, 3.0f, 30.0f, 80.0f, 1500.0f, 100.0f, 2000.0f, +}; + +/* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata m__21daAlinkHIO_zwLight_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_zwLight_c1 const daAlinkHIO_zwLight_c0::m = { + 771, 0, 182, 225, 243, -87, 1.0f, 70.75195f, 131.83594f, 0.0f, +}; +COMPILER_STRIP_GATE(0x8038EB34, &daAlinkHIO_zwLight_c0::m); +#pragma pop + +/* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata m__18daAlinkHIO_item_c0 */ +daAlinkHIO_item_c1 const daAlinkHIO_item_c0::m = { + {12, 1.0f, 0.0f, 3.0f, 13.0f}, + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + 15, + 10000, + -13000, + 6000, + -9000, + 1.3f, + 1.3f, +}; + +/* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata m__20daAlinkHIO_ladder_c0 */ +daAlinkHIO_ladder_c1 const daAlinkHIO_ladder_c0::m = { + {13, 0.8f, 2.0f, 3.0f, 10.0f}, + {47, 1.25f, 0.0f, 2.0f, 48.0f}, + 0.8f, + 5.0f, + 1.0f, + 0.0f, + 1.0f, + 5.0f, + 1.2f, + 0.0f, + 0.4f, + 0.9f, + 2.0f, + 18.0f, + 40.0f, + 0.8f, + 1.15f, + 0.9f, + 1.35f, + 80.0f, +}; + +/* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata m__22daAlinkHIO_roofHang_c0 */ +daAlinkHIO_roofHang_c1 const daAlinkHIO_roofHang_c0::m = { + {34, 1.0f, 0.0f, 3.0f, 20.0f}, + 4, + 100, + 2400, + 1.0f, + 5.0f, + 0.8f, + 1.0f, + 3.0f, + 10.0f, + 13.0f, + 1.0f, + 1.1f, + 3.0f, + 0.9f, + 3.0f, +}; + +/* 8038EC48-8038ED2C 01B2A8 00E4+00 10/11 0/0 0/0 .rodata m__18daAlinkHIO_grab_c0 */ +daAlinkHIO_grab_c1 const daAlinkHIO_grab_c0::m = { + {4, 0.9f, 0.0f, 3.0f, 5.0f}, + {9, 0.65f, 0.0f, 3.0f, 8.0f}, + {4, -0.8f, 1.0f, 3.0f, 2.0f}, + {39, 0.9f, 0.0f, 3.0f, 17.0f}, + {9, -0.75f, 0.0f, 2.0f, -1.0f}, + {19, 1.0f, 6.0f, 5.0f, 11.0f}, + {19, 0.9f, 2.0f, 4.0f, 10.0f}, + {39, 1.5f, 0.0f, 3.0f, 40.0f}, + {30, -1.3f, 0.0f, 3.0f, 10.0f}, + {12, 0.55f, 0.0f, 3.0f, 10.0f}, + {49, 0.8f, 0.0f, 3.0f, 35.0f}, + 0, + 15, + 0.55f, +}; + +/* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata m__18daAlinkHIO_swim_c0 */ +daAlinkHIO_swim_c1 const daAlinkHIO_swim_c0::m = { + {25, 1.0f, 0.0f, 3.0f, -1.0f}, + {23, 1.0f, 0.0f, 3.0f, 24.0f}, + {12, 2.0f, 0.0f, 10.0f, 24.0f}, + {37, 1.0f, 3.0f, 5.0f, 38.0f}, + 15, + 800, + 5000, + 15, + 200, + 5000, + 90, + 50, + 140.0f, + 50.0f, + 8.0f, + 8.0f, + 6.0f, + 12.0f, + 8.0f, + 5.0f, + 0.5f, + -7.0f, + 6.0f, + 0.2f, + 0.8f, + 15.0f, + 3.5f, + 0.5f, + 1.0f, + 0.5f, + 1.3f, + 0.5f, + 1.3f, + 0.4f, + 0.6f, + 15.0f, + 37.5f, + -37.5f, + 3.0f, + -4.0f, + -20.0f, + 250.0f, + 0.0f, + 10.0f, + 0.9f, + -0.7f, + 0.6f, + 13.0f, + 0.3f, + 0.5f, + 1.3f, +}; + +/* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata m__20daAlinkHIO_wlMove_c0 */ +daAlinkHIO_wlMove_c1 const daAlinkHIO_wlMove_c0::m = { + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {14, 1.0f, 0.0f, 3.0f, 12.0f}, + {8, 1.0f, 0.0f, 1.0f, 20.0f}, + {41, 1.0f, 0.0f, 3.0f, 20.0f}, + 9000, + 100, + 5, + 90, + 50, + 60, + 50, + 45, + 50, + 40.0f, + 4.0f, + 3.0f, + 1.6f, + 1.1f, + 2.2f, + 1.2f, + 1.3f, + 0.1f, + 0.4f, + 0.4f, + 0.5f, + 5.0f, + 5.0f, + 0.3f, + 0.85f, + 0.9f, + 2.5f, + 40.0f, + 5.0f, + 22.0f, + 1.0f, + 5.0f, + 100.0f, + 10.0f, + 45.0f, + 1.3f, + 6.0f, + 65.0f, + 20.0f, + 15.0f, + 33.0f, + 35.0f, + 1.2f, + 3.0f, + 25.0f, + 35.0f, + 1.1f, + 0.5f, +}; + +/* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata m__23daAlinkHIO_wlMoveNoP_c0 */ +daAlinkHIO_wlMoveNoP_c1 const daAlinkHIO_wlMoveNoP_c0::m = { + 9000, 100, 5, 25.0f, 3.0f, 1.8f, 1.0f, 0.8f, 2.2f, 1.1f, + 0.1f, 0.6f, 0.6f, 5.0f, 0.5f, 0.85f, 0.9f, 2.5f, 30.0f, +}; + +/* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata m__23daAlinkHIO_wlAtnMove_c0 */ +daAlinkHIO_wlAtnMove_c1 const daAlinkHIO_wlAtnMove_c0::m = { + 9000, 100, 3, 0.8f, 1.8f, 0.2f, 0.6f, 18.0f, 2.0f, 2.0f, 1.7f, 0.4f, 12.0f, 3.0f, 2.0f, +}; + +/* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata m__24daAlinkHIO_wlSideStep_c0 */ +daAlinkHIO_wlSideStep_c1 const daAlinkHIO_wlSideStep_c0::m = { + {5, 1.0f, 0.0f, 3.0f, 6.0f}, + {23, 1.0f, 1.0f, 2.0f, 2.0f}, + {4, 0.9f, 0.0f, 3.0f, 5.0f}, + {23, 1.0f, 1.0f, 2.0f, 3.0f}, + 33.0f, + 23.0f, + 30.0f, + 22.0f, + 100.0f, + 10.0f, +}; + +/* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata m__24daAlinkHIO_wlBackJump_c0 */ +daAlinkHIO_wlBackJump_c1 const daAlinkHIO_wlBackJump_c0::m = { + {11, 0.8f, 0.0f, 2.0f, 12.0f}, {28, 1.0f, 0.0f, 3.0f, 1.0f}, 30.0f, 20.0f, 100.0f, 10.0f, +}; + +/* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata m__20daAlinkHIO_wlHowl_c0 */ +daAlinkHIO_wlHowl_c1 const daAlinkHIO_wlHowl_c0::m = { + {49, 1.0f, 0.0f, 3.0f, 40.0f}, + {71, 1.0f, 0.0f, 3.0f, 72.0f}, + {14, 1.3f, 1.0f, 3.0f, 11.0f}, + {17, 0.9f, 0.0f, 3.0f, 18.0f}, + 3.0f, + 8.0f, + 1.7f, + 0.7f, +}; + +/* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata m__24daAlinkHIO_wlAutoJump_c0 */ +daAlinkHIO_wlAutoJump_c1 const daAlinkHIO_wlAutoJump_c0::m = { + {3, 1.2f, 1.0f, 2.0f, 4.0f}, + {24, 1.0f, 1.0f, 2.0f, 2.0f}, + {5, 0.5f, 2.0f, 5.0f, 7.0f}, + 1, + 0, + 7500, + 8200, + 10.0f, + 10.0f, + 1.1f, + 10.0f, + 5.0f, + -3.6f, + -100.0f, + 1.2f, + 10.0f, + 10.0f, + 1.02f, + 38.0f, + 31.0f, + 100.0f, +}; + +/* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata m__20daAlinkHIO_wlPush_c0 */ +daAlinkHIO_wlPush_c1 const daAlinkHIO_wlPush_c0::m = { + 1.0f, 3.0f, 1.0f, 3.0f, 0.75f, +}; + +/* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata m__19daAlinkHIO_wlLie_c0 */ +daAlinkHIO_wlLie_c1 const daAlinkHIO_wlLie_c0::m = { + {14, 1.5f, 0.0f, 3.0f, 10.0f}, + {11, 1.5f, 3.0f, 3.0f, 8.0f}, + 5, + 500, + 50, + 3.0f, + 8.0f, + 1.7f, + 0.7f, + 5.0f, + 0.8f, + 3.0f, +}; + +/* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata m__21daAlinkHIO_wlLight_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlLight_c1 const daAlinkHIO_wlLight_c0::m = { + 515, 0, 120, 120, 120, -30, 3.0f, 20.0f, 512.0f, -638.0f, +}; +#pragma pop + +/* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata m__24daAlinkHIO_wlWallHang_c0 */ +daAlinkHIO_wlWallHang_c1 const daAlinkHIO_wlWallHang_c0::m = { + {13, 1.2f, 8.0f, 2.0f, 14.0f}, + {39, 1.1f, 0.0f, 3.0f, 31.0f}, + {39, 1.0f, 0.0f, 5.0f, 40.0f}, + {5, 1.0f, 0.0f, 3.0f, 6.0f}, + {6, 1.0f, 0.0f, 3.0f, 7.0f}, + {16, 1.0f, 0.0f, 3.0f, 10.0f}, + 50.0f, + 100.0f, + 200.0f, + 250.0f, + 100.0f, + 17.0f, + 15.0f, + 10.0f, + 10.0f, +}; + +/* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata m__25daAlinkHIO_wlDamNormal_c0 */ +daAlinkHIO_wlDamNormal_c1 const daAlinkHIO_wlDamNormal_c0::m = { + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + {9, 1.0f, 0.0f, 0.0f, 8.0f}, + 10.0f, + 0.01f, + 1.0f, + 0.25f, +}; + +/* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata m__24daAlinkHIO_wlDamLarge_c0 */ +daAlinkHIO_wlDamLarge_c1 const daAlinkHIO_wlDamLarge_c0::m = { + {49, 1.0f, 0.0f, 3.0f, 40.0f}, + {39, 1.0f, 0.0f, 3.0f, 35.0f}, + {34, 1.1f, 0.0f, 3.0f, 32.0f}, + {34, 1.1f, 0.0f, 3.0f, 32.0f}, + 1300, + -5.2f, + 3.0f, + 10.0f, + 15.0f, + 15.0f, + 0.5f, +}; + +/* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata m__23daAlinkHIO_wlDamHuge_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlDamHuge_c1 const daAlinkHIO_wlDamHuge_c0::m = { + {49, 1.1f, 0.0f, 3.0f, 40.0f}, + {39, 1.1f, 0.0f, 3.0f, 35.0f}, + {34, 1.2f, 0.0f, 3.0f, 30.0f}, + {34, 1.2f, 0.0f, 3.0f, 30.0f}, + 2000, + -7.5f, + 3.0f, + 85.0f, + 45.0f, + 15.0f, + 0.5f, +}; +#pragma pop + +/* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata m__23daAlinkHIO_wlDamFall_c0 */ +daAlinkHIO_wlDamFall_c1 const daAlinkHIO_wlDamFall_c0::m = { + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + {17, 0.8f, 0.0f, 0.0f, 12.0f}, + 15, + 35, + 40.0f, + 60.0f, + 3.0f, + 1.0f, + 15.0f, +}; + +/* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata m__25daAlinkHIO_wlDamCaught_c0 */ +daAlinkHIO_wlDamCaught_c1 const daAlinkHIO_wlDamCaught_c0::m = { + 300, 5, 1.2f, 3.0f, 1.5f, +}; + +/* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata m__22daAlinkHIO_wlDamage_c0 */ +daAlinkHIO_wlDamage_c1 const daAlinkHIO_wlDamage_c0::m = { + {9, 1.1f, 0.0f, 3.0f, 10.0f}, + {9, 1.1f, 0.0f, 3.0f, 7.0f}, + 0.7f, +}; + +/* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata m__21daAlinkHIO_wlSlide_c0 */ +daAlinkHIO_wlSlide_c1 const daAlinkHIO_wlSlide_c0::m = { + {20, 1.25f, 0.0f, 3.0f, 25.0f}, + {7, 1.0f, 0.0f, 3.0f, 8.0f}, + {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {29, 1.0f, 0.0f, 3.0f, 27.0f}, + 512, + 64, + 35.0f, + 3.0f, + 50.0f, + 35.0f, + 2.6f, + 18.0f, + 2.1f, + 10.0f, + 0.7f, + 30.0f, +}; + +/* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata m__20daAlinkHIO_wlRope_c0 */ +daAlinkHIO_wlRope_c1 const daAlinkHIO_wlRope_c0::m = { + {16, 1.0f, 0.0f, 3.0f, 17.0f}, 90, 30, 0.5f, 1.2f, 3.0f, 15.0f, 1.0f, 3.0f, 3.0f, 0.8f, +}; + +/* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaLr_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlAtWaLr_c1 const daAlinkHIO_wlAtWaLr_c0::m = { + {41, 0.9f, 4.0f, 3.0f, 16.0f}, + 5, + 3, + 0.0f, + 10.0f, + 4.0f, + 11.0f, + 18.0f, + 5.0f, + 70.0f, + 70.0f, + 150.0f, +}; +#pragma pop + +/* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaSc_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlAtWaSc_c1 const daAlinkHIO_wlAtWaSc_c0::m = { + {15, 0.9f, 0.0f, 3.0f, 15.0f}, + 5, + 5, + 10.0f, + 3.0f, + 5.0f, + 11.0f, + 18.0f, + 0.0f, + 100.0f, + 85.0f, + 150.0f, +}; +#pragma pop + +/* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata m__22daAlinkHIO_wlAtWaTl_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlAtWaTl_c1 const daAlinkHIO_wlAtWaTl_c0::m = { + {42, 1.05f, 3.0f, 3.0f, 28.0f}, + 0, + 3, + 10.0f, + 5.0f, + 10.0f, + 14.0f, + 25.0f, + 0.0f, + 40.0f, + 150.0f, + 100.0f, +}; +#pragma pop + +/* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata m__22daAlinkHIO_wlAtRoll_c0 */ +daAlinkHIO_wlAtRoll_c1 const daAlinkHIO_wlAtRoll_c0::m = { + {40, 1.0f, 4.0f, 3.0f, 23.0f}, + 250.0f, + 20.0f, + 0.0f, +}; + +/* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata m__23daAlinkHIO_wlAtNjump_c0 */ +daAlinkHIO_wlAtNjump_c1 const daAlinkHIO_wlAtNjump_c0::m = { + {6, 1.0f, 4.0f, 3.0f, 7.0f}, + 30.0f, + 40.0f, + 23.0f, + 17.0f, + 0.8f, + 2.0f, + 80.0f, + 60.0f, + 120.0f, + 10.0f, +}; + +/* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata m__23daAlinkHIO_wlAtCjump_c0 */ +daAlinkHIO_wlAtCjump_c1 const daAlinkHIO_wlAtCjump_c0::m = { + {3, 2.0f, 0.0f, 3.0f, 4.0f}, + {7, 1.2f, 2.0f, 1.0f, 8.0f}, + 26.0f, + 45.0f, + 35.0f, + 20.0f, + 1.0f, + 3.0f, + 5.0f, + 0.8f, + 80.0f, + 60.0f, + 120.0f, + 26.0f, + 0.5f, + 10.0f, + 0.1f, +}; + +/* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLand_c0 */ +daAlinkHIO_wlAtLand_c1 const daAlinkHIO_wlAtLand_c0::m = { + {19, 0.9f, 0.0f, 2.0f, 2.0f}, + {14, 1.0f, 0.0f, 3.0f, 1.0f}, + {19, 1.1f, 0.0f, 2.0f, 1.0f}, + 2.0f, +}; + +/* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata m__22daAlinkHIO_wlAtDown_c0 */ +daAlinkHIO_wlAtDown_c1 const daAlinkHIO_wlAtDown_c0::m = { + {3, 1.0f, 0.0f, 3.0f, 4.0f}, + {16, 1.0f, 0.0f, 3.0f, 17.0f}, + {21, 1.0f, 0.0f, 3.0f, 22.0f}, + {49, 1.0f, 0.0f, 3.0f, 50.0f}, + {11, 1.0f, 0.0f, 3.0f, 12.0f}, + {84, 0.85f, 0.0f, 3.0f, 60.0f}, + {6, 1.0f, 0.0f, 3.0f, 9.0f}, + 40, + 3, + 45.0f, + 13.0f, + 13.0f, +}; + +/* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata m__22daAlinkHIO_wlAtLock_c0 */ +daAlinkHIO_wlAtLock_c1 const daAlinkHIO_wlAtLock_c0::m = { + {6, 3.0f, 0.0f, 3.0f, 15.0f}, + {6, 2.0f, 0.0f, 2.0f, 20.0f}, + {120, 100.0f, 550.0f, 25.0f, 85.0f}, + 80.0f, + 60.0f, + 120.0f, + -8.0f, + 700.0f, + 1000.0f, +}; + +/* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata m__22daAlinkHIO_wlAtBite_c0 */ +daAlinkHIO_wlAtBite_c1 const daAlinkHIO_wlAtBite_c0::m = { + {5, 1.0f, 1.0f, 0.0f, 6.0f}, + {20, 1.6f, 0.0f, 3.0f, 32.0f}, + 25, + 15, + 1.2f, + 3.0f, + 20.0f, + 2.0f, + 1.3f, + 1.3f, + 2.0f, + 2.0f, + 0.19f, + 0.19f, + 0.02f, + 0.02f, +}; + +/* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata m__22daAlinkHIO_wlAttack_c0 */ +daAlinkHIO_wlAttack_c1 const daAlinkHIO_wlAttack_c0::m = { + {59, 1.2f, 0.0f, 2.0f, 5.0f}, 15, 5, 100.0f, 10.0f, 5.0f, 230.0f, 10.0f, 12.0f, 35.0f, 30.0f, +}; + +/* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata m__21daAlinkHIO_wlPoint_c0 */ +daAlinkHIO_wlPoint_c1 const daAlinkHIO_wlPoint_c0::m = { + {6, 0.9f, 2.0f, 3.0f, 7.0f}, + {7, 1.0f, 0.0f, 3.0f, 8.0f}, + {11, 0.75f, 0.0f, 3.0f, 5.0f}, + {14, 1.0f, 0.0f, 3.0f, 3.0f}, + {20, 1.0f, 3.0f, 5.0f, 50.0f}, + 45.0f, + 65.0f, + 15.0f, + 0.5f, + 0.5f, + 0.2f, +}; + +/* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata m__21daAlinkHIO_wlChain_c0 */ +daAlinkHIO_wlChain_c1 const daAlinkHIO_wlChain_c0::m = { + {39, 1.0f, 0.0f, 3.0f, 40.0f}, + {81, 1.0f, 0.0f, 3.0f, 82.0f}, + {47, 1.0f, 0.0f, 0.0f, 48.0f}, + 20, + 5, + 1.0f, + 3.0f, + 1.0f, + 3.0f, + 15.1f, + 1.0f, + 5.0f, +}; + +/* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata m__20daAlinkHIO_wlSwim_c0 */ +daAlinkHIO_wlSwim_c1 const daAlinkHIO_wlSwim_c0::m = { + {25, 0.9f, 0.0f, 5.0f, -1.0f}, + {45, 1.0f, 0.0f, 3.0f, 20.0f}, + {28, 1.1f, 0.0f, 1.0f, 32.0f}, + 5, + 1000, + 1600, + 5, + 2500, + 1024, + 90.0f, + 50.0f, + 20.0f, + 0.35f, + -10.0f, + 10.0f, + 1.5f, + 1.4f, + 10.0f, + 3.5f, + 0.5f, + 1.5f, + 5.0f, + 37.5f, + 9.0f, + 0.25f, + 1.0f, + 0.4f, + 1.2f, + -37.5f, + 8.0f, + 0.2f, + -7.0f, + 7.0f, +}; + +/* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata m__20daAlinkHIO_wlGrab_c0 */ +daAlinkHIO_wlGrab_c1 const daAlinkHIO_wlGrab_c0::m = { + {20, 1.5f, 0.0f, 3.0f, 15.0f}, {20, -1.3f, 0.0f, 3.0f, 5.0f}, {14, 1.0f, 0.0f, 3.0f, 15.0f}, + {14, -1.0f, 0.0f, 3.0f, -1.0f}, {19, 1.3f, 4.0f, 3.0f, 15.0f}, +}; + +/* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata m__20daAlinkHIO_wlBall_c0 */ +#pragma push +#pragma force_active on +daAlinkHIO_wlBall_c1 const daAlinkHIO_wlBall_c0::m = { + {64, 1.0f, 0.0f, 3.0f, 35.0f}, {54, 1.0f, 0.0f, 3.0f, 55.0f}, 60, -5.0f, 60.0f, 20.0f, +}; +#pragma pop + +/* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata m__18daAlinkHIO_wolf_c0 */ +daAlinkHIO_wolf_c1 const daAlinkHIO_wolf_c0::m = { + 13000, -10000, 8000, 4000, -2000, 8000, 150, 5, 35, 60, 0.7f, +}; \ No newline at end of file diff --git a/src/d/a/d_a_alink_bomb.inc b/src/d/a/d_a_alink_bomb.inc new file mode 100644 index 00000000000..72add7bc059 --- /dev/null +++ b/src/d/a/d_a_alink_bomb.inc @@ -0,0 +1,69 @@ +/* 800E3760-800E3770 0DE0A0 0010+00 0/0 0/0 7/7 .text getBombExplodeTime__9daAlink_cCFv + */ +s16 daAlink_c::getBombExplodeTime() const { + return daAlinkHIO_bomb_c0::m.mExplodeTime; +} + +/* 800E3770-800E3780 0DE0B0 0010+00 0/0 0/0 2/2 .text getBombGravity__9daAlink_cCFv */ +f32 daAlink_c::getBombGravity() const { + return daAlinkHIO_bomb_c0::m.mGravity; +} + +/* 800E3780-800E3790 0DE0C0 0010+00 0/0 0/0 2/2 .text getBombMaxFallSpeed__9daAlink_cCFv + */ +f32 daAlink_c::getBombMaxFallSpeed() const { + return daAlinkHIO_bomb_c0::m.mMaxFallSpeed; +} + +/* 800E3790-800E37A0 0DE0D0 0010+00 0/0 0/0 1/1 .text getBombBoundRate__9daAlink_cCFv */ +f32 daAlink_c::getBombBoundRate() const { + return daAlinkHIO_bomb_c0::m.mBoundRate; +} + +/* 800E37A0-800E37B0 0DE0E0 0010+00 0/0 0/0 1/1 .text getBombStopSpeedY__9daAlink_cCFv */ +f32 daAlink_c::getBombStopSpeedY() const { + return daAlinkHIO_bomb_c0::m.mStopSpeedY; +} + +/* 800E37B0-800E37C0 0DE0F0 0010+00 0/0 0/0 1/1 .text getBombMaxSpeedY__9daAlink_cCFv */ +f32 daAlink_c::getBombMaxSpeedY() const { + return daAlinkHIO_bomb_c0::m.mMaxSpeedY; +} + +/* 800E37C0-800E37D0 0DE100 0010+00 0/0 0/0 1/1 .text getBombEffScale__9daAlink_cCFv */ +f32 daAlink_c::getBombEffScale() const { + return daAlinkHIO_bomb_c0::m.mEffScale; +} + +/* 800E37D0-800E37E0 0DE110 0010+00 0/0 0/0 1/1 .text getBombAtR__9daAlink_cCFv */ +f32 daAlink_c::getBombAtR() const { + return daAlinkHIO_bomb_c0::m.mAtRadius; +} + +/* 800E37E0-800E37F0 0DE120 0010+00 0/0 0/0 1/1 .text getEnemyBombColorR__9daAlink_cCFv + */ +s16 daAlink_c::getEnemyBombColorR() const { + return daAlinkHIO_bomb_c0::m.mEnemyBombColorR; +} + +/* 800E37F0-800E3800 0DE130 0010+00 0/0 0/0 2/2 .text getBombWaterGravity__9daAlink_cCFv + */ +f32 daAlink_c::getBombWaterGravity() const { + return daAlinkHIO_bomb_c0::m.mWaterGravity; +} + +/* 800E3800-800E3810 0DE140 0010+00 0/0 0/0 2/2 .text getBombWaterMaxFallSpeed__9daAlink_cCFv */ +f32 daAlink_c::getBombWaterMaxFallSpeed() const { + return daAlinkHIO_bomb_c0::m.mWaterMaxFallSpeed; +} + +/* 800E3810-800E3820 0DE150 0010+00 0/0 0/0 1/1 .text + * getBombExplodeWaterEffectLimit__9daAlink_cCFv */ +f32 daAlink_c::getBombExplodeWaterEffectLimit() const { + return daAlinkHIO_bomb_c0::m.mExplodeWaterEffectLimit; +} + +/* 800E3820-800E3830 0DE160 0010+00 0/0 0/0 1/1 .text getBombInsectLimitAngle__9daAlink_cCFv */ +s16 daAlink_c::getBombInsectLimitAngle() const { + return daAlinkHIO_bomb_c0::m.mBombInsectLimitAngle; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_boom.inc b/src/d/a/d_a_alink_boom.inc new file mode 100644 index 00000000000..73e3a79c578 --- /dev/null +++ b/src/d/a/d_a_alink_boom.inc @@ -0,0 +1,316 @@ +/* 800DFFE0-800E0010 0DA920 0030+00 0/0 0/0 1/1 .text checkBoomerangLockAccept__9daAlink_cFv */ +BOOL daAlink_c::checkBoomerangLockAccept() { + return mSight.getDrawFlg() && i_dComIfGp_checkPlayerStatus0(0, 0x80000); +} + +/* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text getBoomSpeed__9daAlink_cFv */ +// small regalloc +#ifdef NONMATCHING +f32 daAlink_c::getBoomSpeed() { + f32 speed; + if (checkBoomerangChargeEndWait()) { + speed = daAlinkHIO_boom_c0::m.field_0x38; + } else { + speed = daAlinkHIO_boom_c0::m.field_0x34; + } + + if (i_checkModeFlg(0x400) && mRideAcKeep.getActor() != NULL && mSpeedF > FLOAT_LABEL(lit_6108)) { + speed += mSpeedF; + } + + return speed; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm f32 daAlink_c::getBoomSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getBoomSpeed__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800E00B0-800E00C0 0DA9F0 0010+00 0/0 0/0 1/1 .text getBoomCatchSpeed__9daAlink_cCFv */ +f32 daAlink_c::getBoomCatchSpeed() const { + return daAlinkHIO_boom_c0::m.mCatchSpeed; +} + +/* 800E00C0-800E011C 0DAA00 005C+00 1/1 0/0 1/1 .text getBoomFlyMax__9daAlink_cCFv */ +f32 daAlink_c::getBoomFlyMax() const { + if (i_checkModeFlg(0x400) && !checkCanoeRide()) { + return daAlinkHIO_boom_c0::m.field_0x40; + } else { + return daAlinkHIO_boom_c0::m.field_0x3c; + } +} + +/* 800E011C-800E0190 0DAA5C 0074+00 1/1 0/0 2/2 .text getBoomLockMax__9daAlink_cFv */ +f32 daAlink_c::getBoomLockMax() { + f32 max = getBoomFlyMax(); + + if (checkBossBabaRoom()) { + return lit_12475; + } else if (daAlinkHIO_boom_c0::m.field_0x44 > max) { + return daAlinkHIO_boom_c0::m.field_0x44; + } else { + return max; + } +} + +/* 800E0190-800E01A0 0DAAD0 0010+00 0/0 0/0 1/1 .text getBoomBgThroughTime__9daAlink_cCFv + */ +s16 daAlink_c::getBoomBgThroughTime() const { + return daAlinkHIO_boom_c0::m.mBgThroughTime; +} + +/* 800E01A0-800E01CC 0DAAE0 002C+00 1/1 0/0 0/0 .text checkBossBabaRoom__9daAlink_cFv */ +bool daAlink_c::checkBossBabaRoom() { + return checkStageName("D_MN05A"); +} + +/* 800E01CC-800E0210 0DAB0C 0044+00 0/0 1/1 0/0 .text + * cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::cancelBoomerangLock(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800E0210-800E0244 0DAB50 0034+00 2/2 0/0 0/0 .text getBoomerangActor__9daAlink_cFv */ +fopAc_ac_c* daAlink_c::getBoomerangActor() { + if (mThrowBoomerangAcKeep.getID() != 0xFFFFFFFF) { + return mThrowBoomerangAcKeep.getActor(); + } + + if (mEquipItem == BOOMERANG) { + return mItemAcKeep.getActor(); + } + + return NULL; +} + +/* 800E0244-800E02B8 0DAB84 0074+00 0/0 1/1 0/0 .text checkBoomerangChargeEnd__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkBoomerangChargeEnd() { + nofralloc +#include "asm/d/a/d_a_alink/checkBoomerangChargeEnd__9daAlink_cFv.s" +} +#pragma pop + +/* 800E02B8-800E03D0 0DABF8 0118+00 0/0 1/1 0/0 .text + * checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBoomerangCarry(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800E03D0-800E0440 0DAD10 0070+00 6/6 0/0 0/0 .text initBoomerangUpperAnimeSpeed__9daAlink_cFi + */ +void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) { + if (!checkBoomerangThrowAnime()) { + if (param_0 != 0) { + f32 tmp = FLOAT_LABEL(lit_6108); + mFrameCtrl2[2].setRate(tmp); + mFrameCtrl2[2].setFrame(tmp); + getNowAnmPackUpper(UPPER_NOW)->setFrame(tmp); + } else { + mFrameCtrl2[2].setRate(daAlinkHIO_boom_c0::m.field_0x2c); + } + } +} + +/* 800E0440-800E04AC 0DAD80 006C+00 9/9 0/0 0/0 .text checkBoomerangAnime__9daAlink_cCFv + */ +BOOL daAlink_c::checkBoomerangAnime() const { + return checkBoomerangReadyAnime() || checkBoomerangThrowAnime(); +} + +/* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkBoomerangThrowAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkBoomerangThrowAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800E04E8-800E055C 0DAE28 0074+00 1/1 0/0 0/0 .text setBoomerangReadyQuake__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBoomerangReadyQuake() { + nofralloc +#include "asm/d/a/d_a_alink/setBoomerangReadyQuake__9daAlink_cFv.s" +} +#pragma pop + +/* 800E055C-800E05E8 0DAE9C 008C+00 2/2 0/0 0/0 .text setBoomerangReadyAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBoomerangReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBoomerangReadyAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800E05E8-800E0630 0DAF28 0048+00 2/2 0/0 0/0 .text setThrowBoomerangAnime__9daAlink_cFv */ +void daAlink_c::setThrowBoomerangAnime() { + setUpperAnimeParam(0x53, UPPER_NOW, &daAlinkHIO_boom_c0::m.mThrowAnm); + cancelItemUseQuake(0); +} + +/* 800E0630-800E06B8 0DAF70 0088+00 2/2 0/0 0/0 .text setBoomerangCatchAnime__9daAlink_cFv */ +void daAlink_c::setBoomerangCatchAnime() { + setUpperAnimeParam(0x52, UPPER_NOW, &daAlinkHIO_boom_c0::m.mCatchAnm); + setFacePriBck(0xE8); + field_0x2f97 = 254; + if (mEquipItem != COPY_ROD) { + seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); + } +} + +/* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text throwBoomerang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::throwBoomerang() { + nofralloc +#include "asm/d/a/d_a_alink/throwBoomerang__9daAlink_cFv.s" +} +#pragma pop + +/* 800E08C4-800E0A9C 0DB204 01D8+00 0/0 0/0 1/1 .text returnBoomerang__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::returnBoomerang(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/returnBoomerang__9daAlink_cFi.s" +} +#pragma pop + +/* 800E0A9C-800E0B58 0DB3DC 00BC+00 2/2 0/0 0/0 .text checkUpperItemActionBoomerang__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionBoomerang() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerang__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0B58-800E0BE4 0DB498 008C+00 1/1 0/0 0/0 .text + * checkUpperItemActionBoomerangFly__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionBoomerangFly() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionBoomerangFly__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionBoomerang() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionBoomerang__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0D8C-800E0E64 0DB6CC 00D8+00 1/1 0/0 0/0 .text checkBoomerangCatchAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBoomerangCatchAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkBoomerangCatchAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0E64-800E0F10 0DB7A4 00AC+00 3/3 0/0 0/0 .text setBoomerangSight__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBoomerangSight() { + nofralloc +#include "asm/d/a/d_a_alink/setBoomerangSight__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0F10-800E0FA0 0DB850 0090+00 1/1 0/0 0/0 .text procBoomerangSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E0FA0-800E1060 0DB8E0 00C0+00 1/0 0/0 0/0 .text procBoomerangSubject__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1060-800E10F4 0DB9A0 0094+00 1/1 0/0 0/0 .text procBoomerangMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E10F4-800E11D8 0DBA34 00E4+00 1/0 0/0 0/0 .text procBoomerangMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangMove() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800E11D8-800E1248 0DBB18 0070+00 1/1 0/0 0/0 .text procBoomerangCatchInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1248-800E12E0 0DBB88 0098+00 1/0 0/0 0/0 .text procBoomerangCatch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoomerangCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procBoomerangCatch__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_bottle.inc b/src/d/a/d_a_alink_bottle.inc new file mode 100644 index 00000000000..9480a5aa8d4 --- /dev/null +++ b/src/d/a/d_a_alink_bottle.inc @@ -0,0 +1,163 @@ +/* 8010E48C-8010E52C 108DCC 00A0+00 1/1 0/0 0/0 .text bottleModelCallBack__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::bottleModelCallBack() { + nofralloc +#include "asm/d/a/d_a_alink/bottleModelCallBack__9daAlink_cFv.s" +} +#pragma pop + +/* 8010E52C-8010E568 108E6C 003C+00 1/1 0/0 0/0 .text daAlink_bottleModelCallBack__FP8J3DJointi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_bottleModelCallBack(J3DJoint* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_bottleModelCallBack__FP8J3DJointi.s" +} +#pragma pop + +/* 8010E568-8010E584 108EA8 001C+00 1/0 0/0 0/0 .text getBottleOpenAppearItem__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm s32 daAlink_c::getBottleOpenAppearItem() const { + nofralloc +#include "asm/d/a/d_a_alink/getBottleOpenAppearItem__9daAlink_cCFv.s" +} +#pragma pop + +/* 8010E584-8010E5D8 108EC4 0054+00 2/2 0/0 0/0 .text checkOilBottleItemNotGet__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkOilBottleItemNotGet(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkOilBottleItemNotGet__9daAlink_cFUs.s" +} +#pragma pop + +/* 8010E5D8-8010EAC4 108F18 04EC+00 7/7 0/0 0/0 .text setBottleModel__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBottleModel(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setBottleModel__9daAlink_cFUs.s" +} +#pragma pop + +/* 8010EAC4-8010F45C 109404 0998+00 3/3 0/0 0/0 .text commonBottleDrink__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonBottleDrink(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/commonBottleDrink__9daAlink_cFi.s" +} +#pragma pop + +/* 8010F45C-8010F54C 109D9C 00F0+00 2/2 0/0 0/0 .text makeFairy__9daAlink_cFP4cXyzUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::makeFairy(cXyz* param_0, u32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/makeFairy__9daAlink_cFP4cXyzUl.s" +} +#pragma pop + +/* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text procBottleDrinkInit__9daAlink_cFUs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleDrinkInit(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBottleDrinkInit__9daAlink_cFUs.s" +} +#pragma pop + +/* 8010F698-8010F6F4 109FD8 005C+00 1/0 0/0 0/0 .text procBottleDrink__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleDrink() { + nofralloc +#include "asm/d/a/d_a_alink/procBottleDrink__9daAlink_cFv.s" +} +#pragma pop + +/* 8010F6F4-8010F8E4 10A034 01F0+00 1/1 0/0 0/0 .text procBottleOpenInit__9daAlink_cFUs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleOpenInit(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBottleOpenInit__9daAlink_cFUs.s" +} +#pragma pop + +/* 8010F8E4-8010FC38 10A224 0354+00 1/0 0/0 0/0 .text procBottleOpen__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleOpen() { + nofralloc +#include "asm/d/a/d_a_alink/procBottleOpen__9daAlink_cFv.s" +} +#pragma pop + +/* 8010FC38-8010FF58 10A578 0320+00 4/4 0/0 0/0 .text + * procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci.s" +} +#pragma pop + +/* 8010FF58-801102D0 10A898 0378+00 1/0 0/0 0/0 .text procBottleSwing__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleSwing() { + nofralloc +#include "asm/d/a/d_a_alink/procBottleSwing__9daAlink_cFv.s" +} +#pragma pop + +/* 801102D0-80110518 10AC10 0248+00 2/2 0/0 0/0 .text procBottleGetInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleGetInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBottleGetInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80110518-80110648 10AE58 0130+00 1/0 0/0 0/0 .text procBottleGet__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBottleGet() { + nofralloc +#include "asm/d/a/d_a_alink/procBottleGet__9daAlink_cFv.s" +} +#pragma pop + +/* 80110648-80110654 10AF88 000C+00 0/0 1/0 0/0 .text Insect_Release__9dInsect_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void dInsect_c::Insect_Release() { + nofralloc +#include "asm/d/a/d_a_alink/Insect_Release__9dInsect_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_bow.inc b/src/d/a/d_a_alink_bow.inc new file mode 100644 index 00000000000..21c62374702 --- /dev/null +++ b/src/d/a/d_a_alink_bow.inc @@ -0,0 +1,314 @@ +/* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text getArrowFlyData__9daAlink_cCFPfPfi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getArrowFlyData(f32* param_0, f32* param_1, int param_2) const { + nofralloc +#include "asm/d/a/d_a_alink/getArrowFlyData__9daAlink_cCFPfPfi.s" +} +#pragma pop + +/* 800DE740-800DE750 0D9080 0010+00 0/0 0/0 1/1 .text getArrowIncAtR__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getArrowIncAtR() const { + nofralloc +#include "asm/d/a/d_a_alink/getArrowIncAtR__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE750-800DE760 0D9090 0010+00 0/0 0/0 1/1 .text getBombArrowFlyExplodeTime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getBombArrowFlyExplodeTime() const { + nofralloc +#include "asm/d/a/d_a_alink/getBombArrowFlyExplodeTime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE760-800DE770 0D90A0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMaxStart__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getArrowIncAtMaxStart() const { + nofralloc +#include "asm/d/a/d_a_alink/getArrowIncAtMaxStart__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE770-800DE780 0D90B0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMax__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getArrowIncAtMax() const { + nofralloc +#include "asm/d/a/d_a_alink/getArrowIncAtMax__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkBowAndSlingItem(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkBowAndSlingItem__9daAlink_cFi.s" +} +#pragma pop + +/* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text setSlingModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSlingModel() { + nofralloc +#include "asm/d/a/d_a_alink/setSlingModel__9daAlink_cFv.s" +} +#pragma pop + +/* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkBowCameraArrowPosP__9daAlink_cFPsPs.s" +} +#pragma pop + +/* 800DE990-800DE9B8 0D92D0 0028+00 1/0 0/0 0/0 .text checkArrowChargeEnd__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkArrowChargeEnd() const { + nofralloc +#include "asm/d/a/d_a_alink/checkArrowChargeEnd__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE9B8-800DE9E8 0D92F8 0030+00 3/3 0/0 0/0 .text checkBowReadyAnime__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBowReadyAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkBowReadyAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DE9E8-800DEA3C 0D9328 0054+00 16/16 0/0 0/0 .text checkBowAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBowAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkBowAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DEA3C-800DEAE4 0D937C 00A8+00 2/2 0/0 0/0 .text makeArrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::makeArrow() { + nofralloc +#include "asm/d/a/d_a_alink/makeArrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEAE4-800DEB8C 0D9424 00A8+00 3/3 0/0 0/0 .text deleteArrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::deleteArrow() { + nofralloc +#include "asm/d/a/d_a_alink/deleteArrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text setBowOrSlingStatus__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowOrSlingStatus() { + nofralloc +#include "asm/d/a/d_a_alink/setBowOrSlingStatus__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text changeArrowType__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeArrowType() { + nofralloc +#include "asm/d/a/d_a_alink/changeArrowType__9daAlink_cFv.s" +} +#pragma pop + +/* 800DED88-800DEE1C 0D96C8 0094+00 1/1 0/0 0/0 .text cancelBowMoveRideNotAtn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::cancelBowMoveRideNotAtn() { + nofralloc +#include "asm/d/a/d_a_alink/cancelBowMoveRideNotAtn__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEE1C-800DEEDC 0D975C 00C0+00 3/3 0/0 0/0 .text cancelBowMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::cancelBowMove() { + nofralloc +#include "asm/d/a/d_a_alink/cancelBowMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text setBowReadyAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBowReadyAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800DEFB8-800DF0BC 0D98F8 0104+00 2/2 0/0 0/0 .text setBowReloadAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowReloadAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBowReloadAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800DF0BC-800DF798 0D99FC 06DC+00 2/2 0/0 0/0 .text checkUpperItemActionBow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionBow() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionBow__9daAlink_cFv.s" +} +#pragma pop + +/* 800DF798-800DF814 0DA0D8 007C+00 1/1 0/0 0/0 .text checkUpperItemActionBowFly__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionBowFly() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionBowFly__9daAlink_cFv.s" +} +#pragma pop + +/* 800DF814-800DFAE8 0DA154 02D4+00 4/4 0/0 0/0 .text checkNextActionBow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionBow() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionBow__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFAE8-800DFBC8 0DA428 00E0+00 1/1 0/0 0/0 .text setBowModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowModel() { + nofralloc +#include "asm/d/a/d_a_alink/setBowModel__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text checkBowGrabLeftHand__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkBowGrabLeftHand() const { + nofralloc +#include "asm/d/a/d_a_alink/checkBowGrabLeftHand__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DFC28-800DFC70 0DA568 0048+00 6/6 0/0 0/0 .text setBowHangAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowHangAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBowHangAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFC70-800DFCD8 0DA5B0 0068+00 3/3 0/0 0/0 .text setBowNormalAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowNormalAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBowNormalAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFCD8-800DFD6C 0DA618 0094+00 3/3 0/0 0/0 .text setBowSight__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBowSight() { + nofralloc +#include "asm/d/a/d_a_alink/setBowSight__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFD6C-800DFDDC 0DA6AC 0070+00 1/1 0/0 0/0 .text procBowSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBowSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBowSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFDDC-800DFE3C 0DA71C 0060+00 1/0 0/0 0/0 .text procBowSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBowSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procBowSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFE3C-800DFEC0 0DA77C 0084+00 1/1 0/0 0/0 .text procBowMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBowMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBowMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DFEC0-800DFFE0 0DA800 0120+00 1/0 0/0 0/0 .text procBowMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBowMove() { + nofralloc +#include "asm/d/a/d_a_alink/procBowMove__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_canoe.inc b/src/d/a/d_a_alink_canoe.inc new file mode 100644 index 00000000000..2fd44bf4462 --- /dev/null +++ b/src/d/a/d_a_alink_canoe.inc @@ -0,0 +1,747 @@ +/* 800F3BB0-800F3BDC 0EE4F0 002C+00 1/1 0/0 2/2 .text getCanoeMaxSpeed__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeMaxSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeMaxSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3BDC-800F3BEC 0EE51C 0010+00 0/0 0/0 1/1 .text getCanoeBackMaxSpeed__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeBackMaxSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeBackMaxSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3BEC-800F3C18 0EE52C 002C+00 0/0 0/0 1/1 .text getCanoeCres__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeCres() const { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeCres__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3C18-800F3C44 0EE558 002C+00 2/2 0/0 0/0 .text getCanoeSpeedRate__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeSpeedRate() const { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeSpeedRate__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3C44-800F3CCC 0EE584 0088+00 0/0 0/0 1/1 .text getCanoeMaxRotSpeed__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeMaxRotSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeMaxRotSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3CCC-800F3CD8 0EE60C 000C+00 1/1 0/0 1/1 .text getCanoeLocalPaddleTop__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoeLocalPaddleTop() { + nofralloc +#include "asm/d/a/d_a_alink/getCanoeLocalPaddleTop__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3CD8-800F3CF8 0EE618 0020+00 3/3 0/0 0/0 .text daAlink_searchCanoe__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchCanoe__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800F3CF8-800F3D58 0EE638 0060+00 0/0 2/2 0/0 .text checkCanoeRideTandem__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCanoeRideTandem() { + nofralloc +#include "asm/d/a/d_a_alink/checkCanoeRideTandem__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3D58-800F3DA0 0EE698 0048+00 7/7 0/0 0/0 .text checkFishingRodAndLureItem__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkFishingRodAndLureItem() const { + nofralloc +#include "asm/d/a/d_a_alink/checkFishingRodAndLureItem__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3DA0-800F3DFC 0EE6E0 005C+00 4/4 0/0 0/0 .text initFishingRodHand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initFishingRodHand() { + nofralloc +#include "asm/d/a/d_a_alink/initFishingRodHand__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3DFC-800F3E4C 0EE73C 0050+00 1/1 0/0 1/1 .text getCanoePaddleMatrix__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCanoePaddleMatrix() { + nofralloc +#include "asm/d/a/d_a_alink/getCanoePaddleMatrix__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3E4C-800F3EB8 0EE78C 006C+00 0/0 0/0 4/4 .text + * checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkFishingRodGrab(fopAc_ac_c* param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800F3EB8-800F3F38 0EE7F8 0080+00 0/0 0/0 2/2 .text + * checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCanoePaddleGrab(fopAc_ac_c* param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800F3F38-800F3FC4 0EE878 008C+00 0/0 0/0 1/1 .text checkCanoeFishingRodGrabOrPut__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCanoeFishingRodGrabOrPut() const { + nofralloc +#include "asm/d/a/d_a_alink/checkCanoeFishingRodGrabOrPut__9daAlink_cCFv.s" +} +#pragma pop + +/* 800F3FC4-800F4008 0EE904 0044+00 2/2 0/0 0/0 .text initCanoeRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initCanoeRide() { + nofralloc +#include "asm/d/a/d_a_alink/initCanoeRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4008-800F40E4 0EE948 00DC+00 2/2 0/0 0/0 .text checkCanoeJumpRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkCanoeJumpRide() { + nofralloc +#include "asm/d/a/d_a_alink/checkCanoeJumpRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800F40E4-800F4140 0EEA24 005C+00 2/2 0/0 0/0 .text setArmReelAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setArmReelAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setArmReelAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4140-800F4490 0EEA80 0350+00 1/1 0/0 0/0 .text setFishingWaitAction__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFishingWaitAction() { + nofralloc +#include "asm/d/a/d_a_alink/setFishingWaitAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4490-800F4564 0EEDD0 00D4+00 3/3 0/0 0/0 .text setFishGetFace__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFishGetFace() { + nofralloc +#include "asm/d/a/d_a_alink/setFishGetFace__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4564-800F459C 0EEEA4 0038+00 3/3 0/0 0/0 .text + * setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800F459C-800F47D8 0EEEDC 023C+00 20/20 0/0 0/0 .text setSyncCanoePos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncCanoePos() { + nofralloc +#include "asm/d/a/d_a_alink/setSyncCanoePos__9daAlink_cFv.s" +} +#pragma pop + +/* 800F47D8-800F4924 0EF118 014C+00 19/19 0/0 0/0 .text canoeCommon__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::canoeCommon() { + nofralloc +#include "asm/d/a/d_a_alink/canoeCommon__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4924-800F4A50 0EF264 012C+00 10/10 0/0 0/0 .text checkNextActionCanoe__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionCanoe() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionCanoe__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4A50-800F4B90 0EF390 0140+00 2/2 0/0 0/0 .text procCanoeRideInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRideInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRideInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4B90-800F4C78 0EF4D0 00E8+00 1/0 0/0 0/0 .text procCanoeRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRide() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4C78-800F4D84 0EF5B8 010C+00 4/4 0/0 0/0 .text + * procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800F4D84-800F4DF8 0EF6C4 0074+00 1/0 0/0 0/0 .text procCanoeJumpRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeJumpRide() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeJumpRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800F4DF8-800F5048 0EF738 0250+00 2/2 0/0 0/0 .text procCanoeGetOffInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeGetOffInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeGetOffInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F5048-800F51E4 0EF988 019C+00 1/1 0/0 0/0 .text procCanoeGetOff__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeGetOff() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeGetOff__9daAlink_cFv.s" +} +#pragma pop + +/* 800F51E4-800F542C 0EFB24 0248+00 15/15 0/0 0/0 .text procCanoeWaitInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800F542C-800F571C 0EFD6C 02F0+00 1/0 0/0 0/0 .text procCanoeWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeWait() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800F571C-800F5A1C 0F005C 0300+00 3/3 0/0 0/0 .text procCanoeRowInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRowInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRowInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800F5A1C-800F5D04 0F035C 02E8+00 1/0 0/0 0/0 .text procCanoeRow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRow() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRow__9daAlink_cFv.s" +} +#pragma pop + +/* 800F5D04-800F5DB8 0F0644 00B4+00 1/1 0/0 0/0 .text procCanoePaddleShiftInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddleShiftInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddleShiftInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800F5DB8-800F5EA8 0F06F8 00F0+00 1/0 0/0 0/0 .text procCanoePaddleShift__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddleShift() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddleShift__9daAlink_cFv.s" +} +#pragma pop + +/* 800F5EA8-800F5FEC 0F07E8 0144+00 3/3 0/0 0/0 .text procCanoePaddlePutInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddlePutInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddlePutInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800F5FEC-800F6140 0F092C 0154+00 1/0 0/0 0/0 .text procCanoePaddlePut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddlePut() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddlePut__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6140-800F6188 0F0A80 0048+00 2/2 0/0 0/0 .text procCanoePaddleGrabInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddleGrabInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddleGrabInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6188-800F6320 0F0AC8 0198+00 1/0 0/0 0/0 .text procCanoePaddleGrab__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoePaddleGrab() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoePaddleGrab__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6320-800F6394 0F0C60 0074+00 1/1 0/0 0/0 .text procCanoeRodGrabInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRodGrabInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRodGrabInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6394-800F6464 0F0CD4 00D0+00 1/0 0/0 0/0 .text procCanoeRodGrab__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeRodGrab() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeRodGrab__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6464-800F659C 0F0DA4 0138+00 6/6 0/0 0/0 .text procCanoeFishingWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F659C-800F67C0 0F0EDC 0224+00 1/0 0/0 0/0 .text procCanoeFishingWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingWait() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800F67C0-800F6874 0F1100 00B4+00 1/1 0/0 0/0 .text procCanoeFishingReelInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingReelInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingReelInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6874-800F69D4 0F11B4 0160+00 1/0 0/0 0/0 .text procCanoeFishingReel__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingReel() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingReel__9daAlink_cFv.s" +} +#pragma pop + +/* 800F69D4-800F6A70 0F1314 009C+00 1/1 0/0 0/0 .text procCanoeFishingGetInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingGetInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingGetInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6A70-800F6BEC 0F13B0 017C+00 1/0 0/0 0/0 .text procCanoeFishingGet__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeFishingGet() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeFishingGet__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6BEC-800F6C30 0F152C 0044+00 1/1 0/0 0/0 .text procCanoeSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6C30-800F6D10 0F1570 00E0+00 1/0 0/0 0/0 .text procCanoeSubjectivity__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6D10-800F6D64 0F1650 0054+00 1/1 0/0 0/0 .text procCanoeBowSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBowSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBowSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6D64-800F6DF0 0F16A4 008C+00 1/0 0/0 0/0 .text procCanoeBowSubject__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBowSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBowSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6DF0-800F6E44 0F1730 0054+00 1/1 0/0 0/0 .text procCanoeBowMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBowMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBowMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6E44-800F6EB0 0F1784 006C+00 1/0 0/0 0/0 .text procCanoeBowMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBowMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBowMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6EB0-800F6EFC 0F17F0 004C+00 2/2 0/0 0/0 .text procCanoeGrabMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeGrabMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeGrabMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6EFC-800F6FA4 0F183C 00A8+00 1/0 0/0 0/0 .text procCanoeGrabMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeGrabMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeGrabMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F6FA4-800F7010 0F18E4 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangSubjectInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBoomerangSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBoomerangSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7010-800F70F0 0F1950 00E0+00 1/0 0/0 0/0 .text procCanoeBoomerangSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBoomerangSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBoomerangSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F70F0-800F715C 0F1A30 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBoomerangMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBoomerangMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F715C-800F7208 0F1A9C 00AC+00 1/0 0/0 0/0 .text procCanoeBoomerangMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBoomerangMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBoomerangMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7208-800F7274 0F1B48 006C+00 1/1 0/0 0/0 .text procCanoeHookshotSubjectInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeHookshotSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeHookshotSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7274-800F731C 0F1BB4 00A8+00 1/0 0/0 0/0 .text procCanoeHookshotSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeHookshotSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeHookshotSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F731C-800F7388 0F1C5C 006C+00 1/1 0/0 0/0 .text procCanoeHookshotMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeHookshotMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeHookshotMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7388-800F7404 0F1CC8 007C+00 1/0 0/0 0/0 .text procCanoeHookshotMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeHookshotMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeHookshotMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7404-800F7550 0F1D44 014C+00 1/1 0/0 0/0 .text procCanoeBottleDrinkInit__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBottleDrinkInit(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBottleDrinkInit__9daAlink_cFUs.s" +} +#pragma pop + +/* 800F7550-800F75BC 0F1E90 006C+00 1/0 0/0 0/0 .text procCanoeBottleDrink__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeBottleDrink() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeBottleDrink__9daAlink_cFv.s" +} +#pragma pop + +/* 800F75BC-800F7684 0F1EFC 00C8+00 1/1 0/0 0/0 .text procCanoeKandelaarPourInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeKandelaarPourInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeKandelaarPourInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7684-800F7708 0F1FC4 0084+00 1/0 0/0 0/0 .text procCanoeKandelaarPour__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCanoeKandelaarPour() { + nofralloc +#include "asm/d/a/d_a_alink/procCanoeKandelaarPour__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7708-800F7760 0F2048 0058+00 2/2 0/0 0/0 .text setGroundFishingRodActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGroundFishingRodActor() { + nofralloc +#include "asm/d/a/d_a_alink/setGroundFishingRodActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7760-800F7814 0F20A0 00B4+00 1/1 0/0 0/0 .text procFishingCastInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFishingCastInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFishingCastInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7814-800F7988 0F2154 0174+00 1/0 0/0 0/0 .text procFishingCast__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFishingCast() { + nofralloc +#include "asm/d/a/d_a_alink/procFishingCast__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7988-800F7AA8 0F22C8 0120+00 1/1 0/0 0/0 .text procFishingFoodInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFishingFoodInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFishingFoodInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7AA8-800F7C50 0F23E8 01A8+00 1/0 0/0 0/0 .text procFishingFood__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFishingFood() { + nofralloc +#include "asm/d/a/d_a_alink/procFishingFood__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_copyrod.inc b/src/d/a/d_a_alink_copyrod.inc new file mode 100644 index 00000000000..e9a7ea697c8 --- /dev/null +++ b/src/d/a/d_a_alink_copyrod.inc @@ -0,0 +1,339 @@ +/* 800E12E0-800E1310 0DBC20 0030+00 1/1 0/0 0/0 .text checkLv6BossRoom__9daAlink_cFv */ +BOOL daAlink_c::checkLv6BossRoom() { + return checkStageName("D_MN06A"); +} + +/* 800E1310-800E1320 0DBC50 0010+00 0/0 0/0 1/1 .text getCopyRodBallSpeed__9daAlink_cCFv + */ +f32 daAlink_c::getCopyRodBallSpeed() const { + return daAlinkHIO_copyRod_c0::m.mBallSpeed; +} + +/* 800E1320-800E1330 0DBC60 0010+00 0/0 0/0 1/1 .text getCopyRodBallReturnSpeed__9daAlink_cCFv */ +f32 daAlink_c::getCopyRodBallReturnSpeed() const { + return daAlinkHIO_copyRod_c0::m.mBallReturnSpeed; +} + +/* 800E1330-800E1374 0DBC70 0044+00 3/3 0/0 2/2 .text getCopyRodBallDisMax__9daAlink_cCFv + */ +f32 daAlink_c::getCopyRodBallDisMax() const { + if (checkLv6BossRoom()) { + return daAlinkHIO_copyRod_c0::m.mBossBallMaxDistance; + } + + return daAlinkHIO_copyRod_c0::m.mBallMaxDistance; +} + +/* 800E1374-800E1390 0DBCB4 001C+00 6/6 0/0 7/7 .text getCopyRodControllActor__9daAlink_cFv */ +fopAc_ac_c* daAlink_c::getCopyRodControllActor() { + if (mCopyRodAcKeep.getActor() != NULL) { + return static_cast(mCopyRodAcKeep.getActor())->getControllActor(); + } + + return NULL; +} + +/* 800E1390-800E13AC 0DBCD0 001C+00 0/0 4/4 1/1 .text getCopyRodCameraActor__9daAlink_cFv + */ +fopAc_ac_c* daAlink_c::getCopyRodCameraActor() { + if (mCopyRodAcKeep.getActor() != NULL) { + return static_cast(mCopyRodAcKeep.getActor())->getCameraActor(); + } + + return NULL; +} + +/* 800E13AC-800E1408 0DBCEC 005C+00 2/2 0/0 0/0 .text initCopyRodUpperAnimeSpeed__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/initCopyRodUpperAnimeSpeed__9daAlink_cFi.s" +} +#pragma pop + +/* void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) { + if (checkCopyRodThrowAnime()) { + if (param_1 == 0) { + mFrameCtrl2[2].setRate(); + } + f32 tmp = FLOAT_LABEL(lit_6108); + mFrameCtrl2[2].setRate(tmp); + mFrameCtrl2[2].setFrame(tmp); + + } +} */ + +/* 800E1408-800E145C 0DBD48 0054+00 2/2 0/0 0/0 .text checkForestOldCentury__9daAlink_cFv + */ +BOOL daAlink_c::checkForestOldCentury() { + return checkStageName("F_SP117") && dComIfGp_roomControl_getStayNo() == 2; +} + +/* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text checkCopyRodTopUse__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkCopyRodTopUse() { + nofralloc +#include "asm/d/a/d_a_alink/checkCopyRodTopUse__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1530-800E158C 0DBE70 005C+00 4/4 0/0 0/0 .text checkCopyRodAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCopyRodAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkCopyRodAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800E158C-800E15FC 0DBECC 0070+00 2/2 0/0 0/0 .text setCopyRodControllAnime__9daAlink_cFv */ +void daAlink_c::setCopyRodControllAnime() { + if (checkNoUpperAnime() && getCopyRodControllActor()) { + setUpperAnimeBaseSpeed(0x202, FLOAT_LABEL(lit_6108), lit_6109); + field_0x2f96 = 2; + field_0x2f97 = 5; + field_0x33e8 = FLOAT_LABEL(lit_6108); + } +} + +/* 800E15FC-800E1748 0DBF3C 014C+00 1/1 0/0 0/0 .text + * setCopyRodControllUpperSpeedRate__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCopyRodControllUpperSpeedRate() { + nofralloc +#include "asm/d/a/d_a_alink/setCopyRodControllUpperSpeedRate__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1748-800E1840 0DC088 00F8+00 2/2 0/0 0/0 .text setCopyRodModel__9daAlink_cFv */ +void daAlink_c::setCopyRodModel() { + JKRHeap* heap = setItemHeap(); + J3DModelData* mdl_data = loadAramBmd(0x315, 0x5400); + mHeldItemModel = initModel(mdl_data, 0x80000, 0x1000000); + field_0x0724 = loadAramItemBrk(0x323, mHeldItemModel); + mDoExt_setCurrentHeap(heap); + field_0x0724->setFrame(FLOAT_LABEL(lit_6108)); + field_0x2f94 = 2; + field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); + field_0x122C[0].SetAtAtp(0); + field_0x122C[0].SetAtSe(20); + field_0x122C[0].SetAtHitMark(1); + field_0x122C[0].OnAtSetBit(); + field_0x122C[0].SetAtHitCallback(NULL); + field_0x122C[0].SetAtMtrl(0); + mHeldItemModel->i_setBaseTRMtx(field_0x0650->i_getAnmMtx(field_0x30c0)); + mHeldItemModel->calc(); +} + +/* 800E1840-800E191C 0DC180 00DC+00 2/2 0/0 0/0 .text setCopyRodReadyAnime__9daAlink_cFv + */ +// regalloc +#ifdef NONMATCHING +void daAlink_c::setCopyRodReadyAnime() { + f32 tmp; + if (i_checkAttentionLock()) { + tmp = daAlinkHIO_boom_c0::m.valc; + } else { + tmp = FLOAT_LABEL(lit_6108); + } + + setUpperAnimeBaseSpeed(0x54, tmp, lit_6109); + if (checkCopyRodTopUse()) { + seStartSwordCut(Z2SE_AL_COPYROD_READY); + } else { + seStartSwordCut(Z2SE_AL_COPYROD_READY_OFF); + } + field_0x122C[0].SetR(lit_8676); + field_0x122C[0].SetAtType(0x1000000); + initLockAt(); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCopyRodReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setCopyRodReadyAnime__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text throwCopyRod__9daAlink_cFv */ +void daAlink_c::throwCopyRod() { + daCrod_c* copy_rod = static_cast(mItemAcKeep.getActor()); + i_onNoResetFlg1(FLG1_UNK_10000); + + if (checkCopyRodTopUse()) { + copy_rod->setThrow(); + mCopyRodAcKeep = mItemAcKeep; + i_onNoResetFlg3(COPY_ROD_THROW_AFTER); + mItemAcKeep.clearData(); + } + dComIfGp_clearPlayerStatus0(0, 0x80); + mFastShotTime = -1; + voiceStart(Z2SE_AL_V_ATTACK_S); + seStartSwordCut(Z2SE_AL_COPYROD_SWING); + + if (mLinkAcch.ChkGroundHit()) { + if (checkZeroSpeedF()) { + field_0x2f98 = 3; + procAtnActorWaitInit(); + } else { + procAtnActorMoveInit(); + } + field_0x2060->initOldFrameMorf(FLOAT_LABEL(lit_6108), 0, 35); + } +} + +/* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text returnCopyRod__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::returnCopyRod() { + nofralloc +#include "asm/d/a/d_a_alink/returnCopyRod__9daAlink_cFv.s" +} +#pragma pop + +/* void daAlink_c::returnCopyRod() { + i_offNoResetFlg3(COPY_ROD_THROW_AFTER); + + if (mEquipItem == 0x46) { + mItemAcKeep = mCopyRodAcKeep; + i_onNoResetFlg0(FLG0_UNK_20); + cXyz tmp(0, 1, 0); + dComIfGp_getVibration().StartShock(1, 1, tmp); + } + mCopyRodAcKeep.clearData(); +} */ + +/* 800E1ADC-800E1BB4 0DC41C 00D8+00 2/2 0/0 0/0 .text checkUpperItemActionCopyRod__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionCopyRod() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRod__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1BB4-800E1C44 0DC4F4 0090+00 1/1 0/0 0/0 .text checkUpperItemActionCopyRodFly__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionCopyRodFly() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionCopyRodFly__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1C44-800E1D6C 0DC584 0128+00 2/2 0/0 0/0 .text checkNextActionCopyRod__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionCopyRod() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionCopyRod__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1D6C-800E1E20 0DC6AC 00B4+00 1/1 0/0 0/0 .text setCopyRodSight__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCopyRodSight() { + nofralloc +#include "asm/d/a/d_a_alink/setCopyRodSight__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1E20-800E1EB0 0DC760 0090+00 1/1 0/0 0/0 .text procCopyRodSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1EB0-800E1F68 0DC7F0 00B8+00 1/0 0/0 0/0 .text procCopyRodSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1F68-800E1FFC 0DC8A8 0094+00 1/1 0/0 0/0 .text procCopyRodMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E1FFC-800E20C8 0DC93C 00CC+00 1/0 0/0 0/0 .text procCopyRodMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800E20C8-800E21FC 0DCA08 0134+00 1/1 0/0 0/0 .text procCopyRodSwingInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodSwingInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodSwingInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E21FC-800E2308 0DCB3C 010C+00 1/0 0/0 0/0 .text procCopyRodSwing__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodSwing() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodSwing__9daAlink_cFv.s" +} +#pragma pop + +/* 800E2308-800E23A4 0DCC48 009C+00 1/0 0/0 0/0 .text procCopyRodReviveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodReviveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodReviveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E23A4-800E23FC 0DCCE4 0058+00 1/0 0/0 0/0 .text procCopyRodRevive__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCopyRodRevive() { + nofralloc +#include "asm/d/a/d_a_alink/procCopyRodRevive__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_crawl.inc b/src/d/a/d_a_alink_crawl.inc new file mode 100644 index 00000000000..8ca8b73d66e --- /dev/null +++ b/src/d/a/d_a_alink_crawl.inc @@ -0,0 +1,238 @@ +/* 800F7C50-800F7C74 0F2590 0024+00 2/2 0/0 0/0 .text getCrawlMoveAnmSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCrawlMoveAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getCrawlMoveAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7C74-800F7CE8 0F25B4 0074+00 2/2 0/0 0/0 .text getCrawlMoveSpeed__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCrawlMoveSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getCrawlMoveSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7CE8-800F7E48 0F2628 0160+00 4/4 0/0 0/0 .text setCrawlMoveDirectionArrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCrawlMoveDirectionArrow() { + nofralloc +#include "asm/d/a/d_a_alink/setCrawlMoveDirectionArrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800F7E48-800F81C0 0F2788 0378+00 2/2 0/0 0/0 .text changeCrawlAutoMoveProc__9daAlink_cFP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeCrawlAutoMoveProc(cXyz* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeCrawlAutoMoveProc__9daAlink_cFP4cXyz.s" +} +#pragma pop + +/* 800F81C0-800F85C0 0F2B00 0400+00 2/2 0/0 0/0 .text + * getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3, + int param_4, u8* param_5) { + nofralloc +#include "asm/d/a/d_a_alink/getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc.s" +} +#pragma pop + +/* 800F85C0-800F8700 0F2F00 0140+00 2/2 0/0 0/0 .text crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi.s" +} +#pragma pop + +/* 800F8700-800F88F8 0F3040 01F8+00 2/2 0/0 0/0 .text + * checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2, cXyz* param_3, + s16* param_4, s16* param_5) { + nofralloc +#include "asm/d/a/d_a_alink/checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs.s" +} +#pragma pop + +/* 800F88F8-800F89E0 0F3238 00E8+00 6/6 0/0 0/0 .text decideCrawlDoStatus__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::decideCrawlDoStatus() { + nofralloc +#include "asm/d/a/d_a_alink/decideCrawlDoStatus__9daAlink_cFv.s" +} +#pragma pop + +/* 800F89E0-800F8A50 0F3320 0070+00 3/3 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNotCrawlStand(cXyz* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyz.s" +} +#pragma pop + +/* 800F8A50-800F8B00 0F3390 00B0+00 2/2 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz.s" +} +#pragma pop + +/* 800F8B00-800F8D04 0F3440 0204+00 2/2 0/0 0/0 .text + * checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCrawlInHoll(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3) { + nofralloc +#include "asm/d/a/d_a_alink/checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi.s" +} +#pragma pop + +/* 800F8D04-800F8DBC 0F3644 00B8+00 2/2 0/0 0/0 .text setCrawlMoveHoll__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCrawlMoveHoll() { + nofralloc +#include "asm/d/a/d_a_alink/setCrawlMoveHoll__9daAlink_cFv.s" +} +#pragma pop + +/* 800F8DBC-800F8F08 0F36FC 014C+00 1/1 0/0 0/0 .text setCrawlMoveAngle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCrawlMoveAngle() { + nofralloc +#include "asm/d/a/d_a_alink/setCrawlMoveAngle__9daAlink_cFv.s" +} +#pragma pop + +/* 800F8F08-800F8F84 0F3848 007C+00 6/6 0/0 0/0 .text stopHalfMoveAnime__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::stopHalfMoveAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/stopHalfMoveAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 800F8F84-800F9210 0F38C4 028C+00 2/2 0/0 0/0 .text setCrawlAutoMoveAimPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCrawlAutoMoveAimPos() { + nofralloc +#include "asm/d/a/d_a_alink/setCrawlAutoMoveAimPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800F9210-800F9384 0F3B50 0174+00 2/2 0/0 0/0 .text procCrawlStartInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlStartInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlStartInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F9384-800F9474 0F3CC4 00F0+00 1/0 0/0 0/0 .text procCrawlStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlStart() { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800F9474-800F95B8 0F3DB4 0144+00 3/3 0/0 0/0 .text procCrawlMoveInit__9daAlink_cFss */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlMoveInit__9daAlink_cFss.s" +} +#pragma pop + +/* 800F95B8-800F99FC 0F3EF8 0444+00 1/0 0/0 0/0 .text procCrawlMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F99FC-800F9ABC 0F433C 00C0+00 1/1 0/0 0/0 .text procCrawlAutoMoveInit__9daAlink_cFiP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlAutoMoveInit__9daAlink_cFiP4cXyz.s" +} +#pragma pop + +/* 800F9ABC-800F9D7C 0F43FC 02C0+00 1/0 0/0 0/0 .text procCrawlAutoMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlAutoMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlAutoMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F9D7C-800F9F30 0F46BC 01B4+00 1/1 0/0 0/0 .text procCrawlEndInit__9daAlink_cFiss */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlEndInit__9daAlink_cFiss.s" +} +#pragma pop + +/* 800F9F30-800F9FDC 0F4870 00AC+00 1/0 0/0 0/0 .text procCrawlEnd__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrawlEnd() { + nofralloc +#include "asm/d/a/d_a_alink/procCrawlEnd__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_cut.inc b/src/d/a/d_a_alink_cut.inc new file mode 100644 index 00000000000..b791104c762 --- /dev/null +++ b/src/d/a/d_a_alink_cut.inc @@ -0,0 +1,985 @@ +/* 800D0D38-800D0E08 0CB678 00D0+00 1/1 0/0 0/0 .text daAlink_searchNightStalker__FP10fopAc_ac_cPv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchNightStalker(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchNightStalker__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800D0E08-800D0E98 0CB748 0090+00 1/1 0/0 0/0 .text checkLightSwordMtrl__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkLightSwordMtrl() { + nofralloc +#include "asm/d/a/d_a_alink/checkLightSwordMtrl__9daAlink_cFv.s" +} +#pragma pop + +/* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text checkSwordEquipAnime__9daAlink_cCFv + */ +BOOL daAlink_c::checkSwordEquipAnime() const { + return !i_checkNoResetFlg0(FLG0_UNK_1000000) && + (checkUpperAnime(0x255) || checkUpperAnime(0x261)); +} + +/* 800D0ECC-800D0EFC 0CB80C 0030+00 8/8 0/0 0/0 .text checkCutDashAnime__9daAlink_cCFv */ +BOOL daAlink_c::checkCutDashAnime() const { + return checkUpperAnime(0x80) || checkUpperAnime(0x82) || checkUpperAnime(0x81); +} + +/* 800D0EFC-800D0F5C 0CB83C 0060+00 1/1 0/0 0/0 .text + * checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf */ +BOOL daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf& obj) { + return obj.ChkAtHit() && checkEnemyGroup(obj.GetAtHitAc()); +} + +/* 800D0F5C-800D0F90 0CB89C 0034+00 6/6 0/0 0/0 .text getSwordAtType__9daAlink_cFv */ +u32 daAlink_c::getSwordAtType() { + return checkMasterSwordEquip() ? 0x4000002 : 2; +} + +/* 800D0F90-800D102C 0CB8D0 009C+00 3/3 0/0 0/0 .text initCutTurnAt__9daAlink_cFfi */ +void daAlink_c::initCutTurnAt(f32 param_0, int param_1) { + field_0xFB8.ResetAtHit(); + field_0xFB8.OnAtSetBit(); + field_0xFB8.SetAtType(getSwordAtType()); + field_0xFB8.SetAtHitMark(3); + field_0xFB8.SetAtSe(1); + field_0xFB8.SetAtAtp(param_1); + u8 mtrl; + if (!i_checkNoResetFlg3(FLG3_UNK_100000)) { + mtrl = 0; + } else { + mtrl = 4; + } + field_0xFB8.SetAtMtrl(mtrl); + field_0xFB8.SetR(param_0); + field_0x2fd0 = 1; +} + +/* 800D102C-800D1088 0CB96C 005C+00 2/2 0/0 0/0 .text checkCutFinishJumpUp__9daAlink_cFv + */ +#ifdef NONMATCHING +bool daAlink_c::checkCutFinishJumpUp() { + return checkCutBackState() && (!checkNotBattleStage() && swordSwingTrigger()); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkCutFinishJumpUp() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutFinishJumpUp__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800D1088-800D10E0 0CB9C8 0058+00 2/2 0/0 0/0 .text changeCutFast__9daAlink_cFv */ +void daAlink_c::changeCutFast() { + deleteEquipItem(0, 0); + setSwordModel(); + mComboCutCount = 3; + checkCutAction(); + i_onNoResetFlg0(FLG0_UNK_80000); +} + +/* 800D10E0-800D1268 0CBA20 0188+00 1/1 0/0 0/0 .text checkCutFastReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutFastReady() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutFastReady__9daAlink_cFv.s" +} +#pragma pop + +/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text setSwordModel__9daAlink_cFv */ +void daAlink_c::setSwordModel() { + field_0x2fde = 0xFF; + mEquipItem = EQUIP_SWORD; + + mDoAud_bgmSetSwordUsing(1); + field_0x2f94 = 0; + + if (checkWoodSwordEquip()) { + mSwordModel->getModelData()->getMaterialNodePointer(1)->getShape()->hide(); + } else { + mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->show(); + } +} + +/* 800D1310-800D13AC 0CBC50 009C+00 2/2 0/0 0/0 .text offSwordModel__9daAlink_cFv */ +void daAlink_c::offSwordModel() { + mDoAud_bgmSetSwordUsing(0); + + if (mSwordModel == field_0x0668 || mSwordModel == field_0x0660) { + mSwordModel->getModelData()->getMaterialNodePointer(0)->getShape()->hide(); + } else if (mSwordModel == field_0x0670) { + field_0x0670->getModelData()->getMaterialNodePointer(1)->getShape()->show(); + } +} + +/* 800D13AC-800D13E4 0CBCEC 0038+00 1/1 0/0 0/0 .text checkCutTypeNoBlur__9daAlink_cCFv + */ +BOOL daAlink_c::checkCutTypeNoBlur() const { + return mCutType == TYPE_CUT_STAB || mCutType == TYPE_CUT_STAB_COMBO || + mCutType == TYPE_CUT_STAB_FINISH || i_checkNoResetFlg0(UNDER_WATER_MOVEMENT); +} + +/* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text checkCutTurnInput__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkCutTurnInput() const { + nofralloc +#include "asm/d/a/d_a_alink/checkCutTurnInput__9daAlink_cCFv.s" +} +#pragma pop + +/* 800D1424-800D1430 0CBD64 000C+00 7/7 0/0 0/0 .text getCutTurnDirection__9daAlink_cCFv + */ +int daAlink_c::getCutTurnDirection() const { + return field_0x3180 < 0; +} + +/* 800D1430-800D1454 0CBD70 0024+00 17/17 0/0 0/0 .text resetCombo__9daAlink_cFi */ +void daAlink_c::resetCombo(int param_0) { + mComboCutCount = 0; + i_offNoResetFlg0(FLG0_UNK_8000); + if (param_0 != 0) { + mRunCutComboCount = 0; + } +} + +/* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text checkComboCnt__9daAlink_cFv */ +// something with i_checkAttentionLock +#ifdef NONMATCHING +void daAlink_c::checkComboCnt() { + if ((mEquipItem == EQUIP_SWORD && mComboCutCount == 2) && + (i_checkAttentionLock() && (field_0x122C[0].ChkAtHit() || field_0x122C[1].ChkAtHit() || + field_0x122C[2].ChkAtHit()))) { + i_onNoResetFlg0(FLG0_UNK_8000); + } + if (field_0x307e > 0) { + field_0x307e--; + } else { + resetCombo(1); + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkComboCnt() { + nofralloc +#include "asm/d/a/d_a_alink/checkComboCnt__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text setCutType__9daAlink_cFUc */ +void daAlink_c::setCutType(u8 type) { + mCutType = type; + i_offResetFlg0(RFLG0_UNK_8000000); +} + +/* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text + * setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCylAtParam(u32 param_0, dCcG_At_Spl param_1, u8 param_2, u8 param_3, + int param_4, f32 param_5, f32 param_6) { + nofralloc +#include "asm/d/a/d_a_alink/setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff.s" +} +#pragma pop + +/* 800D1688-800D1788 0CBFC8 0100+00 9/9 0/0 0/0 .text + * setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordAtParam(dCcG_At_Spl param_0, u8 param_1, u8 param_2, int param_3, + f32 param_4, f32 param_5) { + nofralloc +#include "asm/d/a/d_a_alink/setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff.s" +} +#pragma pop + +/* 800D1788-800D17EC 0CC0C8 0064+00 1/1 0/0 1/1 .text + * notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c */ +bool daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) { + if (p_actor != NULL && fopAcM_GetGroup(p_actor) == 4) { + s16 name = fopAcM_GetName(p_actor); + if (!checkSpecialNpc(p_actor) && name != 0x108 && name != 0x240) { + return true; + } + } + return false; +} + +/* 800D17EC-800D1920 0CC12C 0134+00 4/4 0/0 0/0 .text + * setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordHitVibration(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800D1920-800D1978 0CC260 0058+00 3/3 0/0 0/0 .text checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf + */ +BOOL daAlink_c::checkAtShieldHit(dCcD_GObjInf& param_0) { + return param_0.ChkAtHit() && param_0.ChkAtShieldHit(); +} + +/* 800D1978-800D19C8 0CC2B8 0050+00 1/1 0/0 0/0 .text + * checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf */ +bool daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) { + param_0->GetAtHitAc(); + return checkAtShieldHit(*param_0) ? true : false; +} + +/* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text + * changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" +} +#pragma pop + +/* 800D1E1C-800D20B4 0CC75C 0298+00 4/4 0/0 0/0 .text setCutDash__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCutDash(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setCutDash__9daAlink_cFii.s" +} +#pragma pop + +/* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text checkForceSwordSwing__9daAlink_cFv + */ +BOOL daAlink_c::checkForceSwordSwing() { + return mEquipItem == EQUIP_SWORD && swordSwingTrigger(); +} + +/* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text setComboReserb__9daAlink_cFv */ +void daAlink_c::setComboReserb() { + if (i_checkWolf()) { + field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration; + } else { + field_0x307e = daAlinkHIO_cut_c0::m.mComboDuration; + } + if (mComboCutCount != 4 && field_0x2fce == 0 && swordSwingTrigger()) { + i_onNoResetFlg2(UNK_FLG2_2); + } +} + +/* 800D2188-800D21D0 0CCAC8 0048+00 1/1 0/0 0/0 .text checkComboReserb__9daAlink_cFv */ +BOOL daAlink_c::checkComboReserb() { + return i_checkNoResetFlg2(UNK_FLG2_2) && !checkEventRun(); +} + +/* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text commonCutAction__9daAlink_cFv */ +bool daAlink_c::commonCutAction() { + if (mComboCutCount == 4) { + resetCombo(1); + } + + if (i_dComIfGp_getDoStatus() == 4) { + setDoStatus(0); + } + mComboCutCount++; + + if (i_checkReinRide()) { + procHorseCutInit(); + if (mComboCutCount > 1) { + mComboCutCount = 1; + } + return true; + } else { + return false; + } +} + +/* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text setSwordVoiceSe__9daAlink_cFUl */ +void daAlink_c::setSwordVoiceSe(u32 sfx_id) { + if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + voiceStart(sfx_id); + } +} + +/* 800D22BC-800D2304 0CCBFC 0048+00 3/3 0/0 0/0 .text setSwordChargeVoiceSe__9daAlink_cFv + */ +void daAlink_c::setSwordChargeVoiceSe() { + if (mCommonCounter != 0) { + mCommonCounter--; + if (mCommonCounter == 0) { + setSwordVoiceSe(Z2SE_AL_V_TAME); + } + } +} + +/* 800D2304-800D2368 0CCC44 0064+00 3/3 0/0 0/0 .text setSwordComboVoice__9daAlink_cFv */ +void daAlink_c::setSwordComboVoice() { + if (mProcID == PROC_CUT_JUMP || mComboCutCount == 4) { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_L); + } else if (mComboCutCount == 1) { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_S); + } else { + setSwordVoiceSe(Z2SE_AL_V_ATTACK_M); + } +} + +/* 800D2368-800D23C0 0CCCA8 0058+00 3/3 0/0 0/0 .text checkCutTurnInputTrigger__9daAlink_cFv */ +bool daAlink_c::checkCutTurnInputTrigger() { + return swordSwingTrigger() && checkCutTurnInput(); +} + +/* 800D23C0-800D2684 0CCD00 02C4+00 7/7 0/0 0/0 .text checkCutAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2684-800D26EC 0CCFC4 0068+00 9/9 0/0 0/0 .text checkCutTurnCharge__9daAlink_cFv */ +void daAlink_c::checkCutTurnCharge() { + if (swordButton()) { + if (field_0x3012 < 3) { + field_0x3012++; + } else { + i_onResetFlg0(RFLG0_UNK_40); + } + } else { + field_0x3012 = 0; + } +} + +/* 800D26EC-800D2760 0CD02C 0074+00 4/4 0/0 0/0 .text getCutDirection__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getCutDirection() { + nofralloc +#include "asm/d/a/d_a_alink/getCutDirection__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2760-800D27E4 0CD0A0 0084+00 4/4 0/0 0/0 .text checkCutCancelNextMode__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutCancelNextMode(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkCutCancelNextMode__9daAlink_cFi.s" +} +#pragma pop + +/* 800D27E4-800D2890 0CD124 00AC+00 4/4 0/0 0/0 .text checkDoCutAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDoCutAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkDoCutAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text checkCutBackState__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkCutBackState() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutBackState__9daAlink_cFv.s" +} +#pragma pop + +/* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text checkCutHeadState__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutHeadState() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutHeadState__9daAlink_cFv.s" +} +#pragma pop + +/* 800D29D4-800D2ABC 0CD314 00E8+00 4/4 0/0 0/0 .text checkDownAttackState__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDownAttackState() { + nofralloc +#include "asm/d/a/d_a_alink/checkDownAttackState__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2ABC-800D2B88 0CD3FC 00CC+00 1/1 1/1 0/0 .text checkCutLargeTurnState__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutLargeTurnState() const { + nofralloc +#include "asm/d/a/d_a_alink/checkCutLargeTurnState__9daAlink_cCFv.s" +} +#pragma pop + +/* 800D2B88-800D2BFC 0CD4C8 0074+00 2/2 0/0 0/0 .text cancelCutCharge__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::cancelCutCharge() { + nofralloc +#include "asm/d/a/d_a_alink/cancelCutCharge__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2BFC-800D2C54 0CD53C 0058+00 3/3 0/0 0/0 .text initCutAtnActorSearch__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initCutAtnActorSearch() { + nofralloc +#include "asm/d/a/d_a_alink/initCutAtnActorSearch__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutAtnActorChange() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutAtnActorChange__9daAlink_cFv.s" +} +#pragma pop + +/* 800D2C78-800D2F58 0CD5B8 02E0+00 2/2 0/0 0/0 .text setCutJumpSpeed__9daAlink_cFi */ +// literals, and small issue with JMAFastSqrt instructions +#ifdef NONMATCHING +void daAlink_c::setCutJumpSpeed(int cut_type) { + if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } else if (checkHeavyStateOn(1, 1)) { + mSpeed.y *= 1.35f; + } + + // cut_type 0 = standing jump attack + if (mTargetedActor != NULL && cut_type == 0) { + mCollisionRot.y = cLib_targetAngleY(&mCurrent.mPosition, &mTargetedActor->mEyePos); + cXyz targetPos(mTargetedActor->mEyePos.x - (cM_ssin(mCollisionRot.y) * 70.0f), + mTargetedActor->mEyePos.y + 50.0f, + mTargetedActor->mEyePos.z - (cM_scos(mCollisionRot.y) * 70.0f)); + + if (fopAcM_gc_c::gndCheck(&targetPos)) { + targetPos.y = fopAcM_gc_c::getGroundY(); + } else { + targetPos.y = mTargetedActor->mEyePos.y; + } + + f32 dvar12 = mSpeed.y + mGravity; + f32 dvar10 = 1.0f / mGravity; + f32 fvar1 = targetPos.y - (mCurrent.mPosition.y - (dvar10 * (dvar12 * dvar12) * 0.5f)); + + if (fvar1 > 0.0f) { + fvar1 = 0.0f; + } + f32 sqrt = JMAFastSqrt(fvar1 * 2.0f * dvar10); + f32 speedDiv = sqrt - (dvar12 * dvar10); + f32 squareDist = mCurrent.mPosition.absXZ(targetPos); + + if (squareDist > 500.0f) { + squareDist = 500.0f; + } + mNormalSpeed = squareDist / speedDiv; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCutJumpSpeed(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setCutJumpSpeed__9daAlink_cFi.s" +} +#pragma pop +#endif + +/* 800D2F58-800D31B8 0CD898 0260+00 3/3 0/0 0/0 .text procCutNormalInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutNormalInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutNormalInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800D31B8-800D34D8 0CDAF8 0320+00 1/0 0/0 0/0 .text procCutNormal__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutNormal() { + nofralloc +#include "asm/d/a/d_a_alink/procCutNormal__9daAlink_cFv.s" +} +#pragma pop + +/* 800D34D8-800D382C 0CDE18 0354+00 4/4 0/0 0/0 .text procCutFinishInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinishInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinishInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800D382C-800D3ADC 0CE16C 02B0+00 1/0 0/0 0/0 .text procCutFinish__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinish() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinish__9daAlink_cFv.s" +} +#pragma pop + +/* 800D3ADC-800D3CCC 0CE41C 01F0+00 2/2 0/0 0/0 .text procCutFinishJumpUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinishJumpUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinishJumpUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D3CCC-800D3DD8 0CE60C 010C+00 1/0 0/0 0/0 .text procCutFinishJumpUp__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinishJumpUp() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinishJumpUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800D3DD8-800D3ECC 0CE718 00F4+00 1/1 0/0 0/0 .text procCutFinishJumpUpLandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinishJumpUpLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinishJumpUpLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D3ECC-800D4068 0CE80C 019C+00 1/0 0/0 0/0 .text procCutFinishJumpUpLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFinishJumpUpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFinishJumpUpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800D4068-800D41FC 0CE9A8 0194+00 2/2 0/0 0/0 .text + * procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM.s" +} +#pragma pop + +/* 800D41FC-800D42FC 0CEB3C 0100+00 1/0 0/0 0/0 .text procCutReverse__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutReverse() { + nofralloc +#include "asm/d/a/d_a_alink/procCutReverse__9daAlink_cFv.s" +} +#pragma pop + +/* 800D42FC-800D43F8 0CEC3C 00FC+00 2/2 0/0 0/0 .text procCutJumpInit__9daAlink_cFi */ +bool daAlink_c::procCutJumpInit(int jump_type) { + commonProcInit(PROC_CUT_JUMP); + setSingleAnimeParam(ANM_CUT_JUMP, &daAlinkHIO_cutJump_c0::m.mCutAnm); + if (jump_type != 0) { + mNormalSpeed = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedH; + mSpeed.y = daAlinkHIO_cutJump_c0::m.mAirJumpSpeedV; + } else { + mNormalSpeed = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedH; + mSpeed.y = daAlinkHIO_cutJump_c0::m.mBaseJumpSpeedV; + } + setCutJumpSpeed(jump_type); + mCurrent.mAngle.y = mCollisionRot.y; + setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 3, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setCutType(TYPE_CUT_JUMP); + setSwordComboVoice(); + dComIfGp_setPlayerStatus0(0, 0x8000); + field_0x3198 = 2; + return true; +} + +/* 800D43F8-800D452C 0CED38 0134+00 1/0 0/0 0/0 .text procCutJump__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::procCutJump() { + if (mCurrent.mAngle.y == mCollisionRot.y && changeCutReverseProc(ANM_CUT_JUMP)) { + mCurrent.mAngle.y += 0x8000; + mNormalSpeed = 27.0f; + cXyz xyz(0.0f, 1.0f, 0.0f); + dComIfGp_getVibration().StartShock(5, 31, xyz); + } else if (mCurrent.mAngle.y != mCollisionRot.y) { + cLib_chaseF(&mNormalSpeed, 5.0f, 1.0f); + } + + if (checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + if (mLinkAcch.ChkGroundHit()) { + procCutJumpLandInit(field_0x3198); + } else if (mFrameCtrl1[0].getFrame() >= daAlinkHIO_cutJump_c0::m.mStartAttackFrame) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_L); + } + i_onResetFlg0(RFLG0_UNK_2); + } + return true; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::procCutJump() { + nofralloc +#include "asm/d/a/d_a_alink/procCutJump__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text procCutJumpLandInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutJumpLandInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutJumpLandInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800D4684-800D47DC 0CEFC4 0158+00 1/0 0/0 0/0 .text procCutJumpLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutJumpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procCutJumpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800D47DC-800D4A74 0CF11C 0298+00 7/7 0/0 0/0 .text procCutTurnInit__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurnInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurnInit__9daAlink_cFii.s" +} +#pragma pop + +/* 800D4A74-800D4C68 0CF3B4 01F4+00 1/0 0/0 0/0 .text procCutTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 800D4C68-800D4D04 0CF5A8 009C+00 3/3 0/0 0/0 .text procCutTurnChargeInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurnChargeInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurnChargeInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D4D04-800D4DDC 0CF644 00D8+00 1/0 0/0 0/0 .text procCutTurnCharge__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurnCharge() { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurnCharge__9daAlink_cFv.s" +} +#pragma pop + +/* 800D4DDC-800D4EFC 0CF71C 0120+00 3/3 0/0 0/0 .text procCutTurnMoveInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurnMoveInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurnMoveInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800D4EFC-800D53C8 0CF83C 04CC+00 1/0 0/0 0/0 .text procCutTurnMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutTurnMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCutTurnMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800D53C8-800D57F8 0CFD08 0430+00 2/1 0/0 0/0 .text procCutDownInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutDownInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutDownInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D57F8-800D58A0 0D0138 00A8+00 1/0 0/0 0/0 .text procCutDown__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutDown() { + nofralloc +#include "asm/d/a/d_a_alink/procCutDown__9daAlink_cFv.s" +} +#pragma pop + +/* 800D58A0-800D5ADC 0D01E0 023C+00 1/1 0/0 0/0 .text + * procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutDownLandInit(fopEn_enemy_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c.s" +} +#pragma pop + +/* 800D5ADC-800D5C88 0D041C 01AC+00 1/0 0/0 0/0 .text procCutDownLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutDownLand() { + nofralloc +#include "asm/d/a/d_a_alink/procCutDownLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800D5C88-800D5FC8 0D05C8 0340+00 2/1 0/0 0/0 .text procCutHeadInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutHeadInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutHeadInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D5FC8-800D6130 0D0908 0168+00 1/0 0/0 0/0 .text procCutHead__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutHead() { + nofralloc +#include "asm/d/a/d_a_alink/procCutHead__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6130-800D618C 0D0A70 005C+00 1/1 0/0 0/0 .text procCutHeadLandInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutHeadLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutHeadLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D618C-800D6238 0D0ACC 00AC+00 1/0 0/0 0/0 .text procCutHeadLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutHeadLand() { + nofralloc +#include "asm/d/a/d_a_alink/procCutHeadLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6238-800D62A0 0D0B78 0068+00 2/2 0/0 0/0 .text procCutLargeJumpChargeInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutLargeJumpChargeInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutLargeJumpChargeInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D62A0-800D6374 0D0BE0 00D4+00 1/0 0/0 0/0 .text procCutLargeJumpCharge__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutLargeJumpCharge() { + nofralloc +#include "asm/d/a/d_a_alink/procCutLargeJumpCharge__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6374-800D6484 0D0CB4 0110+00 2/1 0/0 0/0 .text procCutLargeJumpInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutLargeJumpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutLargeJumpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6484-800D66C0 0D0DC4 023C+00 1/0 0/0 0/0 .text procCutLargeJump__9daAlink_cFv */ +bool daAlink_c::procCutLargeJump() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + + if (field_0x3010 != 0) { + field_0x2f99 = 4; + } + + if (i_checkModeFlg(2) && checkCutTurnInput()) { + field_0x3198 = getCutTurnDirection(); + } + + if (mCommonCounter == 0) { + if (ctrl->checkAnmEnd()) { + field_0x2f99 = 12; + setSingleAnimeParam(ANM_CUT_JUMP_LARGE, &daAlinkHIO_cutLargeJump_c0::m.mCutAnm); + mCommonCounter = 1; + setSwordVoiceSe(Z2SE_AL_V_JUMP_ATTACK_L_2); + } else { + if (ctrl->getFrame() >= lit_7307) { + field_0x3010 = 1; + } + + if (!i_checkModeFlg(2) && ctrl->getFrame() >= lit_7808) { + setJumpMode(); + mNormalSpeed = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedH; + mSpeed.y = daAlinkHIO_cutLargeJump_c0::m.mCutSpeedV; + setCutJumpSpeed(0); + } + + if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mJumpAttackStartF && + ctrl->getFrame() < daAlinkHIO_cutLargeJump_c0::m.mJumpAttackEndF) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); + } + i_onResetFlg0(2); + } + } + } else { + if (field_0x300e != 0) { + field_0x300e--; + if (field_0x300e == 0) { + setSwordAtParam(dCcG_At_Spl_UNK_01, 3, 1, 4, daAlinkHIO_cut_c0::m.mSwordLength, + daAlinkHIO_cut_c0::m.mSwordRadius); + setCutType(TYPE_CUT_LARGE_JUMP); + } + } + + if (mLinkAcch.ChkGroundHit()) { + procCutLargeJumpLandInit(field_0x3198); + } else { + if (ctrl->getFrame() >= daAlinkHIO_cutLargeJump_c0::m.mCutInitF) { + if (!i_checkNoResetFlg0(FLG0_UNK_40)) { + seStartSwordCut(Z2SE_AL_SWORD_SWING_S); + } + i_onResetFlg0(2); + } + } + } + return true; +} + +/* 800D66C0-800D67FC 0D1000 013C+00 1/1 0/0 0/0 .text procCutLargeJumpLandInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutLargeJumpLandInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCutLargeJumpLandInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800D67FC-800D698C 0D113C 0190+00 1/0 0/0 0/0 .text procCutLargeJumpLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutLargeJumpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procCutLargeJumpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800D698C-800D6A38 0D12CC 00AC+00 2/1 0/0 0/0 .text procSwordUnequipSpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordUnequipSpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordUnequipSpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6A38-800D6D94 0D1378 035C+00 1/0 0/0 0/0 .text procSwordUnequipSp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordUnequipSp() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordUnequipSp__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_damage.inc b/src/d/a/d_a_alink_damage.inc new file mode 100644 index 00000000000..21a74d5e902 --- /dev/null +++ b/src/d/a/d_a_alink_damage.inc @@ -0,0 +1,559 @@ +/* 800D6D94-800D6DA4 0D16D4 0010+00 0/0 0/0 2/2 .text getFreezeR__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getFreezeR() const { + nofralloc +#include "asm/d/a/d_a_alink/getFreezeR__9daAlink_cCFv.s" +} +#pragma pop + +/* 800D6DA4-800D6DB4 0D16E4 0010+00 0/0 0/0 2/2 .text getFreezeG__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getFreezeG() const { + nofralloc +#include "asm/d/a/d_a_alink/getFreezeG__9daAlink_cCFv.s" +} +#pragma pop + +/* 800D6DB4-800D6DC4 0D16F4 0010+00 0/0 0/0 2/2 .text getFreezeB__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getFreezeB() const { + nofralloc +#include "asm/d/a/d_a_alink/getFreezeB__9daAlink_cCFv.s" +} +#pragma pop + +/* 800D6DC4-800D6DF0 0D1704 002C+00 2/2 0/0 0/0 .text checkMiddleBossGoronRoom__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkMiddleBossGoronRoom() { + nofralloc +#include "asm/d/a/d_a_alink/checkMiddleBossGoronRoom__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6DF0-800D6E24 0D1730 0034+00 1/0 0/0 0/0 .text setDkCaught__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDkCaught(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setDkCaught__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800D6E24-800D6F00 0D1764 00DC+00 2/2 0/0 0/0 .text freezeTimerDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::freezeTimerDamage() { + nofralloc +#include "asm/d/a/d_a_alink/freezeTimerDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/onPressedDamage__9daAlink_cFRC4cXyzs.s" +} +#pragma pop + +/* 800D6F2C-800D6FE0 0D186C 00B4+00 3/3 0/0 0/0 .text checkNoLandDamageSlidePolygon__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNoLandDamageSlidePolygon() { + nofralloc +#include "asm/d/a/d_a_alink/checkNoLandDamageSlidePolygon__9daAlink_cFv.s" +} +#pragma pop + +/* 800D6FE0-800D70A0 0D1920 00C0+00 6/6 0/0 0/0 .text checkCutLandDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCutLandDamage() { + nofralloc +#include "asm/d/a/d_a_alink/checkCutLandDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCaughtEscapeCutTurn() { + nofralloc +#include "asm/d/a/d_a_alink/checkCaughtEscapeCutTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 800D7160-800D7208 0D1AA0 00A8+00 1/0 0/0 0/0 .text setThrowDamage__9daAlink_cFsffiii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4, + int param_5) { + nofralloc +#include "asm/d/a/d_a_alink/setThrowDamage__9daAlink_cFsffiii.s" +} +#pragma pop + +/* 800D7208-800D72BC 0D1B48 00B4+00 2/2 0/0 0/0 .text damageMagnification__9daAlink_cFii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::damageMagnification(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/damageMagnification__9daAlink_cFii.s" +} +#pragma pop + +/* 800D72BC-800D7478 0D1BFC 01BC+00 6/6 1/1 0/0 .text setDamagePoint__9daAlink_cFiiii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDamagePoint(int param_0, int param_1, int param_2, int param_3) { + nofralloc +#include "asm/d/a/d_a_alink/setDamagePoint__9daAlink_cFiiii.s" +} +#pragma pop + +/* 800D7478-800D74A4 0D1DB8 002C+00 6/6 0/0 0/0 .text setDamagePointNormal__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDamagePointNormal(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setDamagePointNormal__9daAlink_cFi.s" +} +#pragma pop + +/* 800D74A4-800D74F4 0D1DE4 0050+00 3/3 0/0 0/0 .text setLandDamagePoint__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setLandDamagePoint(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setLandDamagePoint__9daAlink_cFi.s" +} +#pragma pop + +/* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getDamageVec(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/getDamageVec__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800D76C4-800D7768 0D2004 00A4+00 1/1 0/0 0/0 .text setDashDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDashDamage() { + nofralloc +#include "asm/d/a/d_a_alink/setDashDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D7768-800D77C8 0D20A8 0060+00 2/2 0/0 3/3 .text + * checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo.s" +} +#pragma pop + +/* 800D77C8-800D7820 0D2108 0058+00 8/8 0/0 0/0 .text checkMagicArmorNoDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkMagicArmorNoDamage() { + nofralloc +#include "asm/d/a/d_a_alink/checkMagicArmorNoDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D7820-800D7A98 0D2160 0278+00 1/1 0/0 0/0 .text checkPolyDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkPolyDamage() { + nofralloc +#include "asm/d/a/d_a_alink/checkPolyDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D7A98-800D7B18 0D23D8 0080+00 1/1 0/0 0/0 .text + * checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c.s" +} +#pragma pop + +/* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text damageTimerCount__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::damageTimerCount() { + if (!i_checkModeFlg(8)) { + if (mDamageColorTime != 0) { + mDamageColorTime--; + } + + if (mProcID != PROC_DK_CAUGHT && i_checkNoResetFlg1(1)) { + i_offNoResetFlg1(1); + } + + if (checkDkCaught2Anime() && i_checkNoResetFlg0(0x20000)) { + i_offNoResetFlg0(0x20000); + } + } else if (mDamageColorTime != 0) { + mDamageColorTime--; + + if (mDamageColorTime + mDamageTimer == 0) { + } + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::damageTimerCount() { + nofralloc +#include "asm/d/a/d_a_alink/damageTimerCount__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800D7BE8-800D7C14 0D2528 002C+00 3/3 0/0 0/0 .text checkHugeAttack__9daAlink_cCFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHugeAttack(int param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkHugeAttack__9daAlink_cCFi.s" +} +#pragma pop + +/* 800D7C14-800D7C40 0D2554 002C+00 3/3 0/0 0/0 .text checkLargeAttack__9daAlink_cCFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkLargeAttack(int param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkLargeAttack__9daAlink_cCFi.s" +} +#pragma pop + +/* 800D7C40-800D8F3C 0D2580 12FC+00 1/1 0/0 0/0 .text checkDamageAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDamageAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkDamageAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800D8F3C-800D9514 0D387C 05D8+00 2/2 0/0 0/0 .text procDamageInit__9daAlink_cFP12dCcD_GObjInfi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procDamageInit__9daAlink_cFP12dCcD_GObjInfi.s" +} +#pragma pop + +/* 800D9514-800D96DC 0D3E54 01C8+00 1/0 0/0 0/0 .text procDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800D96DC-800D9E88 0D401C 07AC+00 12/12 0/0 0/0 .text + * procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3, + dCcD_GObjInf* param_4, int param_5) { + nofralloc +#include "asm/d/a/d_a_alink/procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi.s" +} +#pragma pop + +/* 800D9E88-800DA180 0D47C8 02F8+00 1/0 0/0 0/0 .text procCoLargeDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLargeDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLargeDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800DA180-800DA554 0D4AC0 03D4+00 2/2 0/0 0/0 .text procLargeDamageUpInit__9daAlink_cFiiss */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { + nofralloc +#include "asm/d/a/d_a_alink/procLargeDamageUpInit__9daAlink_cFiiss.s" +} +#pragma pop + +/* 800DA554-800DA82C 0D4E94 02D8+00 1/0 0/0 0/0 .text procLargeDamageUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLargeDamageUp() { + nofralloc +#include "asm/d/a/d_a_alink/procLargeDamageUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800DA82C-800DAC28 0D516C 03FC+00 1/1 0/0 0/0 .text procCoLargeDamageWallInit__9daAlink_cFiiss + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2, s16 param_3) { + nofralloc +#include "asm/d/a/d_a_alink/procCoLargeDamageWallInit__9daAlink_cFiiss.s" +} +#pragma pop + +/* 800DAC28-800DAC84 0D5568 005C+00 1/0 0/0 0/0 .text procCoLargeDamageWall__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLargeDamageWall() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLargeDamageWall__9daAlink_cFv.s" +} +#pragma pop + +/* 800DAC84-800DAD90 0D55C4 010C+00 2/2 0/0 0/0 .text procCoPolyDamageInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPolyDamageInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPolyDamageInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DAD90-800DAE10 0D56D0 0080+00 1/0 0/0 0/0 .text procCoPolyDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPolyDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPolyDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800DAE10-800DB060 0D5750 0250+00 2/2 0/0 0/0 .text procLandDamageInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLandDamageInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procLandDamageInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800DB060-800DB140 0D59A0 00E0+00 1/0 0/0 0/0 .text procLandDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLandDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procLandDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800DB140-800DB418 0D5A80 02D8+00 1/1 0/0 0/0 .text + * procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi.s" +} +#pragma pop + +/* 800DB418-800DB5B0 0D5D58 0198+00 1/0 0/0 0/0 .text procCoElecDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoElecDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procCoElecDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800DB5B0-800DB610 0D5EF0 0060+00 2/2 0/0 0/0 .text procStEscapeInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procStEscapeInit() { + nofralloc +#include "asm/d/a/d_a_alink/procStEscapeInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DB610-800DB6A4 0D5F50 0094+00 1/0 0/0 0/0 .text procStEscape__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procStEscape() { + nofralloc +#include "asm/d/a/d_a_alink/procStEscape__9daAlink_cFv.s" +} +#pragma pop + +/* 800DB6A4-800DB860 0D5FE4 01BC+00 1/1 0/0 0/0 .text procDkCaughtInit__9daAlink_cFUi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDkCaughtInit(unsigned int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procDkCaughtInit__9daAlink_cFUi.s" +} +#pragma pop + +/* 800DB860-800DBC98 0D61A0 0438+00 1/0 0/0 0/0 .text procDkCaught__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDkCaught() { + nofralloc +#include "asm/d/a/d_a_alink/procDkCaught__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBC98-800DBD1C 0D65D8 0084+00 2/2 0/0 0/0 .text setScreamWaitAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setScreamWaitAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setScreamWaitAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBD1C-800DBDA4 0D665C 0088+00 1/1 0/0 0/0 .text procScreamWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procScreamWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procScreamWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBDA4-800DBE00 0D66E4 005C+00 1/0 0/0 0/0 .text procScreamWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procScreamWait() { + nofralloc +#include "asm/d/a/d_a_alink/procScreamWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBE00-800DBE74 0D6740 0074+00 1/1 0/0 0/0 .text procCoSandWallHitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSandWallHitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSandWallHitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBE74-800DBED8 0D67B4 0064+00 1/0 0/0 0/0 .text procCoSandWallHit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSandWallHit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSandWallHit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DBED8-800DC214 0D6818 033C+00 1/1 0/0 0/0 .text procCoLavaReturnInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLavaReturnInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCoLavaReturnInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800DC214-800DC278 0D6B54 0064+00 1/0 0/0 0/0 .text procCoLavaReturn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLavaReturn() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLavaReturn__9daAlink_cFv.s" +} +#pragma pop + +/* 800DC278-800DC474 0D6BB8 01FC+00 1/1 0/0 0/0 .text procCoSwimFreezeReturnInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSwimFreezeReturnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSwimFreezeReturnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DC474-800DC548 0D6DB4 00D4+00 1/0 0/0 0/0 .text procCoSwimFreezeReturn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSwimFreezeReturn() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSwimFreezeReturn__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_demo.inc b/src/d/a/d_a_alink_demo.inc new file mode 100644 index 00000000000..09dca04f648 --- /dev/null +++ b/src/d/a/d_a_alink_demo.inc @@ -0,0 +1,1476 @@ +/* 80115C20-80115C50 110560 0030+00 72/72 0/0 0/0 .text checkEventRun__9daAlink_cCFv */ +BOOL daAlink_c::checkEventRun() const { + return i_dComIfGp_event_runCheck() || checkPlayerDemoMode(); +} + +/* 80115C50-80115D08 110590 00B8+00 2/2 0/0 0/0 .text createNpcTks__9daAlink_cFP4cXyziUl + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::createNpcTks(cXyz* param_0, int param_1, u32 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/createNpcTks__9daAlink_cFP4cXyziUl.s" +} +#pragma pop + +/* 80115D08-80115EC0 110648 01B8+00 1/0 0/0 0/0 .text checkSetNpcTks__9daAlink_cFP4cXyzii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkSetNpcTks(cXyz* param_0, int param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/checkSetNpcTks__9daAlink_cFP4cXyzii.s" +} +#pragma pop + +/* 80115EC0-80116E60 110800 0FA0+00 1/1 0/0 0/0 .text checkDemoAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDemoAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkDemoAction__9daAlink_cFv.s" +} +#pragma pop + +/* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text checkDemoMoveMode__9daAlink_cCFUl + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDemoMoveMode(u32 param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkDemoMoveMode__9daAlink_cCFUl.s" +} +#pragma pop + +/* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoMoveData(u32* param_0, cXyz const* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoMoveData__9daAlink_cFPUlPC4cXyz.s" +} +#pragma pop + +/* 80117064-801171F4 1119A4 0190+00 1/1 0/0 0/0 .text setNoDrawSwordShield__9daAlink_cFiUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setNoDrawSwordShield__9daAlink_cFiUs.s" +} +#pragma pop + +/* 801171F4-80117B90 111B34 099C+00 1/1 0/0 0/0 .text setDemoData__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoData() { + nofralloc +#include "asm/d/a/d_a_alink/setDemoData__9daAlink_cFv.s" +} +#pragma pop + +/* 80117B90-80117C34 1124D0 00A4+00 1/1 0/0 0/0 .text resetDemoBck__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::resetDemoBck() { + nofralloc +#include "asm/d/a/d_a_alink/resetDemoBck__9daAlink_cFv.s" +} +#pragma pop + +/* 80117C34-80117C90 112574 005C+00 3/3 0/0 0/0 .text endHighModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::endHighModel() { + nofralloc +#include "asm/d/a/d_a_alink/endHighModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80117C90-80117CF8 1125D0 0068+00 21/21 0/0 0/0 .text resetSpecialEvent__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::resetSpecialEvent() { + nofralloc +#include "asm/d/a/d_a_alink/resetSpecialEvent__9daAlink_cFv.s" +} +#pragma pop + +/* 80117CF8-801180EC 112638 03F4+00 4/4 0/0 0/0 .text endDemoMode__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::endDemoMode() { + nofralloc +#include "asm/d/a/d_a_alink/endDemoMode__9daAlink_cFv.s" +} +#pragma pop + +/* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text getDemoLookActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getDemoLookActor() { + nofralloc +#include "asm/d/a/d_a_alink/getDemoLookActor__9daAlink_cFv.s" +} +#pragma pop + +/* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text checkFlyAtnWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkFlyAtnWait() { + nofralloc +#include "asm/d/a/d_a_alink/checkFlyAtnWait__9daAlink_cFv.s" +} +#pragma pop + +/* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text setGetItemFace__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGetItemFace(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGetItemFace__9daAlink_cFUs.s" +} +#pragma pop + +/* 801182D4-80118308 112C14 0034+00 2/2 0/0 0/0 .text checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabTalkActor(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 80118308-8011856C 112C48 0264+00 2/2 0/0 0/0 .text setTalkStartBack__9daAlink_cFP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setTalkStartBack(cXyz* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setTalkStartBack__9daAlink_cFP4cXyz.s" +} +#pragma pop + +/* 8011856C-80118654 112EAC 00E8+00 4/4 0/0 0/0 .text setShapeAngleToTalkActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setShapeAngleToTalkActor() { + nofralloc +#include "asm/d/a/d_a_alink/setShapeAngleToTalkActor__9daAlink_cFv.s" +} +#pragma pop + +/* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text setTalkAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setTalkAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setTalkAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 801186D4-80118778 113014 00A4+00 2/2 0/0 0/0 .text setTradeItemAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setTradeItemAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setTradeItemAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80118778-801187B4 1130B8 003C+00 3/3 0/0 0/0 .text setTradeItemOutHand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setTradeItemOutHand() { + nofralloc +#include "asm/d/a/d_a_alink/setTradeItemOutHand__9daAlink_cFv.s" +} +#pragma pop + +/* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text checkEndMessage__9daAlink_cFUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkEndMessage(u32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkEndMessage__9daAlink_cFUl.s" +} +#pragma pop + +/* 80118840-801188B0 113180 0070+00 1/1 0/0 0/0 .text setDemoRightHandIndex__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoRightHandIndex(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoRightHandIndex__9daAlink_cFUs.s" +} +#pragma pop + +/* 801188B0-8011894C 1131F0 009C+00 1/1 0/0 0/0 .text setDemoLeftHandIndex__9daAlink_cFUs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoLeftHandIndex(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoLeftHandIndex__9daAlink_cFUs.s" +} +#pragma pop + +/* 8011894C-801189F8 11328C 00AC+00 1/1 0/0 0/0 .text setDemoRide__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoRide(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoRide__9daAlink_cFUs.s" +} +#pragma pop + +/* 801189F8-80118AD0 113338 00D8+00 1/1 0/0 0/0 .text + * setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs.s" +} +#pragma pop + +/* 80118AD0-80118B34 113410 0064+00 1/1 0/0 0/0 .text checkFinalBattle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkFinalBattle() { + nofralloc +#include "asm/d/a/d_a_alink/checkFinalBattle__9daAlink_cFv.s" +} +#pragma pop + +/* 80118B34-80118BF4 113474 00C0+00 3/3 0/0 0/0 .text checkRestartDead__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkRestartDead(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkRestartDead__9daAlink_cFii.s" +} +#pragma pop + +/* 80118BF4-80118C98 113534 00A4+00 2/2 0/0 0/0 .text setDeadRideSyncPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDeadRideSyncPos() { + nofralloc +#include "asm/d/a/d_a_alink/setDeadRideSyncPos__9daAlink_cFv.s" +} +#pragma pop + +/* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text checkDeadHP__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkDeadHP() { + nofralloc +#include "asm/d/a/d_a_alink/checkDeadHP__9daAlink_cFv.s" +} +#pragma pop + +/* 80118D7C-80118FF8 1136BC 027C+00 3/3 0/0 0/0 .text checkDeadAction__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkDeadAction(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkDeadAction__9daAlink_cFi.s" +} +#pragma pop + +/* 80118FF8-801190A4 113938 00AC+00 1/1 0/0 0/0 .text + * setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHighModelBck(mDoExt_bckAnm* param_0, u16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs.s" +} +#pragma pop + +/* 801190A4-80119134 1139E4 0090+00 1/1 0/0 0/0 .text setHighModelFaceBtk__9daAlink_cFUs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHighModelFaceBtk(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setHighModelFaceBtk__9daAlink_cFUs.s" +} +#pragma pop + +/* 80119134-801191C4 113A74 0090+00 1/1 0/0 0/0 .text + * setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs.s" +} +#pragma pop + +/* 801191C4-80119464 113B04 02A0+00 1/1 0/0 0/0 .text + * setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setStickAnmData(J3DAnmBase* param_0, int param_1, int param_2, u16 param_3, + int param_4) { + nofralloc +#include "asm/d/a/d_a_alink/setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804256B8-804256CC 0523D8 0014+00 1/1 0/0 0/0 .bss dummy$36763 */ +static u8 dummy[20]; + +/* 80119464-801195C0 113DA4 015C+00 1/1 0/0 0/0 .text + * daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_c_getDemoIDData(dDemo_actor_c* param_0, int* param_1, int* param_2, + int* param_3, u16* param_4, int* param_5, int* param_6) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi.s" +} +#pragma pop + +/* 801195C0-801195F8 113F00 0038+00 7/0 0/0 0/0 .text procDemoCommon__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDemoCommon() { + nofralloc +#include "asm/d/a/d_a_alink/procDemoCommon__9daAlink_cFv.s" +} +#pragma pop + +/* 801195F8-801196D8 113F38 00E0+00 1/1 0/0 0/0 .text procCoToolDemoInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoToolDemoInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoToolDemoInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801196D8-80119D98 114018 06C0+00 1/0 0/0 0/0 .text procCoToolDemo__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoToolDemo() { + nofralloc +#include "asm/d/a/d_a_alink/procCoToolDemo__9daAlink_cFv.s" +} +#pragma pop + +/* 80119D98-80119F64 1146D8 01CC+00 1/1 0/0 0/0 .text procCoTalkInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTalkInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTalkInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80119F64-8011A214 1148A4 02B0+00 1/0 0/0 0/0 .text procCoTalk__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTalk() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTalk__9daAlink_cFv.s" +} +#pragma pop + +/* 8011A214-8011A42C 114B54 0218+00 1/0 0/0 0/0 .text procCoOpenTreasureInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoOpenTreasureInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoOpenTreasureInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011A42C-8011A4C0 114D6C 0094+00 1/0 0/0 0/0 .text procCoOpenTreasure__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoOpenTreasure() { + nofralloc +#include "asm/d/a/d_a_alink/procCoOpenTreasure__9daAlink_cFv.s" +} +#pragma pop + +/* 8011A4C0-8011A5CC 114E00 010C+00 1/0 0/0 0/0 .text procCoUnequipInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoUnequipInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoUnequipInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011A5CC-8011A688 114F0C 00BC+00 1/0 0/0 0/0 .text procCoUnequip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoUnequip() { + nofralloc +#include "asm/d/a/d_a_alink/procCoUnequip__9daAlink_cFv.s" +} +#pragma pop + +/* 8011A688-8011A6FC 114FC8 0074+00 4/4 0/0 0/0 .text setGetSubBgm__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGetSubBgm(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGetSubBgm__9daAlink_cFi.s" +} +#pragma pop + +/* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */ +// register issues. probably wrong order of operations +#ifdef NONMATCHING +bool daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { + int itemNo = i_itemNo; + if (itemNo == LINKS_SAVINGS) { + itemNo = PURPLE_RUPEE; + } + + if (itemNo - 4 < 0 || itemNo - 4 >= 4) { + return false; + } + + u16 curRupees = i_dComIfGs_getRupee(); + int tmp = itemNo - 4; + return dComIfGs_getRupeeMax() > (u16)rupeeCount[tmp] + curRupees; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkTreasureRupeeReturn(int param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkTreasureRupeeReturn__9daAlink_cCFi.s" +} +#pragma pop +#endif + +/* 8011A798-8011AC28 1150D8 0490+00 2/1 0/0 0/0 .text procCoGetItemInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGetItemInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGetItemInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011AC28-8011B3F0 115568 07C8+00 1/0 0/0 0/0 .text procCoGetItem__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGetItem() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGetItem__9daAlink_cFv.s" +} +#pragma pop + +/* 8011B3F0-8011B46C 115D30 007C+00 1/0 0/0 0/0 .text procCoTurnBackInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTurnBackInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTurnBackInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011B46C-8011B57C 115DAC 0110+00 1/0 0/0 0/0 .text procCoTurnBack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTurnBack() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTurnBack__9daAlink_cFv.s" +} +#pragma pop + +/* 8011B57C-8011B71C 115EBC 01A0+00 1/0 0/0 0/0 .text procDoorOpenInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDoorOpenInit() { + nofralloc +#include "asm/d/a/d_a_alink/procDoorOpenInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011B71C-8011B914 11605C 01F8+00 1/0 0/0 0/0 .text procDoorOpen__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDoorOpen() { + nofralloc +#include "asm/d/a/d_a_alink/procDoorOpen__9daAlink_cFv.s" +} +#pragma pop + +/* 8011B914-8011BA20 116254 010C+00 1/1 0/0 0/0 .text procCoLookWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLookWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLookWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BA20-8011BABC 116360 009C+00 1/0 0/0 0/0 .text procCoLookWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLookWait() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLookWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BABC-8011BB40 1163FC 0084+00 1/0 0/0 0/0 .text procCoDemoPushPullWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoDemoPushPullWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoDemoPushPullWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BB40-8011BC14 116480 00D4+00 1/0 0/0 0/0 .text procCoDemoPushMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoDemoPushMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoDemoPushMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BC14-8011BC74 116554 0060+00 2/2 0/0 0/0 .text setMonkeyMoveAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMonkeyMoveAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setMonkeyMoveAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BC74-8011BD18 1165B4 00A4+00 1/0 0/0 0/0 .text procMonkeyMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procMonkeyMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procMonkeyMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BD18-8011BD6C 116658 0054+00 1/0 0/0 0/0 .text procMonkeyMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procMonkeyMove() { + nofralloc +#include "asm/d/a/d_a_alink/procMonkeyMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BD6C-8011BDF0 1166AC 0084+00 1/0 0/0 0/0 .text procDemoBoomerangCatchInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDemoBoomerangCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procDemoBoomerangCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BDF0-8011BE54 116730 0064+00 1/0 0/0 0/0 .text procDemoBoomerangCatch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDemoBoomerangCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procDemoBoomerangCatch__9daAlink_cFv.s" +} +#pragma pop + +/* 8011BE54-8011C1B4 116794 0360+00 2/2 0/0 0/0 .text procCoDeadInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoDeadInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCoDeadInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8011C1B4-8011C62C 116AF4 0478+00 1/0 0/0 0/0 .text procCoDead__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoDead() { + nofralloc +#include "asm/d/a/d_a_alink/procCoDead__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C62C-8011C760 116F6C 0134+00 1/0 0/0 0/0 .text procCoLookAroundInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLookAroundInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLookAroundInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C760-8011C81C 1170A0 00BC+00 1/0 0/0 0/0 .text procCoLookAround__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoLookAround() { + nofralloc +#include "asm/d/a/d_a_alink/procCoLookAround__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C81C-8011C890 11715C 0074+00 1/0 0/0 0/0 .text procBossAtnWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBossAtnWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBossAtnWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C890-8011C904 1171D0 0074+00 1/0 0/0 0/0 .text procCoQuakeWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoQuakeWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoQuakeWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C904-8011C9D0 117244 00CC+00 1/0 0/0 0/0 .text procCoCaughtInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoCaughtInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoCaughtInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011C9D0-8011CA4C 117310 007C+00 1/0 0/0 0/0 .text procLookUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procLookUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CA4C-8011CA98 11738C 004C+00 1/0 0/0 0/0 .text procLookUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookUp() { + nofralloc +#include "asm/d/a/d_a_alink/procLookUp__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CA98-8011CB20 1173D8 0088+00 1/0 0/0 0/0 .text procLookUpToGetItemInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookUpToGetItemInit() { + nofralloc +#include "asm/d/a/d_a_alink/procLookUpToGetItemInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CB20-8011CBD4 117460 00B4+00 1/0 0/0 0/0 .text procLookUpToGetItem__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookUpToGetItem() { + nofralloc +#include "asm/d/a/d_a_alink/procLookUpToGetItem__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CBD4-8011CCA8 117514 00D4+00 1/0 0/0 0/0 .text procHandPatInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHandPatInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHandPatInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CCA8-8011CDE0 1175E8 0138+00 1/0 0/0 0/0 .text procHandPat__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHandPat() { + nofralloc +#include "asm/d/a/d_a_alink/procHandPat__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CDE0-8011CF60 117720 0180+00 1/0 0/0 0/0 .text procCoFogDeadInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoFogDeadInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoFogDeadInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011CF60-8011D0A0 1178A0 0140+00 1/0 0/0 0/0 .text procCoFogDead__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoFogDead() { + nofralloc +#include "asm/d/a/d_a_alink/procCoFogDead__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D0A0-8011D110 1179E0 0070+00 1/0 0/0 0/0 .text procWolfSmellWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSmellWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSmellWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D110-8011D1F4 117A50 00E4+00 1/0 0/0 0/0 .text procCoNodInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoNodInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoNodInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D1F4-8011D268 117B34 0074+00 1/0 0/0 0/0 .text procCoNod__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoNod() { + nofralloc +#include "asm/d/a/d_a_alink/procCoNod__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D268-8011D304 117BA8 009C+00 1/0 0/0 0/0 .text procCoEyeAwayInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoEyeAwayInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoEyeAwayInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D304-8011D3CC 117C44 00C8+00 1/0 0/0 0/0 .text procCoGlareInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGlareInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGlareInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D3CC-8011D474 117D0C 00A8+00 1/0 0/0 0/0 .text procCoGlare__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGlare() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGlare__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D474-8011D4D4 117DB4 0060+00 1/0 0/0 0/0 .text procGoatStopReadyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGoatStopReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGoatStopReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D4D4-8011D544 117E14 0070+00 1/0 0/0 0/0 .text procGoatStopReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGoatStopReady() { + nofralloc +#include "asm/d/a/d_a_alink/procGoatStopReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D544-8011D64C 117E84 0108+00 2/1 0/0 0/0 .text procCoGetReadySitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGetReadySitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGetReadySitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D64C-8011D6D0 117F8C 0084+00 1/0 0/0 0/0 .text procCoGetReadySit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoGetReadySit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoGetReadySit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D6D0-8011D7D4 118010 0104+00 1/0 0/0 0/0 .text procCoTwGateInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTwGateInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTwGateInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D7D4-8011D82C 118114 0058+00 1/0 0/0 0/0 .text procCoTwGate__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoTwGate() { + nofralloc +#include "asm/d/a/d_a_alink/procCoTwGate__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D82C-8011D8F8 11816C 00CC+00 1/0 0/0 0/0 .text procWolfSnowEscapeInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSnowEscapeInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSnowEscapeInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011D8F8-8011DB04 118238 020C+00 1/0 0/0 0/0 .text procWolfSnowEscape__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSnowEscape() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSnowEscape__9daAlink_cFv.s" +} +#pragma pop + +/* 8011DB04-8011DB9C 118444 0098+00 1/0 0/0 0/0 .text procZoraMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procZoraMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procZoraMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011DB9C-8011DDD4 1184DC 0238+00 1/0 0/0 0/0 .text procZoraMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procZoraMove() { + nofralloc +#include "asm/d/a/d_a_alink/procZoraMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8011DDD4-8011DED8 118714 0104+00 1/0 0/0 0/0 .text procLookAroundTurnInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookAroundTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procLookAroundTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011DED8-8011DF68 118818 0090+00 1/0 0/0 0/0 .text procLookAroundTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLookAroundTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procLookAroundTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8011DF68-8011E060 1188A8 00F8+00 1/0 0/0 0/0 .text procTradeItemOutInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procTradeItemOutInit() { + nofralloc +#include "asm/d/a/d_a_alink/procTradeItemOutInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E060-8011E3D8 1189A0 0378+00 1/0 0/0 0/0 .text procTradeItemOut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procTradeItemOut() { + nofralloc +#include "asm/d/a/d_a_alink/procTradeItemOut__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text checkLetterItem__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkLetterItem(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkLetterItem__9daAlink_cFi.s" +} +#pragma pop + +/* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text procNotUseItemInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procNotUseItemInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procNotUseItemInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8011E57C-8011E6E0 118EBC 0164+00 1/0 0/0 0/0 .text procNotUseItem__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procNotUseItem() { + nofralloc +#include "asm/d/a/d_a_alink/procNotUseItem__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E6E0-8011E748 119020 0068+00 1/0 0/0 0/0 .text procSwordReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E748-8011E83C 119088 00F4+00 1/0 0/0 0/0 .text procSwordReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordReady() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E83C-8011E8E0 11917C 00A4+00 2/2 0/0 0/0 .text setSwordPushAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordPushAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setSwordPushAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E8E0-8011E960 119220 0080+00 1/0 0/0 0/0 .text procSwordPushInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordPushInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordPushInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E960-8011E9F8 1192A0 0098+00 1/0 0/0 0/0 .text procSwordPush__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwordPush() { + nofralloc +#include "asm/d/a/d_a_alink/procSwordPush__9daAlink_cFv.s" +} +#pragma pop + +/* 8011E9F8-8011EA78 119338 0080+00 1/0 0/0 0/0 .text procGanonFinishInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGanonFinishInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGanonFinishInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text procGanonFinish__9daAlink_cFv */ +bool daAlink_c::procGanonFinish() { + i_onEndResetFlg1(GANON_FINISH); + mCurrent.mPosition = field_0x37c8; + if (mFrameCtrl1[0].checkAnmEnd()) { + setSingleAnimeBaseMorf(ANM_GANON_FINISH, lit_6041); + } + return true; +} + +/* 8011EAE8-8011EB8C 119428 00A4+00 1/0 0/0 0/0 .text procCutFastReadyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFastReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFastReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011EB8C-8011EBDC 1194CC 0050+00 1/0 0/0 0/0 .text procCutFastReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCutFastReady() { + nofralloc +#include "asm/d/a/d_a_alink/procCutFastReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8011EBDC-8011EC60 11951C 0084+00 1/0 0/0 0/0 .text procMasterSwordStickInit__9daAlink_cFv */ +int daAlink_c::procMasterSwordStickInit() { + if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_STICK)) { + return 0; + } + + setSingleAnimeBase(ANM_MASTER_SWORD_STICK_INIT); + voiceStart(Z2SE_AL_V_MSTR_SW_STICK); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCurrent.mAngle.y = mCollisionRot.y; + mCommonCounter = 0; + + return 1; +} + +/* 8011EC60-8011ED18 1195A0 00B8+00 1/0 0/0 0/0 .text procMasterSwordStick__9daAlink_cFv + */ +int daAlink_c::procMasterSwordStick() { + daPy_frameCtrl_c* fCtrl = &mFrameCtrl1[0]; + + if (mCommonCounter != 0) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (fCtrl->checkAnmEnd()) { + mCommonCounter = 1; + setSingleAnimeBaseMorf(ANM_MASTER_SWORD_STICK, lit_6041); + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (fCtrl->getFrame() >= lit_14621) { + field_0x2f93 = 5; + } + + return 1; +} + +/* 8011ED18-8011ED8C 119658 0074+00 1/0 0/0 0/0 .text procMasterSwordPullInit__9daAlink_cFv */ +int daAlink_c::procMasterSwordPullInit() { + if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_PULL)) { + return 0; + } + + setSingleAnimeBase(ANM_MASTER_SWORD_PULL_INIT); + voiceStart(Z2SE_AL_V_MSTR_SW_PULLOUT); + field_0x3010 = 0; + + return 1; +} + +/* 8011ED8C-8011EE40 1196CC 00B4+00 1/0 0/0 0/0 .text procMasterSwordPull__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procMasterSwordPull() { + nofralloc +#include "asm/d/a/d_a_alink/procMasterSwordPull__9daAlink_cFv.s" +} +#pragma pop + +/* 8011EE40-8011EE94 119780 0054+00 5/5 0/0 0/0 .text checkLv7DungeonShop__9daAlink_cFv + */ +BOOL daAlink_c::checkLv7DungeonShop() { + return checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 16; +} + +/* 8011EE94-8011EFB8 1197D4 0124+00 1/1 0/0 0/0 .text procDungeonWarpReadyInit__9daAlink_cFv */ +int daAlink_c::procDungeonWarpReadyInit() { + if (!dComIfGp_event_compulsory(this, NULL, -1)) { + return 0; + } + + u32 id; + if (checkItemSetButton(DUNGEON_EXIT) != 2) { + id = fopAcM_create(PROC_OBJ_TKS, 0, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + } else { + id = fopAcM_create(PROC_NPC_TKC, 2, &mCurrent.mPosition, fopAcM_GetRoomNo(this), &mCollisionRot, NULL, -1); + } + + if (id == -1) { + return 0; + } + + mDemo.i_setSpecialDemoType(); + commonProcInit(PROC_DUNGEON_WARP_READY); + setSingleAnimeBase(ANM_DUNGEON_WARP_READY_INIT); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCurrent.mAngle.y = mCollisionRot.y; + field_0x32cc = id; + mCommonCounter = 0; + keepItemData(); + + return 1; +} + +/* 8011EFB8-8011F084 1198F8 00CC+00 1/0 0/0 0/0 .text procDungeonWarpReady__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDungeonWarpReady() { + nofralloc +#include "asm/d/a/d_a_alink/procDungeonWarpReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8011F084-8011F0F4 1199C4 0070+00 1/0 0/0 0/0 .text procDungeonWarpInit__9daAlink_cFv + */ +#ifdef NONMATCHING +bool daAlink_c::procDungeonWarpInit() { + if (!commonProcInitNotSameProc(DUNEGON_WARP_START) { + mCommonCounter = 0; + field_0x3012 = 0; + setSpecialGravity(0.0f, mMaxFallSpeed, 0); + field_0x300e = 0; + field_0x3010 = 0; + } + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDungeonWarpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procDungeonWarpInit__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8011F0F4-8011F360 119A34 026C+00 1/0 0/0 0/0 .text procDungeonWarp__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procDungeonWarp() { + mCommonCounter += 0x200; + + if (mCommonCounter > 0x4000) { + mCommonCounter = 0x4000; + } else { + mCurrent.mPosition.y += 1.0f; + } + + f32 sin = cM_ssin(mCommonCounter); + mCollisionRot.y += (s16)(14336.0f * sin); + field_0x300e = 8.0f * sin + 24.0f * (1.0f - mScale.x); + + if (field_0x3012 != 0) { + return 1; + } else { + if (mCommonCounter == 0x4000) { + if (field_0x3010 == 0) { + dComIfGp_particle_set(0xA61, &mCurrent.mPosition, &mTevStr, NULL, NULL); + field_0x3010 = 1; + } + + cLib_addCalc(&mScale.x, 0.0f, 0.5f, 0.4f, 0.005f); + cLib_addCalc(&mScale.y, 2.5f, 0.5f, 0.5f, 0.1f); + + if (mScale.x < 0.01f) { + i_onNoResetFlg0(FLG0_UNK_8000000); + if (checkItemGet(DUNGEON_EXIT, 1)) { + int escape = dStage_stagInfo_GetEscapeWarp(i_dComIfGp_getStage()->getStagInfo()); + dStage_changeScene(escape, 0.0f, 12, -1, mCollisionRot.y, -1); + dMeter2Info_warpOutProc(); + } else { + dungeonReturnWarp(); + dMeter2Info_warpInProc(); + } + + field_0x3012 = 1; + } + mCurrent.mPosition.y += 5.0f; + field_0x2b98 = (1.0f - mScale.y) * 100.0f; + } else if (mCommonCounter >= 0x2000) { + cLib_chaseF(&mScale.x, 0.8f, 0.01f); + } + + mScale.z = mScale.x; + field_0x0650->setBaseScale(mScale); + } + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procDungeonWarp() { + nofralloc +#include "asm/d/a/d_a_alink/procDungeonWarp__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8011F360-8011F460 119CA0 0100+00 2/1 0/0 0/0 .text procDungeonWarpSceneStartInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDungeonWarpSceneStartInit() { + nofralloc +#include "asm/d/a/d_a_alink/procDungeonWarpSceneStartInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8011F460-8011F5D4 119DA0 0174+00 1/0 0/0 0/0 .text procDungeonWarpSceneStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDungeonWarpSceneStart() { + nofralloc +#include "asm/d/a/d_a_alink/procDungeonWarpSceneStart__9daAlink_cFv.s" +} +#pragma pop + +/* 8011F5D4-8011F658 119F14 0084+00 2/2 0/0 0/0 .text daAlink_searchPortal__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void* daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchPortal__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 8011F658-8011F7D8 119F98 0180+00 1/1 0/0 0/0 .text checkAcceptWarp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkAcceptWarp() { + nofralloc +#include "asm/d/a/d_a_alink/checkAcceptWarp__9daAlink_cFv.s" +} +#pragma pop + +/* 8011F7D8-8011F8B8 11A118 00E0+00 2/2 0/0 0/0 .text dungeonReturnWarp__9daAlink_cFv */ +void daAlink_c::dungeonReturnWarp() { + cXyz pos = dComIfGs_getWarpPlayerPos(); + s16 angle = dComIfGs_getWarpPlayerAngleY(); + s8 room = dComIfGs_getWarpRoomNo(); + char name[8]; + strcpy(name, dComIfGs_getWarpStageName()); + + dComIfGs_setRestartRoom(pos, angle, room); + dComIfGp_setNextStage(name, -1, dComIfGs_getRestartRoomNo(), -1, FLOAT_LABEL(lit_6108), 12, 0, + 0, 0, 1, 0); + u32 data = setParamData(dComIfGs_getRestartRoomNo(), 0, 0xCA, 0); + dComIfGs_setRestartRoomParam(data); +} + +/* 8011F8B8-8011F9EC 11A1F8 0134+00 1/0 0/0 0/0 .text skipPortalObjWarp__9daAlink_cFv */ +void daAlink_c::skipPortalObjWarp() { + if (mProcID == PROC_WARP && field_0x300e <= 0) { + return; + } + + if (i_checkNoResetFlg3(FLG3_UNK_2000000) && + (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { + dStage_changeScene(2, FLOAT_LABEL(lit_6108), 0, fopAcM_GetRoomNo(this), mCollisionRot.y, + -1); + } else { + u32 data = setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0); + dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), + dMeter2Info_getWarpRoomNo(), data); + dComIfGp_setNextStage(dMeter2Info_getWarpStageName(), -4, dMeter2Info_getWarpRoomNo(), -1, + FLOAT_LABEL(lit_6108), 0, 1, 0, mCollisionRot.y, 1, 0); + } + + if (mProcID == PROC_WARP) { + field_0x300e = -1; + } +} + +/* 8011F9EC-8011FBC0 11A32C 01D4+00 1/1 0/0 0/0 .text checkWarpStart__9daAlink_cFv */ +void daAlink_c::checkWarpStart() { + if (dMeter2Info_getWarpStatus() != 0) { + if (dMeter2Info_getWarpStatus() == 3 || dComIfGp_event_compulsory(this, 0, 0xFFFF)) { + i_onNoResetFlg0(0x4000); + if (dMeter2Info_getWarpStatus() == 3) { + const char* portal; + if (!i_checkMidnaRide()) { + if (dComIfGp_TargetWarpPt_get() == 3) { + mEvtInfo.setArchiveName("Obj_kbrg"); + portal = kBridgePortal; + } else if (dComIfGp_TargetWarpPt_get() == 6) { + mEvtInfo.setArchiveName("Obj_obrg"); + portal = oBridgePortal; + } else if (dComIfGp_TargetWarpPt_get() == 9) { + mEvtInfo.setArchiveName("M_VolcBom"); + portal = volcBomPortal; + } else if (dComIfGp_TargetWarpPt_get() == 8) { + mEvtInfo.setArchiveName("SCanCrs"); + portal = cannonPortal; + } else { + portal = defaultPortal; + } + } else { + dComIfGp_TargetWarpPt_set(0xFF); + portal = defaultPortal; + } + fopAcM_orderOtherEvent(this, portal, 0xFFFF, 1, 1); + } else { + mDemo.i_setSpecialDemoType(); + if (dMeter2Info_getWarpStatus() == 1) { + stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); + u32 tmp = dStage_stagInfo_GetEscapeWarp(stag_info); + dStage_changeScene(tmp, FLOAT_LABEL(lit_6108), 0, -1, mCollisionRot.y, -1); + } else { + dungeonReturnWarp(); + } + } + } + g_meter2_info.resetWarpStatus(); + } +} + +/* 8011FBC0-8011FD4C 11A500 018C+00 3/3 0/0 0/0 .text warpModelTexScroll__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::warpModelTexScroll() { + nofralloc +#include "asm/d/a/d_a_alink/warpModelTexScroll__9daAlink_cFv.s" +} +#pragma pop + +/* 8011FD4C-80120124 11A68C 03D8+00 2/2 0/0 0/0 .text procCoWarpInit__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoWarpInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procCoWarpInit__9daAlink_cFii.s" +} +#pragma pop + +/* 80120124-80120440 11AA64 031C+00 1/0 0/0 0/0 .text procCoWarp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoWarp() { + nofralloc +#include "asm/d/a/d_a_alink/procCoWarp__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_effect.inc b/src/d/a/d_a_alink_effect.inc new file mode 100644 index 00000000000..e019bfb82b2 --- /dev/null +++ b/src/d/a/d_a_alink_effect.inc @@ -0,0 +1,776 @@ +/* 80120580-80120634 11AEC0 00B4+00 21/21 0/0 0/0 .text + * setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ +// matches with literal +#ifdef NONMATCHING +void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, csXyz const* param_3) { + *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &mTevStr, param_3, NULL, 0xFF, + NULL, 0xFF, NULL, NULL, NULL); + dComIfGp_particle_levelEmitterOnEventMove(*param_0); + dComIfGp_particle_getEmitter(*param_0); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2, + csXyz const* param_3) { + nofralloc +#include "asm/d/a/d_a_alink/setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" +} +#pragma pop +#endif + +/* 80120634-801206C4 11AF74 0090+00 4/4 0/0 0/0 .text + * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */ +void daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2, + cXyz const* param_3, csXyz const* param_4) { + *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &mTevStr, + param_4, NULL, 0, NULL, -1, NULL); + dComIfGp_particle_levelEmitterOnEventMove(*param_0); + dComIfGp_particle_getEmitter(*param_0); +} + +/* 801206C4-80120778 11B004 00B4+00 2/2 0/0 0/0 .text + * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2, + csXyz const* param_3) { + nofralloc +#include "asm/d/a/d_a_alink/setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz.s" +} +#pragma pop + +/* 80120778-801207BC 11B0B8 0044+00 9/9 0/0 0/0 .text stopDrawParticle__9daAlink_cFUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::stopDrawParticle(u32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/stopDrawParticle__9daAlink_cFUl.s" +} +#pragma pop + +/* 801207BC-80120880 11B0FC 00C4+00 1/0 0/0 0/0 .text setEffectFrontRollParam__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffectFrontRollParam() { + nofralloc +#include "asm/d/a/d_a_alink/setEffectFrontRollParam__9daAlink_cFv.s" +} +#pragma pop + +/* 80120880-80120B00 11B1C0 0280+00 1/0 0/0 0/0 .text setEffectSlipParam__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffectSlipParam() { + nofralloc +#include "asm/d/a/d_a_alink/setEffectSlipParam__9daAlink_cFv.s" +} +#pragma pop + +/* 80120B00-80120DB0 11B440 02B0+00 1/0 0/0 0/0 .text setEffectRunParam__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffectRunParam() { + nofralloc +#include "asm/d/a/d_a_alink/setEffectRunParam__9daAlink_cFv.s" +} +#pragma pop + +/* 80120DB0-80121000 11B6F0 0250+00 1/0 0/0 0/0 .text setEffectSmallLandParam__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffectSmallLandParam() { + nofralloc +#include "asm/d/a/d_a_alink/setEffectSmallLandParam__9daAlink_cFv.s" +} +#pragma pop + +/* 80121000-80121004 11B940 0004+00 1/0 0/0 0/0 .text setEffectLandParam__9daAlink_cFv */ +void daAlink_c::setEffectLandParam() { + /* empty function */ +} + +/* 80121004-801211C0 11B944 01BC+00 1/0 0/0 0/0 .text setEffectSumouParam__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffectSumouParam() { + nofralloc +#include "asm/d/a/d_a_alink/setEffectSumouParam__9daAlink_cFv.s" +} +#pragma pop + +/* 801211C0-80121214 11BB00 0054+00 46/46 0/0 0/0 .text setFootEffectProcType__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFootEffectProcType(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setFootEffectProcType__9daAlink_cFi.s" +} +#pragma pop + +/* 80121214-80121304 11BB54 00F0+00 1/1 0/0 0/0 .text setWolfFootOn__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfFootOn(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfFootOn__9daAlink_cFi.s" +} +#pragma pop + +/* 80121304-80121388 11BC44 0084+00 1/1 0/0 0/0 .text setFootMark__9daAlink_cFP4cXyzUsi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFootMark(cXyz* param_0, u16 param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setFootMark__9daAlink_cFP4cXyzUsi.s" +} +#pragma pop + +/* 80121388-801221F0 11BCC8 0E68+00 1/1 0/0 0/0 .text setEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801221F0-801225E8 11CB30 03F8+00 1/1 0/0 0/0 .text setSumouEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSumouEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setSumouEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801225E8-80122654 11CF28 006C+00 1/1 0/0 0/0 .text setWaterfallEffect__9daAlink_cFPC4cXyzPUl */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWaterfallEffect(cXyz const* param_0, u32* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFPC4cXyzPUl.s" +} +#pragma pop + +/* 80122654-8012277C 11CF94 0128+00 1/1 0/0 0/0 .text setWaterfallEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWaterfallEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWaterfallEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 8012277C-801228F4 11D0BC 0178+00 1/1 0/0 0/0 .text setMagneBootsEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMagneBootsEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setMagneBootsEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801228F4-80122BBC 11D234 02C8+00 1/1 0/0 0/0 .text setSwordChargeEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordChargeEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setSwordChargeEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80122BBC-80122F18 11D4FC 035C+00 1/1 0/0 0/0 .text setElecDamageEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setElecDamageEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setElecDamageEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80122F18-80122F78 11D858 0060+00 1/1 0/0 0/0 .text clearCutTurnEffectID__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::clearCutTurnEffectID() { + nofralloc +#include "asm/d/a/d_a_alink/clearCutTurnEffectID__9daAlink_cFv.s" +} +#pragma pop + +/* 80122F78-801233A4 11D8B8 042C+00 1/1 0/0 0/0 .text setCutTurnEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCutTurnEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setCutTurnEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801233A4-80123434 11DCE4 0090+00 1/1 0/0 0/0 .text setHorseCutTurnEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseCutTurnEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseCutTurnEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80123434-801236BC 11DD74 0288+00 1/1 0/0 0/0 .text setCutLargeJumpLandEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCutLargeJumpLandEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setCutLargeJumpLandEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801236BC-801237A8 11DFFC 00EC+00 1/1 0/0 0/0 .text setBootsLightEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBootsLightEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setBootsLightEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801237A8-801238FC 11E0E8 0154+00 1/1 0/0 0/0 .text setLightningSwordEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setLightningSwordEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setLightningSwordEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801238FC-801239B0 11E23C 00B4+00 1/1 0/0 0/0 .text setWolfRollAttackEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfRollAttackEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfRollAttackEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801239B0-80123BF0 11E2F0 0240+00 1/1 0/0 0/0 .text setWolfDigEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfDigEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfDigEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80123BF0-80123C8C 11E530 009C+00 2/2 0/0 0/0 .text + * setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfSwimEndEffect(JPABaseEmitter** param_0, JPABaseEmitter** param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter.s" +} +#pragma pop + +/* 80123C8C-80123D88 11E5CC 00FC+00 1/1 0/0 0/0 .text setWolfLockAttackEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfLockAttackEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfLockAttackEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80123D88-80123ED0 11E6C8 0148+00 1/1 0/0 0/0 .text setWolfJumpAttackEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfJumpAttackEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfJumpAttackEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80123ED0-80124144 11E810 0274+00 2/2 0/0 0/0 .text + * setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk.s" +} +#pragma pop + +/* 80124144-801241E0 11EA84 009C+00 9/9 0/0 0/0 .text setCutWaterDropEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCutWaterDropEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setCutWaterDropEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801241E0-801244E4 11EB20 0304+00 1/1 0/0 0/0 .text setWaterDropEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWaterDropEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWaterDropEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801244E4-801245EC 11EE24 0108+00 1/1 0/0 0/0 .text setSwordUpColorEffect__9daAlink_cFv + */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setSwordUpColorEffect() { + f32 max_intensity; + if (mSwordUpTimer != 0) { + max_intensity = 1.0f; + } else { + max_intensity = 0.0f; + } + cLib_chaseF(&mSwordUpColorIntensity, max_intensity, 0.1f); + + for (int i = 0; i < 2; i++) { + field_0x32b0[i].mColor.r = mSwordUpColorIntensity * swordUpColor[i].r; + field_0x32b0[i].mColor.g = mSwordUpColorIntensity * swordUpColor[i].g; + field_0x32b0[i].mColor.b = mSwordUpColorIntensity * swordUpColor[i].b; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordUpColorEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setSwordUpColorEffect__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 801245EC-80124738 11EF2C 014C+00 1/1 0/0 0/0 .text setSwordCutSplash__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwordCutSplash() { + nofralloc +#include "asm/d/a/d_a_alink/setSwordCutSplash__9daAlink_cFv.s" +} +#pragma pop + +/* 80124738-801247A8 11F078 0070+00 1/1 0/0 0/0 .text setMetamorphoseEffectStartLink__9daAlink_cFv + */ +void daAlink_c::setMetamorphoseEffectStartLink() { + setEmitter(&field_0x31f8, 0x24F, &field_0x37c8, NULL); + setEmitter(&field_0x31fc, 0x250, &field_0x37c8, NULL); + setEmitter(&field_0x3200, 0x6E8, &cXyz::Zero, NULL); +} + +/* 801247A8-801248A8 11F0E8 0100+00 1/1 0/0 0/0 .text setMetamorphoseEffect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMetamorphoseEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setMetamorphoseEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801248A8-80124A2C 11F1E8 0184+00 1/1 0/0 0/0 .text setRunSplash__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setRunSplash() { + nofralloc +#include "asm/d/a/d_a_alink/setRunSplash__9daAlink_cFv.s" +} +#pragma pop + +/* 80124A2C-80124B68 11F36C 013C+00 1/0 0/0 0/0 .text + * execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle() { + // asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* + // param_1) { + nofralloc +#include "asm/d/a/d_a_alink/execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle.s" +} +#pragma pop + +/* 80124B68-80124BA4 11F4A8 003C+00 2/2 0/0 0/0 .text resetFairyEffect__9daAlink_cFv */ +void daAlink_c::resetFairyEffect() { + stopDrawParticle(field_0x3258); + stopDrawParticle(field_0x325c); +} + +/* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text setBottleEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBottleEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setBottleEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80124E28-80124EA8 11F768 0080+00 2/2 0/0 0/0 .text clearFirePointDamageEffect__9daAlink_cFi */ +void daAlink_c::clearFirePointDamageEffect(int i) { + firePointEff_c* fire_eff = &field_0x32d8[i]; + + if (fire_eff->field_0x0 != 0) { + stopDrawParticle(fire_eff->field_0x4); + stopDrawParticle(fire_eff->field_0x8); + } + fire_eff->field_0x0 = 0; + fire_eff->field_0x24 = cXyz::Zero; +} + +/* 80124EA8-80124FA4 11F7E8 00FC+00 1/1 0/0 0/0 .text initFirePointDamageEffectAll__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initFirePointDamageEffectAll() { + nofralloc +#include "asm/d/a/d_a_alink/initFirePointDamageEffectAll__9daAlink_cFv.s" +} +#pragma pop + +/* 80124FA4-80125128 11F8E4 0184+00 1/1 0/0 0/0 .text + * initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initFirePointDamageEffect(cXyz const* param_0, dCcD_GObjInf* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf.s" +} +#pragma pop + +/* 80125128-80125338 11FA68 0210+00 1/1 0/0 0/0 .text setFirePointDamageEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFirePointDamageEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setFirePointDamageEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80125338-80125524 11FC78 01EC+00 1/1 0/0 0/0 .text setFreezeEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFreezeEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setFreezeEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 80125524-801255BC 11FE64 0098+00 1/1 0/0 0/0 .text setWoodShieldBurnEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWoodShieldBurnEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWoodShieldBurnEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801255BC-80125628 11FEFC 006C+00 3/3 0/0 0/0 .text clearWoodShieldBurnEffect__9daAlink_cFv */ +#ifdef NONMATCHING +void daAlink_c::clearWoodShieldBurnEffect() { + if (field_0x2fcb != 0) { + for (int i = 0; i < 2; i++) { + stopDrawParticle(field_0x3260[i].field_0x0); + } + field_0x2fcb = 0; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::clearWoodShieldBurnEffect() { + nofralloc +#include "asm/d/a/d_a_alink/clearWoodShieldBurnEffect__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 80125628-801256EC 11FF68 00C4+00 1/1 0/0 0/0 .text setWoodShieldBurnOutEffect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWoodShieldBurnOutEffect() { + nofralloc +#include "asm/d/a/d_a_alink/setWoodShieldBurnOutEffect__9daAlink_cFv.s" +} +#pragma pop + +/* 801256EC-80125778 12002C 008C+00 2/2 0/0 0/0 .text + * initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz */ +void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, cXyz const* param_3, + cXyz const* param_4) { + field_0x24 = param_0; + field_0x1c = param_1; + field_0x2c = *param_4; + field_0x38[0] = *param_2; + field_0x308[0] = *param_3; + field_0x38[1] = field_0x38[0]; + field_0x308[1] = field_0x308[0]; + field_0x14 = 0; +} + +/* 80125778-8012589C 1200B8 0124+00 1/1 0/0 0/0 .text + * setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void setBezierPos(cXyz const* param_0, cXyz const* param_1, cXyz const* param_2, + cXyz const* param_3, f32 param_4, cXyz* param_5) { + nofralloc +#include "asm/d/a/d_a_alink/setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz.s" +} +#pragma pop + +/* 8012589C-80125B0C 1201DC 0270+00 1/1 0/0 0/0 .text + * copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_blur_c::copyBlur(cXyz const* param_0, cXyz const* param_1, cXyz const* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz.s" +} +#pragma pop + +/* 80125B0C-80125BF4 12044C 00E8+00 1/1 0/0 0/0 .text traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804256CC-804256EC 0523EC 0020+00 1/1 0/0 0/0 .bss texObj$42524 */ +static u8 texObj[32]; + +/* 804506A4-804506A8 000124 0004+00 1/1 0/0 0/0 .sdata nColor0$42525 */ +SECTION_SDATA static u8 nColor0[4] = { + 0xFF, + 0xFF, + 0xFF, + 0x14, +}; + +/* 80125BF4-80125F14 120534 0320+00 1/0 0/0 0/0 .text draw__14daAlink_blur_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void draw__14daAlink_blur_cFv() { + // asm void daAlink_blur_c::draw() { + nofralloc +#include "asm/d/a/d_a_alink/draw__14daAlink_blur_cFv.s" +} +#pragma pop + +/* 80125F14-80126350 120854 043C+00 1/1 0/0 0/0 .text create__20daAlink_lockCursor_cFv */ +BOOL daAlink_lockCursor_c::create() { + JKRArchive* arc = dComIfG_getObjectResInfo(l_arcName)->getArchive(); + + f32 tmp = FLOAT_LABEL(lit_6108); + field_0x2c = tmp; + field_0x4 = false; + field_0x30 = tmp; + + mScrn = new J2DScreen(); + if (mScrn == NULL) { + return false; + } + + mScrn->setPriority("zelda_v_cursor_new_yellow.blo", 0x100000, arc); + dPaneClass_showNullPane(mScrn); + + void* tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bpk", arc); + field_0x24 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x24 == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.bck", arc); + field_0x28 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x28 == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow_02.brk", arc); + field_0x1c = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x1c == NULL) { + return false; + } + + tmpData = JKRFileLoader::getGlbResource("zelda_v_cursor_new_yellow.brk", arc); + field_0x20 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(tmpData); + if (field_0x20 == NULL) { + return false; + } + + field_0xc = mScrn->search('n_all'); + mCursor0 = mScrn->search('cursor0'); + mCursor1 = mScrn->search('cursor1'); + mCursor2 = mScrn->search('cursor2'); + + field_0x28->searchUpdateMaterialID(mScrn); + field_0xc->setAnimation(field_0x28); + mCursor0->setAnimation(field_0x28); + mCursor1->setAnimation(field_0x28); + mCursor2->setAnimation(field_0x28); + field_0x28->setFrame(FLOAT_LABEL(lit_6108)); + + field_0x24->searchUpdateMaterialID(mScrn); + mCursor0->setAnimation(field_0x24); + mCursor1->setAnimation(field_0x24); + mCursor2->setAnimation(field_0x24); + mScrn->search('flash')->setAnimation(field_0x24); + field_0x24->setFrame(FLOAT_LABEL(lit_6108)); + + field_0x1c->searchUpdateMaterialID(mScrn); + field_0x20->searchUpdateMaterialID(mScrn); + mCursor0->setAnimation(field_0x1c); + mCursor1->setAnimation(field_0x1c); + mCursor2->setAnimation(field_0x1c); + mCursor0->setAnimation(field_0x20); + mCursor1->setAnimation(field_0x20); + mCursor2->setAnimation(field_0x20); + f32 tmp2 = FLOAT_LABEL(lit_6108); + field_0x1c->setFrame(tmp2); + field_0x20->setFrame(tmp2); + + mScrn->animation(); + mScrn->setUserInfo('n_43'); + field_0xc->setUserInfo(0x20); + return true; +} + +/* 80126350-80126354 120C90 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTevRegKey */ +// void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) { +extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey() { + /* empty function */ +} + +/* 80126354-80126358 120C94 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP11J2DAnmColor */ +// void J2DPane::setAnimation(J2DAnmColor* param_0) { +extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor() { + /* empty function */ +} + +/* 80126358-80126424 120C98 00CC+00 1/1 0/0 0/0 .text update__20daAlink_lockCursor_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_lockCursor_c::update() { + nofralloc +#include "asm/d/a/d_a_alink/update__20daAlink_lockCursor_cFv.s" +} +#pragma pop + +/* 80126424-80126650 120D64 022C+00 1/0 0/0 0/0 .text draw__20daAlink_lockCursor_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void draw__20daAlink_lockCursor_cFv() { + // asm void daAlink_lockCursor_c::draw() { + nofralloc +#include "asm/d/a/d_a_alink/draw__20daAlink_lockCursor_cFv.s" +} +#pragma pop + +/* 80126650-801266C0 120F90 0070+00 1/1 0/0 0/0 .text create__15daAlink_sight_cFv */ +bool daAlink_sight_c::create() { + if (!mLockCursor.create()) { + return false; + } + ResTIMG* data = (ResTIMG*)dComIfG_getObjectRes(l_arcName, daAlink_c::getSightBti()); + setSightImage(data); + return true; +} + +/* 801266C0-80126710 121000 0050+00 1/0 0/0 0/0 .text draw__15daAlink_sight_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void draw__15daAlink_sight_cFv() { + // asm void daAlink_sight_c::draw() { + nofralloc +#include "asm/d/a/d_a_alink/draw__15daAlink_sight_cFv.s" +} +#pragma pop + +/* 80126710-80126740 121050 0030+00 2/2 0/0 0/0 .text onLockFlg__15daAlink_sight_cFv */ +// matches with literals +#ifdef NONMATCHING +void daAlink_sight_c::onLockFlg() { + if (mLockFlag) { + return; + } + mLockFlag = true; + mLockCursor.initFrame(); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_sight_c::onLockFlg() { + nofralloc +#include "asm/d/a/d_a_alink/onLockFlg__15daAlink_sight_cFv.s" +} +#pragma pop +#endif \ No newline at end of file diff --git a/src/d/a/d_a_alink_grab.inc b/src/d/a/d_a_alink_grab.inc new file mode 100644 index 00000000000..229df23a8fa --- /dev/null +++ b/src/d/a/d_a_alink_grab.inc @@ -0,0 +1,920 @@ +/* 800E3830-800E3858 0DE170 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallA__FP10fopAc_ac_c */ +static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) { + if (fopAcM_GetName(p_actor) == PROC_Obj_Carry && + static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S) { + return true; + } + return false; +} + +/* 800E3858-800E3880 0DE198 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallB__FP10fopAc_ac_c */ +static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor) { + if (fopAcM_GetName(p_actor) == PROC_Obj_Carry && + static_cast(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S_2) { + return true; + } + return false; +} + +/* 800E3880-800E38EC 0DE1C0 006C+00 1/1 0/0 0/0 .text daAlink_searchLightBall__FP10fopAc_ac_cPv */ +static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1) { + if ((daPy_py_c::checkCarryStartLightBallA() && daAlink_checkLightBallA(p_actor)) || + (daPy_py_c::checkCarryStartLightBallB() && daAlink_checkLightBallB(p_actor))) { + return p_actor; + } + return NULL; +} + +/* 800E38EC-800E3994 0DE22C 00A8+00 1/1 0/0 0/0 .text checkGrabLineCheck__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabLineCheck() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabLineCheck__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3994-800E3A14 0DE2D4 0080+00 1/0 0/0 0/0 .text + * setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { + if (param_2 != NULL) { + mPolyInfo4.SetPolyInfo(*param_2); + } else { + mPolyInfo4.ClearPi(); + } + + field_0x342c = param_0 * 0.8f; + field_0x3430 = param_1 * 0.8f; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo.s" +} +#pragma pop +#endif + +/* 800E3A14-800E3A9C 0DE354 0088+00 1/0 0/0 0/0 .text exchangeGrabActor__9daAlink_cFP10fopAc_ac_c + */ +bool daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) { + fopAc_ac_c* actor = mGrabItemAcKeep.getActor(); + + if (actor == NULL) { + return false; + } + + fopAcM_cancelCarryNow(actor); + actor->mCollisionRot.z = 0; + actor->mCollisionRot.x = 0; + if (checkGrabCarryActor()) { + actor->mCurrent.mAngle.z = 0; + actor->mCurrent.mAngle.x = 0; + } + setGrabItemActor(p_actor); + return true; +} + +/* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */ +bool daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) { + if (((param_1 != 0 || !checkEventRun()) && !i_checkWolf()) && + (((mEquipItem == NO_ITEM || (param_2 != 0 && checkHookshotItem(mEquipItem)))) && + ((i_checkModeFlg(MODE_UNK_10000000) && + (checkHorseNoUpperAnime() || checkHorseTurnAnime())) || + param_2 != 0 && checkHookshotAnime()))) { + deleteEquipItem(1, 0); + setGrabItemActor(p_actor); + field_0x33e4 = lit_8785; + setGrabUpperAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return true; + } + return false; +} + +/* 800E3BCC-800E3C1C 0DE50C 0050+00 2/2 0/0 0/0 .text getGrabThrowRate__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getGrabThrowRate() { + nofralloc +#include "asm/d/a/d_a_alink/getGrabThrowRate__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3C1C-800E3C6C 0DE55C 0050+00 3/3 0/0 0/0 .text checkGrabThrowAnime__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabThrowAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabThrowAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800E3C6C-800E3C9C 0DE5AC 0030+00 25/25 0/0 0/0 .text checkGrabAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800E3C9C-800E3CF4 0DE5DC 0058+00 5/5 0/0 0/0 .text checkGrabAnimeAndThrow__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabAnimeAndThrow() const { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabAnimeAndThrow__9daAlink_cCFv.s" +} +#pragma pop + +/* 800E3CF4-800E3D1C 0DE634 0028+00 10/10 0/0 0/0 .text checkGrabCarryActor__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkGrabCarryActor() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabCarryActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3D1C-800E3D6C 0DE65C 0050+00 1/1 0/0 0/0 .text checkGrabSlowMoveActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabSlowMoveActor() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabSlowMoveActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3D6C-800E3D94 0DE6AC 0028+00 1/1 0/0 0/0 .text checkGrabHeavyActor__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabHeavyActor() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabHeavyActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3D94-800E3DBC 0DE6D4 0028+00 2/2 0/0 0/0 .text checkGrabSideActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabSideActor() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabSideActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3DBC-800E3F20 0DE6FC 0164+00 5/5 0/0 0/0 .text setGrabUpperAnime__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabUpperAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGrabUpperAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 800E3F20-800E3F50 0DE860 0030+00 8/8 0/0 0/0 .text checkGrabRooster__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabRooster() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabRooster__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80425628-80425634 052348 000C+00 0/1 0/0 0/0 .bss @4421 */ +#pragma push +#pragma force_active on +static u8 lit_4421[12]; +#pragma pop + +/* 80425634-80425640 052354 000C+00 2/3 0/0 0/0 .bss l_wolfRopeBaseAnime */ +static f32 l_wolfRopeBaseAnime[3]; + +/* 80425640-8042564C 052360 000C+00 0/1 0/0 0/0 .bss @14255 */ +#pragma push +#pragma force_active on +static u8 lit_14255[12]; +#pragma pop + +/* 8042564C-80425658 05236C 000C+00 0/1 0/0 0/0 .bss grabCarryOffset0$14254 */ +#pragma push +#pragma force_active on +static u8 grabCarryOffset0[12]; +#pragma pop + +/* 80425658-80425664 052378 000C+00 0/1 0/0 0/0 .bss @14259 */ +#pragma push +#pragma force_active on +static u8 lit_14259[12]; +#pragma pop + +/* 80425664-80425670 052384 000C+00 0/1 0/0 0/0 .bss grabCarryOffset1$14258 */ +#pragma push +#pragma force_active on +static u8 grabCarryOffset1[12]; +#pragma pop + +/* 80425670-8042567C 052390 000C+00 0/1 0/0 0/0 .bss @14263 */ +#pragma push +#pragma force_active on +static u8 lit_14263[12]; +#pragma pop + +/* 8042567C-80425688 05239C 000C+00 0/1 0/0 0/0 .bss grabCarryOffset2$14262 */ +#pragma push +#pragma force_active on +static u8 grabCarryOffset2[12]; +#pragma pop + +/* 80425688-80425694 0523A8 000C+00 0/1 0/0 0/0 .bss @14267 */ +#pragma push +#pragma force_active on +static u8 lit_14267[12]; +#pragma pop + +/* 80425694-804256A0 0523B4 000C+00 0/1 0/0 0/0 .bss grabCarryOffset3$14266 */ +#pragma push +#pragma force_active on +static u8 grabCarryOffset3[12]; +#pragma pop + +/* 800E3F50-800E4BD4 0DE890 0C84+00 1/1 0/0 0/0 .text setGrabItemPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabItemPos() { + nofralloc +#include "asm/d/a/d_a_alink/setGrabItemPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800E4BD4-800E4DEC 0DF514 0218+00 16/16 0/0 0/0 .text freeGrabItem__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::freeGrabItem() { + nofralloc +#include "asm/d/a/d_a_alink/freeGrabItem__9daAlink_cFv.s" +} +#pragma pop + +/* 800E4DEC-800E4FA8 0DF72C 01BC+00 1/1 0/0 0/0 .text setGrabUpperSpeedRate__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabUpperSpeedRate() { + nofralloc +#include "asm/d/a/d_a_alink/setGrabUpperSpeedRate__9daAlink_cFv.s" +} +#pragma pop + +/* 800E4FA8-800E5150 0DF8E8 01A8+00 7/7 0/0 0/0 .text setCarryArmAngle__9daAlink_cFff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setCarryArmAngle__9daAlink_cFff.s" +} +#pragma pop + +/* 800E5150-800E5170 0DFA90 0020+00 1/1 0/0 0/0 .text checkGrabNotThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGrabNotThrow() { + nofralloc +#include "asm/d/a/d_a_alink/checkGrabNotThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800E5170-800E53AC 0DFAB0 023C+00 1/1 0/0 0/0 .text checkNextActionGrab__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionGrab() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionGrab__9daAlink_cFv.s" +} +#pragma pop + +/* 800E53AC-800E53F8 0DFCEC 004C+00 2/2 0/0 0/0 .text initGrabNextMode__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initGrabNextMode() { + nofralloc +#include "asm/d/a/d_a_alink/initGrabNextMode__9daAlink_cFv.s" +} +#pragma pop + +/* 800E53F8-800E57AC 0DFD38 03B4+00 3/3 0/0 0/0 .text setGrabItemThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabItemThrow() { + nofralloc +#include "asm/d/a/d_a_alink/setGrabItemThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800E57AC-800E5830 0E00EC 0084+00 2/2 0/0 0/0 .text checkUpperGrabItemThrow__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperGrabItemThrow(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperGrabItemThrow__9daAlink_cFf.s" +} +#pragma pop + +/* 800E5830-800E5B6C 0E0170 033C+00 2/2 0/0 0/0 .text + * putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c.s" +} +#pragma pop + +/* 800E5B6C-800E5BB4 0E04AC 0048+00 3/3 0/0 0/0 .text grabLineCheck__9daAlink_cFP4cXyzP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::grabLineCheck(cXyz* param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/grabLineCheck__9daAlink_cFP4cXyzP4cXyz.s" +} +#pragma pop + +/* 800E5BB4-800E5CBC 0E04F4 0108+00 6/6 0/0 0/0 .text setGrabItemActor__9daAlink_cFP10fopAc_ac_c + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrabItemActor(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGrabItemActor__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800E5CBC-800E5EC8 0E05FC 020C+00 2/2 0/0 0/0 .text procGrabReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E5EC8-800E5FD0 0E0808 0108+00 1/0 0/0 0/0 .text procGrabReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabReady() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabReady__9daAlink_cFv.s" +} +#pragma pop + +/* 800E5FD0-800E6230 0E0910 0260+00 1/1 0/0 0/0 .text procGrabUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6230-800E637C 0E0B70 014C+00 1/0 0/0 0/0 .text procGrabUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabUp() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800E637C-800E63F0 0E0CBC 0074+00 1/0 0/0 0/0 .text procGrabMiss__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabMiss() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabMiss__9daAlink_cFv.s" +} +#pragma pop + +/* 800E63F0-800E65F8 0E0D30 0208+00 1/1 0/0 0/0 .text procGrabThrowInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabThrowInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procGrabThrowInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800E65F8-800E672C 0E0F38 0134+00 1/0 0/0 0/0 .text procGrabThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabThrow() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 800E672C-800E6914 0E106C 01E8+00 2/2 0/0 0/0 .text procGrabPutInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabPutInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabPutInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6914-800E6A9C 0E1254 0188+00 1/0 0/0 0/0 .text procGrabPut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabPut() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabPut__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6A9C-800E6C34 0E13DC 0198+00 2/2 0/0 0/0 .text procGrabWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6C34-800E6D6C 0E1574 0138+00 1/0 0/0 0/0 .text procGrabWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabWait() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6D6C-800E6E0C 0E16AC 00A0+00 2/2 0/0 0/0 .text procGrabReboundInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabReboundInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procGrabReboundInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800E6E0C-800E6EEC 0E174C 00E0+00 1/0 0/0 0/0 .text procGrabRebound__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabRebound() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabRebound__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6EEC-800E6FE0 0E182C 00F4+00 2/2 0/0 0/0 .text procGrabStandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabStandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabStandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E6FE0-800E70C0 0E1920 00E0+00 1/0 0/0 0/0 .text procGrabStand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrabStand() { + nofralloc +#include "asm/d/a/d_a_alink/procGrabStand__9daAlink_cFv.s" +} +#pragma pop + +/* 800E70C0-800E70FC 0E1A00 003C+00 1/1 0/0 0/0 .text + * checkInsectActorName__9daAlink_cFP10fopAc_ac_c */ +bool daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) { + s16 insectName = fopAcM_GetName(insectActor); + + for (int i = 0; i < 12; i++) { + if (insectName == l_insectNameList[i]) { + return true; + } + } + return false; +} + +/* 800E70FC-800E71D4 0E1A3C 00D8+00 2/2 0/0 0/0 .text procInsectCatchInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procInsectCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procInsectCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E71D4-800E7254 0E1B14 0080+00 1/0 0/0 0/0 .text procInsectCatch__9daAlink_cFv */ +bool daAlink_c::procInsectCatch() { + daPy_frameCtrl_c* tmp = &mFrameCtrl1[0]; + + if (tmp->checkAnmEnd()) { + checkNextAction(0); + } else { + if (tmp->checkPass(field_0x3478)) { + fopAc_ac_c* tmp2 = field_0x280c.getActor(); + if (tmp2 != NULL) { + fopAcM_setCarryNow(tmp2, 0); + } + } + } + return true; +} + +/* 800E7254-800E7460 0E1B94 020C+00 2/2 0/0 0/0 .text procPickUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPickUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procPickUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7460-800E75EC 0E1DA0 018C+00 1/0 0/0 0/0 .text procPickUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPickUp() { + nofralloc +#include "asm/d/a/d_a_alink/procPickUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800E75EC-800E76E0 0E1F2C 00F4+00 3/3 0/0 0/0 .text procPickPutInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPickPutInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procPickPutInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800E76E0-800E7894 0E2020 01B4+00 1/0 0/0 0/0 .text procPickPut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPickPut() { + nofralloc +#include "asm/d/a/d_a_alink/procPickPut__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7894-800E794C 0E21D4 00B8+00 2/2 0/0 0/0 .text checkSetChainPullAnime__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSetChainPullAnime(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkSetChainPullAnime__9daAlink_cFs.s" +} +#pragma pop + +/* 800E794C-800E7994 0E228C 0048+00 3/3 0/0 0/0 .text getChainStickAngleY__9daAlink_cCFs + */ +// one instruction off +#ifdef NONMATCHING +s16 daAlink_c::getChainStickAngleY(s16 param_0) const { + s16 tmp = field_0x2fe2 - param_0; + + if (tmp >= 14336 && tmp < 32640) { + return param_0 + 32640; + } else if (tmp <= -14336 && tmp <= -32640) { + return field_0x2fe2; + } + return param_0 - 32640; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm s16 daAlink_c::getChainStickAngleY(s16 param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/getChainStickAngleY__9daAlink_cCFs.s" +} +#pragma pop +#endif + +/* 800E7994-800E79F8 0E22D4 0064+00 1/1 0/0 0/0 .text checkChainEmphasys__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkChainEmphasys() { + nofralloc +#include "asm/d/a/d_a_alink/checkChainEmphasys__9daAlink_cFv.s" +} +#pragma pop + +/* 800E79F8-800E7AEC 0E2338 00F4+00 4/4 0/0 0/0 .text searchFmChainPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::searchFmChainPos() { + nofralloc +#include "asm/d/a/d_a_alink/searchFmChainPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7AEC-800E7BD0 0E242C 00E4+00 0/0 1/1 0/0 .text + * setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi.s" +} +#pragma pop + +/* 800E7BD0-800E7C30 0E2510 0060+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daAlink_cFv */ +bool daAlink_c::checkChainBlockPushPull() { + if (i_checkFmChainGrabAnime()) { + fopAc_ac_c* actor = field_0x2844.getActor(); + if (actor != NULL) { + s16 name = fopAcM_GetName(actor); + // actor is Cblock || chainSw || Cwall + if (name == 0x7E || name == 0x16F || name == 0x7F) { + return true; + } + } + } + return false; +} + +/* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text procFmChainUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFmChainUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFmChainUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7CC0-800E7DD8 0E2600 0118+00 1/0 0/0 0/0 .text procFmChainUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFmChainUp() { + nofralloc +#include "asm/d/a/d_a_alink/procFmChainUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7DD8-800E7E50 0E2718 0078+00 2/1 0/0 0/0 .text procFmChainStrongPullInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFmChainStrongPullInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFmChainStrongPullInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7E50-800E7ED0 0E2790 0080+00 1/0 0/0 0/0 .text procFmChainStrongPull__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFmChainStrongPull() { + nofralloc +#include "asm/d/a/d_a_alink/procFmChainStrongPull__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7ED0-800E7EE4 0E2810 0014+00 9/9 0/0 0/0 .text setWallGrabStatus__9daAlink_cFUcUc + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWallGrabStatus(u8 param_0, u8 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setWallGrabStatus__9daAlink_cFUcUc.s" +} +#pragma pop + +/* 800E7EE4-800E7EF4 0E2824 0010+00 2/2 0/0 0/0 .text getWallGrabStatus__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWallGrabStatus() { + nofralloc +#include "asm/d/a/d_a_alink/getWallGrabStatus__9daAlink_cFv.s" +} +#pragma pop + +/* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text wallGrabTrigger__9daAlink_cFv */ +void daAlink_c::wallGrabTrigger() { + itemTriggerCheck(BTN_R); +} + +/* 800E7F18-800E7F3C 0E2858 0024+00 4/4 0/0 0/0 .text wallGrabButton__9daAlink_cFv */ +void daAlink_c::wallGrabButton() { + itemButtonCheck(BTN_R); +} + +/* 800E7F3C-800E80A4 0E287C 0168+00 4/4 0/0 0/0 .text + * setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli.s" +} +#pragma pop + +/* 800E80A4-800E8148 0E29E4 00A4+00 2/2 0/0 0/0 .text checkPushPullTurnBlock__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkPushPullTurnBlock() { + nofralloc +#include "asm/d/a/d_a_alink/checkPushPullTurnBlock__9daAlink_cFv.s" +} +#pragma pop + +/* 800E8148-800E8298 0E2A88 0150+00 1/1 0/0 0/0 .text checkPullBehindWall__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkPullBehindWall() { + nofralloc +#include "asm/d/a/d_a_alink/checkPullBehindWall__9daAlink_cFv.s" +} +#pragma pop + +/* 800E8298-800E82B0 0E2BD8 0018+00 3/3 0/0 0/0 .text offGoatStopGame__9daAlink_cFv */ +void daAlink_c::offGoatStopGame() { + if (mSpecialMode != SMODE_GOAT_STOP) { + return; + } else { + mSpecialMode = 0; + } +} + +/* 800E82B0-800E8314 0E2BF0 0064+00 4/4 0/0 0/0 .text + * checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c */ +#ifdef NONMATCHING +BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { + s16 name = fopAcM_GetName(param_0); + bool check = false; + + if (name == 0x1b1 || name == 0x21) { + if (checkSpecialNpc(param_0) || name == 0x106) { + check = true; + } + } + + return check; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop +#endif + +/* 800E8314-800E8334 0E2C54 0020+00 2/2 0/0 0/0 .text getGoatCatchDistance2__9daAlink_cFv + */ +float daAlink_c::getGoatCatchDistance2() { + if (field_0x27f4->mBase.mProcName == 0x216) { + return lit_16066; + } + return lit_16067; +} + +/* 800E8334-800E8354 0E2C74 0020+00 3/3 0/0 0/0 .text endPushPull__9daAlink_cFv */ +void daAlink_c::endPushPull() { + checkWaitAction(); +} + +/* 800E8354-800E8428 0E2C94 00D4+00 2/2 0/0 0/0 .text getPushPullAnimeSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getPushPullAnimeSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getPushPullAnimeSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800E8428-800E857C 0E2D68 0154+00 4/4 0/0 0/0 .text procCoPushPullWaitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPushPullWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCoPushPullWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800E857C-800E875C 0E2EBC 01E0+00 1/0 0/0 0/0 .text procCoPushPullWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPushPullWait() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPushPullWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800E875C-800E89F0 0E309C 0294+00 2/2 0/0 0/0 .text procCoPushMoveInit__9daAlink_cFii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPushMoveInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procCoPushMoveInit__9daAlink_cFii.s" +} +#pragma pop + +/* 800E89F0-800E8D1C 0E3330 032C+00 1/0 0/0 0/0 .text procCoPushMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPushMove() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPushMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800E8D1C-800E8F44 0E365C 0228+00 2/2 0/0 0/0 .text procPullMoveInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPullMoveInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procPullMoveInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800E8F44-800E91B0 0E3884 026C+00 1/0 0/0 0/0 .text procPullMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPullMove() { + nofralloc +#include "asm/d/a/d_a_alink/procPullMove__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_guard.inc b/src/d/a/d_a_alink_guard.inc new file mode 100644 index 00000000000..11cf4100822 --- /dev/null +++ b/src/d/a/d_a_alink_guard.inc @@ -0,0 +1,282 @@ +/* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkEnemyGroup__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkSpecialNpc__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkShieldAttackEmphasys() { + nofralloc +#include "asm/d/a/d_a_alink/checkShieldAttackEmphasys__9daAlink_cFv.s" +} +#pragma pop + +/* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkGuardActionChange() { + nofralloc +#include "asm/d/a/d_a_alink/checkGuardActionChange__9daAlink_cFv.s" +} +#pragma pop + +/* 800DC79C-800DC8C4 0D70DC 0128+00 3/3 0/0 0/0 .text stickArrowIncrement__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::stickArrowIncrement(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/stickArrowIncrement__9daAlink_cFi.s" +} +#pragma pop + +/* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text + * setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setArrowShieldActor(fopAc_ac_c* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci.s" +} +#pragma pop + +/* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text + * checkWoodShieldEquipNotIronBall__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWoodShieldEquipNotIronBall() const { + nofralloc +#include "asm/d/a/d_a_alink/checkWoodShieldEquipNotIronBall__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text + * getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1, cXyz* param_2, + cXyz* param_3) const { + nofralloc +#include "asm/d/a/d_a_alink/getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz.s" +} +#pragma pop + +/* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text + * setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* param_2, + cXyz const* param_3) const { + nofralloc +#include "asm/d/a/d_a_alink/setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz.s" +} +#pragma pop + +/* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkUpperGuardAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperGuardAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */ +#ifdef NONMATCHING +BOOL daAlink_c::checkPlayerGuard() const { + bool ret = true; + bool bvar2 = true; + if (!i_checkSmallUpperGuardAnime()) { + bool bvar1 = false; + if (i_checkShieldGet() && checkHorseLieAnime()) { + bvar1 = true; + } + if (!bvar1) { + bvar2 = false; + } + } + + if (!bvar2 && !checkUpperGuardAnime()) { + ret = false; + } + + return ret; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkPlayerGuard() const { + nofralloc +#include "asm/d/a/d_a_alink/checkPlayerGuard__9daAlink_cCFv.s" +} +#pragma pop +#endif + +/* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkPlayerGuardAndAttack() const { + nofralloc +#include "asm/d/a/d_a_alink/checkPlayerGuardAndAttack__9daAlink_cCFv.s" +} +#pragma pop + +/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkGuardAccept() { + nofralloc +#include "asm/d/a/d_a_alink/checkGuardAccept__9daAlink_cFv.s" +} +#pragma pop + +/* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text setUpperGuardAnime__9daAlink_cFf + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setUpperGuardAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setUpperGuardAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text setShieldGuard__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setShieldGuard() { + nofralloc +#include "asm/d/a/d_a_alink/setShieldGuard__9daAlink_cFv.s" +} +#pragma pop + +/* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGuardSe(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGuardSe__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSmallGuard(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSmallGuard__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text + * procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800DD894-800DDA10 0D81D4 017C+00 1/0 0/0 0/0 .text procGuardSlip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardSlip() { + nofralloc +#include "asm/d/a/d_a_alink/procGuardSlip__9daAlink_cFv.s" +} +#pragma pop + +/* 800DDA10-800DDBA8 0D8350 0198+00 2/1 0/0 0/0 .text procGuardAttackInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardAttackInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGuardAttackInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DDBA8-800DDE58 0D84E8 02B0+00 1/0 0/0 0/0 .text procGuardAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procGuardAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 800DDE58-800DDF2C 0D8798 00D4+00 2/2 0/0 0/0 .text procGuardBreakInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardBreakInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGuardBreakInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800DDF2C-800DE008 0D886C 00DC+00 1/0 0/0 0/0 .text procGuardBreak__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGuardBreak() { + nofralloc +#include "asm/d/a/d_a_alink/procGuardBreak__9daAlink_cFv.s" +} +#pragma pop + +/* 800DE008-800DE380 0D8948 0378+00 2/2 0/0 0/0 .text procTurnMoveInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::procTurnMoveInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procTurnMoveInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800DE380-800DE64C 0D8CC0 02CC+00 1/0 0/0 0/0 .text procTurnMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procTurnMove() { + nofralloc +#include "asm/d/a/d_a_alink/procTurnMove__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_hang.inc b/src/d/a/d_a_alink_hang.inc new file mode 100644 index 00000000000..aa285e3a141 --- /dev/null +++ b/src/d/a/d_a_alink_hang.inc @@ -0,0 +1,1001 @@ +/* 800F9FDC-800F9FFC 0F491C 0020+00 2/2 0/0 0/0 .text getHangMoveAnmSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getHangMoveAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getHangMoveAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800F9FFC-800FA070 0F493C 0074+00 3/3 0/0 0/0 .text getHangDirectionFromAngle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getHangDirectionFromAngle() { + nofralloc +#include "asm/d/a/d_a_alink/getHangDirectionFromAngle__9daAlink_cFv.s" +} +#pragma pop + +/* 800FA070-800FA338 0F49B0 02C8+00 2/2 0/0 0/0 .text hangMoveBgCheck__9daAlink_cFsP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/hangMoveBgCheck__9daAlink_cFsP4cXyz.s" +} +#pragma pop + +/* 800FA338-800FA5C8 0F4C78 0290+00 3/3 0/0 0/0 .text changeHangMoveProc__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeHangMoveProc(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeHangMoveProc__9daAlink_cFi.s" +} +#pragma pop + +/* 800FA5C8-800FA6E4 0F4F08 011C+00 5/5 0/0 0/0 .text checkHangFootWall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHangFootWall() { + nofralloc +#include "asm/d/a/d_a_alink/checkHangFootWall__9daAlink_cFv.s" +} +#pragma pop + +/* 800FA6E4-800FA78C 0F5024 00A8+00 10/10 0/0 0/0 .text setHangGroundY__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHangGroundY() { + nofralloc +#include "asm/d/a/d_a_alink/setHangGroundY__9daAlink_cFv.s" +} +#pragma pop + +/* 800FA78C-800FA85C 0F50CC 00D0+00 5/5 0/0 0/0 .text changeHangEndProc__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeHangEndProc() { + nofralloc +#include "asm/d/a/d_a_alink/changeHangEndProc__9daAlink_cFv.s" +} +#pragma pop + +/* 800FA85C-800FAA7C 0F519C 0220+00 3/3 0/0 0/0 .text checkHangStartSideWall__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHangStartSideWall(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkHangStartSideWall__9daAlink_cFs.s" +} +#pragma pop + +/* 800FAA7C-800FAE14 0F53BC 0398+00 3/3 0/0 0/0 .text procHangStartInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangStartInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHangStartInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FAE14-800FAECC 0F5754 00B8+00 1/0 0/0 0/0 .text procHangStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangStart() { + nofralloc +#include "asm/d/a/d_a_alink/procHangStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FAECC-800FB1A4 0F580C 02D8+00 1/1 0/0 0/0 .text procHangFallStartInit__9daAlink_cFP8cM3dGPla + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHangFallStartInit__9daAlink_cFP8cM3dGPla.s" +} +#pragma pop + +/* 800FB1A4-800FB2A0 0F5AE4 00FC+00 1/0 0/0 0/0 .text procHangFallStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangFallStart() { + nofralloc +#include "asm/d/a/d_a_alink/procHangFallStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FB2A0-800FB328 0F5BE0 0088+00 1/1 0/0 0/0 .text procHangUpInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangUpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHangUpInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FB328-800FB43C 0F5C68 0114+00 1/0 0/0 0/0 .text procHangUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangUp() { + nofralloc +#include "asm/d/a/d_a_alink/procHangUp__9daAlink_cFv.s" +} +#pragma pop + +/* 800FB43C-800FB544 0F5D7C 0108+00 3/3 0/0 0/0 .text procHangWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHangWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FB544-800FB650 0F5E84 010C+00 1/0 0/0 0/0 .text procHangWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangWait() { + nofralloc +#include "asm/d/a/d_a_alink/procHangWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800FB650-800FB790 0F5F90 0140+00 3/3 0/0 0/0 .text procHangMoveInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangMoveInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHangMoveInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FB790-800FBBC8 0F60D0 0438+00 1/0 0/0 0/0 .text procHangMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHangMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800FBBC8-800FBCD4 0F6508 010C+00 6/6 0/0 0/0 .text procHangClimbInit__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangClimbInit(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHangClimbInit__9daAlink_cFf.s" +} +#pragma pop + +/* 800FBCD4-800FBE04 0F6614 0130+00 1/0 0/0 0/0 .text procHangClimb__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangClimb() { + nofralloc +#include "asm/d/a/d_a_alink/procHangClimb__9daAlink_cFv.s" +} +#pragma pop + +/* 800FBE04-800FC0D8 0F6744 02D4+00 3/3 0/0 0/0 .text procHangWallCatchInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangWallCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHangWallCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC0D8-800FC178 0F6A18 00A0+00 1/0 0/0 0/0 .text procHangWallCatch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangWallCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procHangWallCatch__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC178-800FC240 0F6AB8 00C8+00 4/4 0/0 0/0 .text procHangReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHangReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC240-800FC2F4 0F6B80 00B4+00 1/0 0/0 0/0 .text procHangReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangReady() { + nofralloc +#include "asm/d/a/d_a_alink/procHangReady__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC2F4-800FC390 0F6C34 009C+00 2/2 0/0 0/0 .text procHangLeverDownInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangLeverDownInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHangLeverDownInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC390-800FC568 0F6CD0 01D8+00 1/0 0/0 0/0 .text procHangLeverDown__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHangLeverDown() { + nofralloc +#include "asm/d/a/d_a_alink/procHangLeverDown__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC568-800FC5A4 0F6EA8 003C+00 1/0 0/0 0/0 .text changeDragonActor__9daAlink_cFP10fopAc_ac_c + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeDragonActor(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeDragonActor__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800FC5A4-800FC6B4 0F6EE4 0110+00 1/1 0/0 0/0 .text setDragonHangPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDragonHangPos() { + nofralloc +#include "asm/d/a/d_a_alink/setDragonHangPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC6B4-800FC748 0F6FF4 0094+00 1/1 0/0 0/0 .text setOctaIealHangPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setOctaIealHangPos() { + nofralloc +#include "asm/d/a/d_a_alink/setOctaIealHangPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC748-800FC77C 0F7088 0034+00 2/2 0/0 0/0 .text setBossBodyHangPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBossBodyHangPos() { + nofralloc +#include "asm/d/a/d_a_alink/setBossBodyHangPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800FC77C-800FC870 0F70BC 00F4+00 1/1 0/0 0/0 .text + * procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800FC870-800FCF58 0F71B0 06E8+00 1/0 0/0 0/0 .text procBossBodyHang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBossBodyHang() { + nofralloc +#include "asm/d/a/d_a_alink/procBossBodyHang__9daAlink_cFv.s" +} +#pragma pop + +/* 800FCF58-800FCF84 0F7898 002C+00 2/2 0/0 0/0 .text getLadderUnitCount__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getLadderUnitCount() const { + nofralloc +#include "asm/d/a/d_a_alink/getLadderUnitCount__9daAlink_cCFv.s" +} +#pragma pop + +/* 800FCF84-800FD048 0F78C4 00C4+00 1/1 0/0 0/0 .text setLadderInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setLadderInit() { + nofralloc +#include "asm/d/a/d_a_alink/setLadderInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD048-800FD1F0 0F7988 01A8+00 1/1 0/0 0/0 .text setLadderPosInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setLadderPosInit() { + nofralloc +#include "asm/d/a/d_a_alink/setLadderPosInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD1F0-800FD288 0F7B30 0098+00 2/2 0/0 0/0 .text setLadderPos__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setLadderPos(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setLadderPos__9daAlink_cFi.s" +} +#pragma pop + +/* 800FD288-800FD2AC 0F7BC8 0024+00 2/2 0/0 0/0 .text getLadderMoveAnmSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getLadderMoveAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getLadderMoveAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD2AC-800FD4A8 0F7BEC 01FC+00 3/3 0/0 0/0 .text changeLadderMoveProc__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeLadderMoveProc(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeLadderMoveProc__9daAlink_cFi.s" +} +#pragma pop + +/* 800FD4A8-800FD5E4 0F7DE8 013C+00 5/5 0/0 0/0 .text setMoveBGLadderCorrect__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMoveBGLadderCorrect() { + nofralloc +#include "asm/d/a/d_a_alink/setMoveBGLadderCorrect__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD5E4-800FD648 0F7F24 0064+00 8/8 0/0 0/0 .text checkLadderFall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkLadderFall() { + nofralloc +#include "asm/d/a/d_a_alink/checkLadderFall__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD648-800FD7B0 0F7F88 0168+00 2/2 0/0 0/0 .text procLadderUpStartInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderUpStartInit() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderUpStartInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD7B0-800FD824 0F80F0 0074+00 1/0 0/0 0/0 .text procLadderUpStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderUpStart() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderUpStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD824-800FD8E8 0F8164 00C4+00 2/2 0/0 0/0 .text procLadderUpEndInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderUpEndInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procLadderUpEndInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FD8E8-800FD9CC 0F8228 00E4+00 1/0 0/0 0/0 .text procLadderUpEnd__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderUpEnd() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderUpEnd__9daAlink_cFv.s" +} +#pragma pop + +/* 800FD9CC-800FDB74 0F830C 01A8+00 2/2 0/0 0/0 .text procLadderDownStartInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderDownStartInit() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderDownStartInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FDB74-800FDC18 0F84B4 00A4+00 1/0 0/0 0/0 .text procLadderDownStart__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderDownStart() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderDownStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FDC18-800FDCCC 0F8558 00B4+00 1/1 0/0 0/0 .text procLadderDownEndInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderDownEndInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procLadderDownEndInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FDCCC-800FDD90 0F860C 00C4+00 1/0 0/0 0/0 .text procLadderDownEnd__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderDownEnd() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderDownEnd__9daAlink_cFv.s" +} +#pragma pop + +/* 800FDD90-800FDF50 0F86D0 01C0+00 3/3 0/0 0/0 .text procLadderMoveInit__9daAlink_cFiiP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procLadderMoveInit__9daAlink_cFiiP4cXyz.s" +} +#pragma pop + +/* 800FDF50-800FE010 0F8890 00C0+00 1/0 0/0 0/0 .text procLadderMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLadderMove() { + nofralloc +#include "asm/d/a/d_a_alink/procLadderMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE010-800FE034 0F8950 0024+00 3/3 0/0 0/0 .text getClimbMoveUpDownAnmSpeed__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getClimbMoveUpDownAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getClimbMoveUpDownAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE034-800FE058 0F8974 0024+00 4/4 0/0 0/0 .text getClimbMoveSideAnmSpeed__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getClimbMoveSideAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getClimbMoveSideAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE058-800FE114 0F8998 00BC+00 9/9 0/0 0/0 .text checkClimbCode__9daAlink_cFR13cBgS_PolyInfo + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkClimbCode(cBgS_PolyInfo& param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkClimbCode__9daAlink_cFR13cBgS_PolyInfo.s" +} +#pragma pop + +/* 800FE114-800FE174 0F8A54 0060+00 1/1 0/0 0/0 .text setClimbInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setClimbInit() { + nofralloc +#include "asm/d/a/d_a_alink/setClimbInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE174-800FE3C4 0F8AB4 0250+00 8/8 0/0 0/0 .text setClimbShapeOffset__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setClimbShapeOffset() { + nofralloc +#include "asm/d/a/d_a_alink/setClimbShapeOffset__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE3C4-800FE438 0F8D04 0074+00 1/1 0/0 0/0 .text getClimbDirectionFromAngle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getClimbDirectionFromAngle() { + nofralloc +#include "asm/d/a/d_a_alink/getClimbDirectionFromAngle__9daAlink_cFv.s" +} +#pragma pop + +/* 800FE438-800FE5A0 0F8D78 0168+00 3/3 0/0 0/0 .text changeClimbMoveProc__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeClimbMoveProc(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeClimbMoveProc__9daAlink_cFi.s" +} +#pragma pop + +/* 800FE5A0-800FE6E8 0F8EE0 0148+00 2/2 0/0 0/0 .text checkClimbMoveUpDownProc__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkClimbMoveUpDownProc(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkClimbMoveUpDownProc__9daAlink_cFi.s" +} +#pragma pop + +/* 800FE6E8-800FE868 0F9028 0180+00 2/2 0/0 0/0 .text checkClimbMoveSideProc__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkClimbMoveSideProc(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkClimbMoveSideProc__9daAlink_cFi.s" +} +#pragma pop + +/* 800FE868-800FEB90 0F91A8 0328+00 6/6 0/0 0/0 .text setMoveBGClimbCorrect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMoveBGClimbCorrect() { + nofralloc +#include "asm/d/a/d_a_alink/setMoveBGClimbCorrect__9daAlink_cFv.s" +} +#pragma pop + +/* 800FEB90-800FEC70 0F94D0 00E0+00 1/1 0/0 0/0 .text + * checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBgCorrectClimbMove(cXyz* param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz.s" +} +#pragma pop + +/* 800FEC70-800FED50 0F95B0 00E0+00 2/2 0/0 0/0 .text checkClimbRoof__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkClimbRoof(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkClimbRoof__9daAlink_cFf.s" +} +#pragma pop + +/* 800FED50-800FEEC0 0F9690 0170+00 2/2 0/0 0/0 .text checkClimbGround__9daAlink_cFP4cXyzf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/checkClimbGround__9daAlink_cFP4cXyzf.s" +} +#pragma pop + +/* 800FEEC0-800FF28C 0F9800 03CC+00 5/5 0/0 0/0 .text checkBgClimbMove__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBgClimbMove(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkBgClimbMove__9daAlink_cFi.s" +} +#pragma pop + +/* 800FF28C-800FF450 0F9BCC 01C4+00 2/2 0/0 0/0 .text setClimbStartNotGround__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setClimbStartNotGround() { + nofralloc +#include "asm/d/a/d_a_alink/setClimbStartNotGround__9daAlink_cFv.s" +} +#pragma pop + +/* 800FF450-800FF704 0F9D90 02B4+00 2/2 0/0 0/0 .text procClimbUpStartInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbUpStartInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procClimbUpStartInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FF704-800FF818 0FA044 0114+00 1/0 0/0 0/0 .text procClimbUpStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbUpStart() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbUpStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FF818-800FF9A8 0FA158 0190+00 1/1 0/0 0/0 .text procClimbDownStartInit__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbDownStartInit(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procClimbDownStartInit__9daAlink_cFs.s" +} +#pragma pop + +/* 800FF9A8-800FFAB0 0FA2E8 0108+00 1/0 0/0 0/0 .text procClimbDownStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbDownStart() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbDownStart__9daAlink_cFv.s" +} +#pragma pop + +/* 800FFAB0-800FFC58 0FA3F0 01A8+00 1/1 0/0 0/0 .text procClimbMoveUpDownInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbMoveUpDownInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procClimbMoveUpDownInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800FFC58-800FFDB0 0FA598 0158+00 1/0 0/0 0/0 .text procClimbMoveUpDown__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbMoveUpDown() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbMoveUpDown__9daAlink_cFv.s" +} +#pragma pop + +/* 800FFDB0-800FFF4C 0FA6F0 019C+00 1/1 0/0 0/0 .text procClimbMoveSideInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbMoveSideInit() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbMoveSideInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800FFF4C-801000F8 0FA88C 01AC+00 1/0 0/0 0/0 .text procClimbMoveSide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbMoveSide() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbMoveSide__9daAlink_cFv.s" +} +#pragma pop + +/* 801000F8-80100258 0FAA38 0160+00 7/7 0/0 0/0 .text procClimbWaitInit__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbWaitInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procClimbWaitInit__9daAlink_cFii.s" +} +#pragma pop + +/* 80100258-801003E4 0FAB98 018C+00 1/0 0/0 0/0 .text procClimbWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbWait() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbWait__9daAlink_cFv.s" +} +#pragma pop + +/* 801003E4-80100464 0FAD24 0080+00 2/2 0/0 0/0 .text procClimbToRoofInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbToRoofInit() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbToRoofInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80100464-801005CC 0FADA4 0168+00 1/0 0/0 0/0 .text procClimbToRoof__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procClimbToRoof() { + nofralloc +#include "asm/d/a/d_a_alink/procClimbToRoof__9daAlink_cFv.s" +} +#pragma pop + +/* 801005CC-801005F0 0FAF0C 0024+00 2/2 0/0 0/0 .text getRoofHangFMoveAnmSpeed__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getRoofHangFMoveAnmSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getRoofHangFMoveAnmSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 801005F0-80100614 0FAF30 0024+00 2/2 0/0 0/0 .text getRoofHangSMoveAnmSpeed__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getRoofHangSMoveAnmSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getRoofHangSMoveAnmSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 80100614-80100668 0FAF54 0054+00 3/3 0/0 0/0 .text + * setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo.s" +} +#pragma pop + +/* 80100668-80100770 0FAFA8 0108+00 3/3 0/0 0/0 .text checkRoofHangMovePos__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkRoofHangMovePos() { + nofralloc +#include "asm/d/a/d_a_alink/checkRoofHangMovePos__9daAlink_cFv.s" +} +#pragma pop + +/* 80100770-801008EC 0FB0B0 017C+00 5/5 0/0 0/0 .text commonRoofHangProc__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonRoofHangProc() { + nofralloc +#include "asm/d/a/d_a_alink/commonRoofHangProc__9daAlink_cFv.s" +} +#pragma pop + +/* 801008EC-80100A10 0FB22C 0124+00 5/5 0/0 0/0 .text checkNextActionRoofHang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionRoofHang() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionRoofHang__9daAlink_cFv.s" +} +#pragma pop + +/* 80100A10-80100AE4 0FB350 00D4+00 2/2 0/0 0/0 .text + * procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& param_1, + int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi.s" +} +#pragma pop + +/* 80100AE4-80100BB4 0FB424 00D0+00 1/0 0/0 0/0 .text procRoofHangStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangStart() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangStart__9daAlink_cFv.s" +} +#pragma pop + +/* 80100BB4-80100D38 0FB4F4 0184+00 4/4 0/0 0/0 .text procRoofHangWaitInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80100D38-80100DA4 0FB678 006C+00 1/0 0/0 0/0 .text procRoofHangWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangWait() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangWait__9daAlink_cFv.s" +} +#pragma pop + +/* 80100DA4-80100EEC 0FB6E4 0148+00 1/1 0/0 0/0 .text procRoofHangFrontMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangFrontMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangFrontMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80100EEC-8010121C 0FB82C 0330+00 1/0 0/0 0/0 .text procRoofHangFrontMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangFrontMove() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangFrontMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8010121C-80101308 0FBB5C 00EC+00 1/1 0/0 0/0 .text procRoofHangSideMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangSideMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangSideMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80101308-801013B8 0FBC48 00B0+00 1/0 0/0 0/0 .text procRoofHangSideMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangSideMove() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangSideMove__9daAlink_cFv.s" +} +#pragma pop + +/* 801013B8-80101534 0FBCF8 017C+00 1/1 0/0 0/0 .text procRoofHangTurnInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80101534-8010163C 0FBE74 0108+00 1/0 0/0 0/0 .text procRoofHangTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofHangTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofHangTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8010163C-801016AC 0FBF7C 0070+00 2/2 0/0 0/0 .text setRoofHangSwitch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setRoofHangSwitch() { + nofralloc +#include "asm/d/a/d_a_alink/setRoofHangSwitch__9daAlink_cFv.s" +} +#pragma pop + +/* 801016AC-801017AC 0FBFEC 0100+00 1/1 0/0 0/0 .text + * procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 801017AC-80101874 0FC0EC 00C8+00 1/0 0/0 0/0 .text procRoofSwitchHang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRoofSwitchHang() { + nofralloc +#include "asm/d/a/d_a_alink/procRoofSwitchHang__9daAlink_cFv.s" +} +#pragma pop + +/* 80101874-80101890 0FC1B4 001C+00 2/2 0/0 0/0 .text getHangPos__13daObjSwHang_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObjSwHang_c::getHangPos() { + nofralloc +#include "asm/d/a/d_a_alink/getHangPos__13daObjSwHang_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_hook.inc b/src/d/a/d_a_alink_hook.inc new file mode 100644 index 00000000000..efcaab35c02 --- /dev/null +++ b/src/d/a/d_a_alink_hook.inc @@ -0,0 +1,669 @@ +/* 80107900-801083C8 102240 0AC8+00 1/0 0/0 0/0 .text draw__Q29daAlink_c14hsChainShape_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void draw__Q29daAlink_c14hsChainShape_cFv() { + // asm void daAlink_c::hsChainShape_c::draw() { + nofralloc +#include "asm/d/a/d_a_alink/draw__Q29daAlink_c14hsChainShape_cFv.s" +} +#pragma pop + +/* 801083C8-8010859C 102D08 01D4+00 1/1 0/0 0/0 .text + * hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* param_0, fopAc_ac_c* param_1, + dCcD_GObjInf* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf.s" +} +#pragma pop + +/* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text + * daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ +static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* player, dCcD_GObjInf* param_1, + fopAc_ac_c* param_2, dCcD_GObjInf* param_3) { + ((daAlink_c*)player)->hookshotAtHitCallBack(param_1, param_2, param_3); +} + +/* 801085BC-80108600 102EFC 0044+00 1/0 0/0 0/0 .text getHookshotTopPos__9daAlink_cFv */ +cXyz* daAlink_c::getHookshotTopPos() { + if (checkHookshotItem(mEquipItem)) { + return &mHookshotTopPos; + } + + return NULL; +} + +/* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */ +bool daAlink_c::checkHookshotReturnMode() const { + return checkHookshotItem(mEquipItem) && + (mHookshotMode == 4 || mHookshotMode == 5 || mHookshotMode == 6); +} + +/* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv + */ +bool daAlink_c::checkHookshotShootReturnMode() const { + return (checkHookshotItem(mEquipItem) && mHookshotMode == 3) || checkHookshotReturnMode(); +} + +/* 801086DC-8010871C 10301C 0040+00 6/6 0/0 0/0 .text resetHookshotMode__9daAlink_cFv */ +void daAlink_c::resetHookshotMode() { + mHookshotMode = 0; + initLockAt(); + mSearchBallScale = __float_max[0]; +} + +/* 8010871C-80108784 10305C 0068+00 0/0 0/0 1/1 .text + * setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c */ +bool daAlink_c::setEnemyBombHookshot(fopAc_ac_c* actor) { + if (field_0x284c.getActor() != NULL) { + cancelHookshotCarry(); + field_0x284c.setData(actor); + fopAcM_setHookCarryNow(actor); + return true; + } + return false; +} + +/* 80108784-801087B0 1030C4 002C+00 3/3 0/0 0/0 .text checkLv7BossRoom__9daAlink_cFv */ +bool daAlink_c::checkLv7BossRoom() { + return checkStageName("D_MN07A"); +} + +/* 801087B0-80108828 1030F0 0078+00 6/6 0/0 0/0 .text + * checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo */ +bool daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& poly) { + if (dComIfG_Bgsp().ChkPolyHSStick(poly)) { + dBgW_Base* bgw = dComIfG_Bgsp().GetBgWBasePointer(poly); + if (bgw != NULL && bgw->ChkPushPullOk()) { + return true; + } + } + + return false; +} + +/* 80108828-80108864 103168 003C+00 4/4 0/0 0/0 .text cancelHookshotCarry__9daAlink_cFv + */ +void daAlink_c::cancelHookshotCarry() { + if (field_0x284c.getActor() != NULL) { + fopAcM_cancelHookCarryNow(field_0x284c.getActor()); + field_0x284c.clearData(); + } +} + +/* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */ +void daAlink_c::changeHookshotDrawModel() { + if (mEquipItem == HOOKSHOT && field_0x3020 == 1) { + J3DModel* old_item = mHeldItemModel; + mHeldItemModel = field_0x0710; + field_0x0710 = old_item; + + J3DModel* old_item2 = field_0x070c; + field_0x070c = field_0x0714; + field_0x0714 = old_item2; + } +} + +/* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */ +BOOL daAlink_c::checkHookshotRoofLv7Boss() { + return mCargoCarryAcKeep.getActor() != NULL && + fopAcM_GetName(mCargoCarryAcKeep.getActor()) == PROC_B_DR; +} + +/* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text checkChaseHookshot__9daAlink_cFv */ +BOOL daAlink_c::checkChaseHookshot() { + if (field_0x2804 == NULL) { + if (mTargetedActor != NULL) { + field_0x2804 = mTargetedActor; + } else { + field_0x2804 = this; + } + } else if (field_0x2804 != mTargetedActor) { + field_0x2804 = this; + } + + if (mTargetedActor != NULL) { + s16 actorName = fopAcM_GetName(mTargetedActor); + return field_0x2804 == mTargetedActor && + (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || + actorName == PROC_B_DR || actorName == PROC_E_PH); + } + + return false; +} + +/* 80108980-801089E8 1032C0 0068+00 2/2 0/0 0/0 .text checkOctaIealSpecialCollect__9daAlink_cFv */ +BOOL daAlink_c::checkOctaIealSpecialCollect() { + return mProcID == PROC_HOOKSHOT_FLY && checkHookshotItem(mEquipItem) && checkBossOctaIealRoom(); +} + +/* 801089E8-80108A18 103328 0030+00 5/5 0/0 0/0 .text checkBossOctaIealRoom__9daAlink_cFv + */ +BOOL daAlink_c::checkBossOctaIealRoom() { + return checkStageName("D_MN01A"); +} + +/* 80108A18-80108A3C 103358 0024+00 19/19 0/0 0/0 .text checkHookshotWait__9daAlink_cCFv + */ +BOOL daAlink_c::checkHookshotWait() const { + return mHookshotMode == 0 || mHookshotMode == 1; +} + +/* 80108A3C-80108A90 10337C 0054+00 1/1 0/0 0/0 .text setHookshotCatchNow__9daAlink_cFv + */ +// matches with literals +#ifdef NONMATCHING +void daAlink_c::setHookshotCatchNow() { + field_0x3026 = 5; + dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f)); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotCatchNow() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotCatchNow__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz + */ +bool daAlink_c::setHookshotCarryOffset(unsigned int actorID, cXyz const* offset) { + if (i_dComIfGp_checkPlayerStatus1(0, 0x10000)) { + fopAc_ac_c* carryActor = mCargoCarryAcKeep.getActor(); + + if (carryActor != NULL && fopAcM_checkHookCarryNow(carryActor) && + actorID == mCargoCarryAcKeep.getID()) { + field_0x37c8 = *offset; + return true; + } + } + + fopAc_ac_c* actor = field_0x284c.getActor(); + if (actor != NULL && fopAcM_checkHookCarryNow(actor) && actorID == field_0x284c.getID()) { + field_0x37f8 = *offset; + return true; + } + + return false; +} + +/* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text setHookshotModel__9daAlink_cFv */ +void daAlink_c::setHookshotModel() { + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E); + + JKRHeap* heap = setItemHeap(); + field_0x730.init(bck, 0, 2, lit_6040, 0, -1, false); + + J3DModelData* heldItem_modelData = loadAramBmd(0x316, 0x5C00); + mHeldItemModel = initModel(heldItem_modelData, 0x80000, 0); + + J3DModelData* modelData = loadAramBmd(0x318, 0x3800); + field_0x070c = initModel(modelData, 0x80000, 0); + field_0x0710 = initModel(mHeldItemModel->getModelData(), 0x80000, 0); + field_0x0714 = initModel(field_0x070c->getModelData(), 0x80000, 0); + + field_0x0768 = loadAramBmd(0x317, 0x1000); + field_0x770 = new hsChainShape_c(); + field_0x076c = new Z2SoundObjSimple(); + + mpHookshotLinChk = new dBgS_ObjLinChk(); + mpHookshotLinChk->OffFullGrp(); + mpHookshotLinChk->OnWaterGrp(); + + J3DAnmTransform* bck2 = (J3DAnmTransform*)loadAram(0x17F, 0x800); + field_0x74C.init(bck2, 0, 2, lit_6040, 0, -1, false); + mDoExt_setCurrentHeap(heap); + + resetHookshotMode(); + field_0x770->setUserArea((u32)this); + field_0x2f94 = 1; + if (mEquipItem == W_HOOKSHOT) { + field_0x2f95 = 6; + } + + field_0x3020 = 0; + field_0x3024 = 0; + + field_0x122C[0].SetAtSpl(dCcG_At_Spl_UNK_0); + field_0x122C[0].OffAtNoHitMark(); + field_0x122C[0].SetAtAtp(0); + field_0x122C[0].SetR(lit_7808); + field_0x122C[0].SetAtSe(8); + field_0x122C[0].SetAtType(0x4000); + field_0x122C[0].SetAtHitMark(1); + field_0x122C[0].OnAtSetBit(); + field_0x122C[0].SetAtHitCallback(daAlink_hookshotAtHitCallBack); + field_0x122C[0].SetAtMtrl(0); + field_0x076c->init(&mHookshotTopPos, 1); +} + +/* 80108DB4-80108EEC 1036F4 0138+00 6/6 0/0 0/0 .text setHookshotSight__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotSight() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotSight__9daAlink_cFv.s" +} +#pragma pop + +/* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text cancelHookshotShot__9daAlink_cFv */ +void daAlink_c::cancelHookshotShot() { + if (checkHookshotItem(mEquipItem) && + (mHookshotMode == 3 || mHookshotMode == 5 || mHookshotMode == 4)) { + if (mProcID != PROC_HOOKSHOT_MOVE && mProcID != PROC_HOOKSHOT_FLY && mProcID != PROC_HOOKSHOT_SUBJECT) { + mHookshotMode = 6; + } + } +} + +/* 80108F64-8010903C 1038A4 00D8+00 4/4 0/0 0/0 .text cancelHookshotMove__9daAlink_cFv */ +// checkAttentionLock has weird codegen +#ifdef NONMATCHING +bool daAlink_c::cancelHookshotMove() { + if (mFastShotTime == 0 && mHookshotMode == 0) { + if (checkHookshotAnime() && + (mTargetedActor == NULL && !i_checkAttentionLock() || !itemButton())) { + resetUpperAnime(UPPER_NOW, -1.0f); + return 1; + } + } + + return 0; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::cancelHookshotMove() { + nofralloc +#include "asm/d/a/d_a_alink/cancelHookshotMove__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8010903C-80109070 10397C 0034+00 2/2 0/0 0/0 .text + * checkHookshotReadyMaterialOffMode__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHookshotReadyMaterialOffMode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHookshotReadyMaterialOffMode__9daAlink_cCFv.s" +} +#pragma pop + +/* 80109070-801090EC 1039B0 007C+00 5/5 0/0 0/0 .text setHookshotReadyMaterial__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotReadyMaterial() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotReadyMaterial__9daAlink_cFv.s" +} +#pragma pop + +/* 801090EC-80109170 103A2C 0084+00 8/8 0/0 0/0 .text initHookshotUpperAnimeSpeed__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initHookshotUpperAnimeSpeed(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/initHookshotUpperAnimeSpeed__9daAlink_cFi.s" +} +#pragma pop + +/* 80109170-801091E4 103AB0 0074+00 4/4 0/0 0/0 .text initHookshotReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initHookshotReady() { + nofralloc +#include "asm/d/a/d_a_alink/initHookshotReady__9daAlink_cFv.s" +} +#pragma pop + +/* 801091E4-80109284 103B24 00A0+00 1/1 0/0 0/0 .text setHookshotReadyAnime__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotReadyAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80109284-801095C8 103BC4 0344+00 3/3 0/0 0/0 .text checkUpperItemActionHookshot__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionHookshot() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionHookshot__9daAlink_cFv.s" +} +#pragma pop + +/* 801095C8-801097A0 103F08 01D8+00 7/7 0/0 0/0 .text checkNextActionHookshot__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionHookshot() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionHookshot__9daAlink_cFv.s" +} +#pragma pop + +/* 801097A0-80109890 1040E0 00F0+00 2/2 0/0 0/0 .text setHookshotReturnEnd__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotReturnEnd() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotReturnEnd__9daAlink_cFv.s" +} +#pragma pop + +/* 80109890-80109AAC 1041D0 021C+00 3/3 0/0 0/0 .text setHookshotHangMoveBGCollect__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotHangMoveBGCollect() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotHangMoveBGCollect__9daAlink_cFv.s" +} +#pragma pop + +/* 80109AAC-80109BDC 1043EC 0130+00 2/2 0/0 0/0 .text setHookshotTopPosFly__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotTopPosFly() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotTopPosFly__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804256A0-804256AC 0523C0 000C+00 0/1 0/0 0/0 .bss @29722 */ +#pragma push +#pragma force_active on +static u8 lit_29722[12]; +#pragma pop + +/* 804256AC-804256B8 0523CC 000C+00 1/2 0/0 0/0 .bss l_hookSnowSandHitScale */ +static u8 l_hookSnowSandHitScale[12]; + +/* 80109BDC-8010B2DC 10451C 1700+00 1/1 0/0 0/0 .text setHookshotPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotPos() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotPos__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B2DC-8010B35C 105C1C 0080+00 2/2 0/0 0/0 .text setHookshotRoofWaitAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotRoofWaitAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotRoofWaitAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B35C-8010B3AC 105C9C 0050+00 2/2 0/0 0/0 .text setHookshotWallWaitAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHookshotWallWaitAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setHookshotWallWaitAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B3AC-8010B644 105CEC 0298+00 2/2 0/0 0/0 .text hookshotRoofTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::hookshotRoofTurn() { + nofralloc +#include "asm/d/a/d_a_alink/hookshotRoofTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B644-8010B720 105F84 00DC+00 3/3 0/0 0/0 .text + * initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initHookshotRoofWaitActor(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 8010B720-8010B84C 106060 012C+00 2/2 0/0 0/0 .text checkNextHookPoint__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextHookPoint() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextHookPoint__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B84C-8010B96C 10618C 0120+00 2/2 0/0 0/0 .text checkLandHookshotHang__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkLandHookshotHang() { + nofralloc +#include "asm/d/a/d_a_alink/checkLandHookshotHang__9daAlink_cFv.s" +} +#pragma pop + +/* 8010B96C-8010BA6C 1062AC 0100+00 3/3 0/0 0/0 .text commonHookshotRoofWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonHookshotRoofWait() { + nofralloc +#include "asm/d/a/d_a_alink/commonHookshotRoofWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BA6C-8010BAA8 1063AC 003C+00 2/2 0/0 0/0 .text commonHookshotWallWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonHookshotWallWait() { + nofralloc +#include "asm/d/a/d_a_alink/commonHookshotWallWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BAA8-8010BB48 1063E8 00A0+00 1/1 0/0 0/0 .text procHookshotSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BB48-8010BC08 106488 00C0+00 1/0 0/0 0/0 .text procHookshotSubject__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BC08-8010BCA4 106548 009C+00 1/1 0/0 0/0 .text procHookshotMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BCA4-8010BD90 1065E4 00EC+00 1/0 0/0 0/0 .text procHookshotMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BD90-8010BEF0 1066D0 0160+00 2/2 0/0 0/0 .text procHookshotFlyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotFlyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotFlyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8010BEF0-8010C830 106830 0940+00 2/1 0/0 0/0 .text procHookshotFly__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotFly() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotFly__9daAlink_cFv.s" +} +#pragma pop + +/* 8010C830-8010C9F4 107170 01C4+00 4/4 0/0 0/0 .text + * procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci.s" +} +#pragma pop + +/* 8010C9F4-8010CC80 107334 028C+00 1/0 0/0 0/0 .text procHookshotRoofWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofWait() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8010CC80-8010CD60 1075C0 00E0+00 1/1 0/0 0/0 .text + * procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 8010CD60-8010CF6C 1076A0 020C+00 1/0 0/0 0/0 .text procHookshotRoofShoot__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofShoot() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofShoot__9daAlink_cFv.s" +} +#pragma pop + +/* 8010CF6C-8010D034 1078AC 00C8+00 1/1 0/0 0/0 .text + * procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 8010D034-8010D174 107974 0140+00 1/0 0/0 0/0 .text procHookshotRoofBoots__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotRoofBoots() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotRoofBoots__9daAlink_cFv.s" +} +#pragma pop + +/* 8010D174-8010D38C 107AB4 0218+00 3/3 0/0 0/0 .text procHookshotWallWaitInit__9daAlink_cFisi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotWallWaitInit__9daAlink_cFisi.s" +} +#pragma pop + +/* 8010D38C-8010D5F4 107CCC 0268+00 1/0 0/0 0/0 .text procHookshotWallWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotWallWait() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotWallWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8010D5F4-8010D6CC 107F34 00D8+00 1/1 0/0 0/0 .text procHookshotWallShootInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotWallShootInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotWallShootInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8010D6CC-8010D93C 10800C 0270+00 1/0 0/0 0/0 .text procHookshotWallShoot__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHookshotWallShoot() { + nofralloc +#include "asm/d/a/d_a_alink/procHookshotWallShoot__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_horse.inc b/src/d/a/d_a_alink_horse.inc new file mode 100644 index 00000000000..c2d4c511095 --- /dev/null +++ b/src/d/a/d_a_alink_horse.inc @@ -0,0 +1,1058 @@ +/* 800EC724-800EC758 0E7064 0034+00 3/3 0/0 0/0 .text daAlink_searchBoar__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchBoar__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800EC758-800EC76C 0E7098 0014+00 1/1 0/0 0/0 .text daAlink_searchCoach__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchCoach(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchCoach__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800EC76C-800EC7B0 0E70AC 0044+00 3/3 0/0 0/0 .text checkHorseZeldaBowMode__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseZeldaBowMode() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseZeldaBowMode__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC7B0-800EC7DC 0E70F0 002C+00 4/4 0/0 0/0 .text setHorseZeldaDamage__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseZeldaDamage() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseZeldaDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC7DC-800EC814 0E711C 0038+00 2/2 0/0 0/0 .text checkHorseDashAccept__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkHorseDashAccept() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseDashAccept__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC814-800EC87C 0E7154 0068+00 1/1 0/0 0/0 .text checkCowGame__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkCowGame() { + nofralloc +#include "asm/d/a/d_a_alink/checkCowGame__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC87C-800EC8F8 0E71BC 007C+00 2/2 0/0 0/0 .text getReinRideDirection__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getReinRideDirection() { + nofralloc +#include "asm/d/a/d_a_alink/getReinRideDirection__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC8F8-800ECA3C 0E7238 0144+00 1/1 0/0 0/0 .text checkReinRideBgCheck__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkReinRideBgCheck() { + nofralloc +#include "asm/d/a/d_a_alink/checkReinRideBgCheck__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECA3C-800ECAAC 0E737C 0070+00 3/3 0/0 0/0 .text commonInitForceRideRein__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonInitForceRideRein() { + nofralloc +#include "asm/d/a/d_a_alink/commonInitForceRideRein__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECAAC-800ECB58 0E73EC 00AC+00 1/1 0/0 0/0 .text initForceRideBoar__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initForceRideBoar() { + nofralloc +#include "asm/d/a/d_a_alink/initForceRideBoar__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECB58-800ECBD0 0E7498 0078+00 4/4 0/0 0/0 .text initForceRideHorse__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initForceRideHorse() { + nofralloc +#include "asm/d/a/d_a_alink/initForceRideHorse__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECBD0-800ECD90 0E7510 01C0+00 5/5 0/0 0/0 .text rideGetOff__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::rideGetOff() { + nofralloc +#include "asm/d/a/d_a_alink/rideGetOff__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECD90-800ECDC4 0E76D0 0034+00 1/1 0/0 0/0 .text checkHorseNotDamageReaction__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseNotDamageReaction() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseNotDamageReaction__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECDC4-800ECDEC 0E7704 0028+00 1/1 0/0 2/2 .text checkHorseWaitLashAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseWaitLashAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseWaitLashAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECDEC-800ECE10 0E772C 0024+00 1/1 0/0 0/0 .text checkHorseReinLeftOnly__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseReinLeftOnly() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseReinLeftOnly__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECE10-800ECF04 0E7750 00F4+00 2/2 0/0 0/0 .text getReinHandType__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getReinHandType() const { + nofralloc +#include "asm/d/a/d_a_alink/getReinHandType__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECF04-800ECF5C 0E7844 0058+00 5/5 0/0 1/1 .text checkHorseLieAnime__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkHorseLieAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseLieAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECF5C-800ECF9C 0E789C 0040+00 0/0 0/0 3/3 .text checkHorseSubjectivity__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseSubjectivity() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseSubjectivity__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ECF9C-800ECFF4 0E78DC 0058+00 2/2 0/0 0/0 .text setHorseSwordUpAnime__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseSwordUpAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseSwordUpAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800ECFF4-800ED074 0E7934 0080+00 1/1 0/0 0/0 .text setHorseTurnUpperAnime__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseTurnUpperAnime(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setHorseTurnUpperAnime__9daAlink_cFi.s" +} +#pragma pop + +/* 800ED074-800ED0D4 0E79B4 0060+00 9/9 0/0 0/0 .text checkHorseNoUpperAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkHorseNoUpperAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseNoUpperAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ED0D4-800ED1F0 0E7A14 011C+00 0/0 0/0 2/2 .text getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getHorseReinHandPos(cXyz* param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz.s" +} +#pragma pop + +/* 800ED1F0-800ED310 0E7B30 0120+00 1/1 0/0 1/1 .text checkHorseNotGrab__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseNotGrab() const { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseNotGrab__9daAlink_cCFv.s" +} +#pragma pop + +/* 800ED310-800ED4B8 0E7C50 01A8+00 1/1 0/0 0/0 .text setHorseStirrup__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseStirrup() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseStirrup__9daAlink_cFv.s" +} +#pragma pop + +/* 800ED4B8-800ED4DC 0E7DF8 0024+00 1/1 0/0 0/0 .text changeBoarRunRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeBoarRunRide() { + nofralloc +#include "asm/d/a/d_a_alink/changeBoarRunRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800ED4DC-800ED78C 0E7E1C 02B0+00 7/7 0/0 0/0 .text setSyncHorsePos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncHorsePos() { + nofralloc +#include "asm/d/a/d_a_alink/setSyncHorsePos__9daAlink_cFv.s" +} +#pragma pop + +/* 800ED78C-800ED90C 0E80CC 0180+00 4/4 0/0 0/0 .text setSyncBoarPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncBoarPos() { + nofralloc +#include "asm/d/a/d_a_alink/setSyncBoarPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800ED90C-800EDA24 0E824C 0118+00 1/1 0/0 0/0 .text setSyncBoarRunPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncBoarRunPos() { + nofralloc +#include "asm/d/a/d_a_alink/setSyncBoarRunPos__9daAlink_cFv.s" +} +#pragma pop + +/* 800EDA24-800EDA78 0E8364 0054+00 33/33 0/0 0/0 .text setSyncRidePos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncRidePos() { + nofralloc +#include "asm/d/a/d_a_alink/setSyncRidePos__9daAlink_cFv.s" +} +#pragma pop + +/* 800EDA78-800EDB48 0E83B8 00D0+00 6/6 0/0 0/0 .text setHorseTurnAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseTurnAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseTurnAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800EDB48-800EDD6C 0E8488 0224+00 2/2 0/0 0/0 .text + * getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM.s" +} +#pragma pop + +/* 800EDD6C-800EDE8C 0E86AC 0120+00 9/9 0/0 0/0 .text checkHorseSpecialProc__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseSpecialProc() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseSpecialProc__9daAlink_cFv.s" +} +#pragma pop + +/* 800EDE8C-800EDEEC 0E87CC 0060+00 2/2 0/0 0/0 .text checkHorseServiceWaitAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseServiceWaitAnime() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseServiceWaitAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800EDEEC-800EE64C 0E882C 0760+00 1/1 0/0 0/0 .text setSyncHorse__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncHorse(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSyncHorse__9daAlink_cFi.s" +} +#pragma pop + +/* 800EE64C-800EE918 0E8F8C 02CC+00 1/1 0/0 0/0 .text setSyncBoar__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncBoar(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSyncBoar__9daAlink_cFi.s" +} +#pragma pop + +/* 800EE918-800EEAE8 0E9258 01D0+00 12/12 0/0 0/0 .text setSyncRide__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSyncRide(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSyncRide__9daAlink_cFi.s" +} +#pragma pop + +/* 800EEAE8-800EEC98 0E9428 01B0+00 2/2 0/0 0/0 .text setBaseHorseAnimeFrame__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBaseHorseAnimeFrame() { + nofralloc +#include "asm/d/a/d_a_alink/setBaseHorseAnimeFrame__9daAlink_cFv.s" +} +#pragma pop + +/* 800EEC98-800EED98 0E95D8 0100+00 2/2 0/0 0/0 .text setBaseBoarAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBaseBoarAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBaseBoarAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800EED98-800EEE30 0E96D8 0098+00 18/18 0/0 0/0 .text setBaseRideAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBaseRideAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBaseRideAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800EEE30-800EEE5C 0E9770 002C+00 1/1 0/0 0/0 .text checkHorseSwordUpSpped__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseSwordUpSpped() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseSwordUpSpped__9daAlink_cFv.s" +} +#pragma pop + +/* 800EEE5C-800EEF30 0E979C 00D4+00 2/2 0/0 0/0 .text setHorseSwordUp__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseSwordUp(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setHorseSwordUp__9daAlink_cFi.s" +} +#pragma pop + +/* 800EEF30-800EF050 0E9870 0120+00 9/9 0/0 0/0 .text setRideSubjectAngle__9daAlink_cFs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setRideSubjectAngle(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setRideSubjectAngle__9daAlink_cFs.s" +} +#pragma pop + +/* 800EF050-800EF0E8 0E9990 0098+00 7/7 0/0 0/0 .text setBodyAngleRideReadyAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBodyAngleRideReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBodyAngleRideReadyAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF0E8-800EF198 0E9A28 00B0+00 1/1 0/0 0/0 .text + * checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseGetOffWallCheck(cXyz* param_0, cXyz* param_1, s16 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs.s" +} +#pragma pop + +/* 800EF198-800EF35C 0E9AD8 01C4+00 2/2 0/0 0/0 .text checkHorseGetOffDirection__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseGetOffDirection() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseGetOffDirection__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF35C-800EF394 0E9C9C 0038+00 4/4 0/0 0/0 .text boarForceGetOff__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::boarForceGetOff() { + nofralloc +#include "asm/d/a/d_a_alink/boarForceGetOff__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF394-800EF450 0E9CD4 00BC+00 2/2 0/0 0/0 .text horseGetOffEnd__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::horseGetOffEnd() { + nofralloc +#include "asm/d/a/d_a_alink/horseGetOffEnd__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF450-800EF598 0E9D90 0148+00 12/12 0/0 0/0 .text checkNextActionHorse__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionHorse() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionHorse__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF598-800EF6B0 0E9ED8 0118+00 2/2 0/0 0/0 .text checkHorseGetOff__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseGetOff() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseGetOff__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF6B0-800EF884 0E9FF0 01D4+00 3/3 0/0 0/0 .text checkHorseGetOffAndSetDoStatus__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkHorseGetOffAndSetDoStatus() { + nofralloc +#include "asm/d/a/d_a_alink/checkHorseGetOffAndSetDoStatus__9daAlink_cFv.s" +} +#pragma pop + +/* 800EF884-800EF95C 0EA1C4 00D8+00 2/2 0/0 0/0 .text setHorseGetOff__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseGetOff(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setHorseGetOff__9daAlink_cFi.s" +} +#pragma pop + +/* 800EF95C-800EFDC4 0EA29C 0468+00 1/1 0/0 0/0 .text procHorseRideInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseRideInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseRideInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EFDC4-800F038C 0EA704 05C8+00 1/0 0/0 0/0 .text procHorseRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseRide() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseRide__9daAlink_cFv.s" +} +#pragma pop + +/* 800F038C-800F0620 0EACCC 0294+00 1/1 0/0 0/0 .text procHorseGetOffInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGetOffInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGetOffInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800F0620-800F0980 0EAF60 0360+00 1/0 0/0 0/0 .text procHorseGetOff__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGetOff() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGetOff__9daAlink_cFv.s" +} +#pragma pop + +/* 800F0980-800F0AA4 0EB2C0 0124+00 16/16 0/0 0/0 .text procHorseWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F0AA4-800F0C6C 0EB3E4 01C8+00 1/0 0/0 0/0 .text procHorseWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseWait() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800F0C6C-800F0CE4 0EB5AC 0078+00 1/1 0/0 0/0 .text procHorseTurnInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F0CE4-800F1060 0EB624 037C+00 1/0 0/0 0/0 .text procHorseTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1060-800F10F8 0EB9A0 0098+00 1/1 0/0 0/0 .text procHorseJumpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseJumpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseJumpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F10F8-800F1188 0EBA38 0090+00 1/0 0/0 0/0 .text procHorseJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseJump() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseJump__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1188-800F1204 0EBAC8 007C+00 1/1 0/0 0/0 .text procHorseLandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1204-800F1294 0EBB44 0090+00 1/0 0/0 0/0 .text procHorseLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseLand() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1294-800F12F8 0EBBD4 0064+00 1/1 0/0 0/0 .text procHorseSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F12F8-800F13D8 0EBC38 00E0+00 1/0 0/0 0/0 .text procHorseSubjectivity__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 800F13D8-800F1688 0EBD18 02B0+00 1/1 0/0 0/0 .text procHorseCutInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCutInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCutInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1688-800F1894 0EBFC8 020C+00 1/0 0/0 0/0 .text procHorseCut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCut() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCut__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1894-800F194C 0EC1D4 00B8+00 3/3 0/0 0/0 .text procHorseCutChargeReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCutChargeReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCutChargeReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F194C-800F1AAC 0EC28C 0160+00 1/0 0/0 0/0 .text procHorseCutChargeReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCutChargeReady() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCutChargeReady__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1AAC-800F1BA4 0EC3EC 00F8+00 3/3 0/0 0/0 .text procHorseCutTurnInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCutTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCutTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1BA4-800F1D18 0EC4E4 0174+00 1/0 0/0 0/0 .text procHorseCutTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseCutTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseCutTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 800F1D18-800F2028 0EC658 0310+00 2/2 0/0 0/0 .text + * procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 800F2028-800F2150 0EC968 0128+00 1/0 0/0 0/0 .text procHorseDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2150-800F21B4 0ECA90 0064+00 1/1 0/0 0/0 .text procHorseBowSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBowSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBowSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F21B4-800F224C 0ECAF4 0098+00 1/0 0/0 0/0 .text procHorseBowSubject__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBowSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBowSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F224C-800F22A8 0ECB8C 005C+00 1/1 0/0 0/0 .text procHorseBowMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBowMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBowMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F22A8-800F2334 0ECBE8 008C+00 1/0 0/0 0/0 .text procHorseBowMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBowMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBowMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2334-800F2390 0ECC74 005C+00 2/2 0/0 0/0 .text procHorseGrabMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGrabMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGrabMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2390-800F2454 0ECCD0 00C4+00 1/0 0/0 0/0 .text procHorseGrabMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGrabMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGrabMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2454-800F24C8 0ECD94 0074+00 1/1 0/0 0/0 .text procHorseBoomerangSubjectInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBoomerangSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBoomerangSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F24C8-800F25B4 0ECE08 00EC+00 1/0 0/0 0/0 .text procHorseBoomerangSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBoomerangSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBoomerangSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F25B4-800F2628 0ECEF4 0074+00 1/1 0/0 0/0 .text procHorseBoomerangMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBoomerangMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBoomerangMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2628-800F26F4 0ECF68 00CC+00 1/0 0/0 0/0 .text procHorseBoomerangMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBoomerangMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBoomerangMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F26F4-800F2770 0ED034 007C+00 1/1 0/0 0/0 .text procHorseHookshotSubjectInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHookshotSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHookshotSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2770-800F2824 0ED0B0 00B4+00 1/0 0/0 0/0 .text procHorseHookshotSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHookshotSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHookshotSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2824-800F2898 0ED164 0074+00 1/1 0/0 0/0 .text procHorseHookshotMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHookshotMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHookshotMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2898-800F2934 0ED1D8 009C+00 1/0 0/0 0/0 .text procHorseHookshotMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHookshotMove() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHookshotMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2934-800F2AD8 0ED274 01A4+00 1/1 0/0 0/0 .text procHorseBottleDrinkInit__9daAlink_cFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBottleDrinkInit(u16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBottleDrinkInit__9daAlink_cFUs.s" +} +#pragma pop + +/* 800F2AD8-800F2B4C 0ED418 0074+00 1/0 0/0 0/0 .text procHorseBottleDrink__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseBottleDrink() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseBottleDrink__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2B4C-800F2C78 0ED48C 012C+00 1/1 0/0 0/0 .text procHorseKandelaarPourInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseKandelaarPourInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseKandelaarPourInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2C78-800F2D84 0ED5B8 010C+00 1/0 0/0 0/0 .text procHorseKandelaarPour__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseKandelaarPour() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseKandelaarPour__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2D84-800F2DE4 0ED6C4 0060+00 2/2 0/0 0/0 .text procHorseComebackInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseComebackInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseComebackInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2DE4-800F2EE0 0ED724 00FC+00 1/0 0/0 0/0 .text procHorseComeback__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseComeback() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseComeback__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2EE0-800F2F98 0ED820 00B8+00 2/2 0/0 0/0 .text procHorseRunInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseRunInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseRunInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F2F98-800F3430 0ED8D8 0498+00 1/0 0/0 0/0 .text procHorseRun__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseRun() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseRun__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3430-800F3580 0EDD70 0150+00 1/1 0/0 0/0 .text + * procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi.s" +} +#pragma pop + +/* 800F3580-800F36E4 0EDEC0 0164+00 1/0 0/0 0/0 .text procHorseHang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseHang() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseHang__9daAlink_cFv.s" +} +#pragma pop + +/* 800F36E4-800F3754 0EE024 0070+00 1/0 0/0 0/0 .text procHorseGetKeyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGetKeyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGetKeyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3754-800F3818 0EE094 00C4+00 1/0 0/0 0/0 .text procHorseGetKey__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseGetKey() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseGetKey__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3818-800F3894 0EE158 007C+00 1/0 0/0 0/0 .text procHorseLookDownInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseLookDownInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseLookDownInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3894-800F38E8 0EE1D4 0054+00 1/0 0/0 0/0 .text procHorseLookDown__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHorseLookDown() { + nofralloc +#include "asm/d/a/d_a_alink/procHorseLookDown__9daAlink_cFv.s" +} +#pragma pop + +/* 800F38E8-800F3998 0EE228 00B0+00 1/1 0/0 0/0 .text procBoarRunInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoarRunInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoarRunInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800F3998-800F3BB0 0EE2D8 0218+00 1/0 0/0 0/0 .text procBoarRun__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoarRun() { + nofralloc +#include "asm/d/a/d_a_alink/procBoarRun__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_hvyboots.inc b/src/d/a/d_a_alink_hvyboots.inc new file mode 100644 index 00000000000..e4de9b88618 --- /dev/null +++ b/src/d/a/d_a_alink_hvyboots.inc @@ -0,0 +1,157 @@ +/* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text concatMagneBootMtx__9daAlink_cFv */ +void daAlink_c::concatMagneBootMtx() { + if (i_checkMagneBootsOn()) { + mDoMtx_stack_c::concat(mMagneBootMtx); + } +} + +/* 800E243C-800E247C 0DCD7C 0040+00 1/1 0/0 0/0 .text concatMagneBootInvMtx__9daAlink_cFv + */ +void daAlink_c::concatMagneBootInvMtx() { + if (i_checkMagneBootsOn()) { + mDoMtx_stack_c::concat(mMagneBootInvMtx); + } +} + +/* 800E247C-800E24B0 0DCDBC 0034+00 8/8 0/0 0/0 .text multVecMagneBootInvMtx__9daAlink_cFP4cXyz */ +void daAlink_c::multVecMagneBootInvMtx(cXyz* vec) { + if (i_checkMagneBootsOn()) { + mDoMtx_multVecSR(mMagneBootInvMtx, vec, vec); + } +} + +/* 800E24B0-800E251C 0DCDF0 006C+00 2/2 0/0 0/0 .text + * commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz */ +int daAlink_c::commonMagneLineCheck(cXyz* param_0, cXyz* param_1) { + mMagneLineChk.Set(param_0, param_1, this); + + if (dComIfG_Bgsp().LineCross(&mMagneLineChk) && daTagMagne_c::checkMagnetCode(mMagneLineChk)) { + return 1; + } + + return 0; +} + +/* 800E251C-800E2580 0DCE5C 0064+00 2/2 0/0 0/0 .text checkBootsMoveAnime__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBootsMoveAnime(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkBootsMoveAnime__9daAlink_cFi.s" +} +#pragma pop + +/* 800E2580-800E2738 0DCEC0 01B8+00 17/17 0/0 0/0 .text setHeavyBoots__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHeavyBoots(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setHeavyBoots__9daAlink_cFi.s" +} +#pragma pop + +/* 800E2738-800E2808 0DD078 00D0+00 2/2 0/0 0/0 .text getMagneBootsLocalAngleY__9daAlink_cFsi */ +// matches with literals +#ifdef NONMATCHING +s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) { + if (param_1 == 1 || (param_1 != 2 && field_0x3114 <= 0x4000 && field_0x3114 != -0x8000)) { + return param_0; + } + + cXyz vec(cM_ssin(param_0), 0.0f, cM_scos(param_0)); + mDoMtx_stack_c::YrotS(field_0x3116); + mDoMtx_stack_c::XrotM(-0x8000); + mDoMtx_stack_c::YrotM(-field_0x3116); + mDoMtx_stack_c::multVec(&vec, &vec); + + return vec.atan2sX_Z(); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/getMagneBootsLocalAngleY__9daAlink_cFsi.s" +} +#pragma pop +#endif + +/* 800E2808-800E2DC4 0DD148 05BC+00 3/3 0/0 0/0 .text + * setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi.s" +} +#pragma pop + +/* 800E2DC4-800E2F88 0DD704 01C4+00 7/7 0/0 0/0 .text cancelMagneBootsOn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::cancelMagneBootsOn() { + nofralloc +#include "asm/d/a/d_a_alink/cancelMagneBootsOn__9daAlink_cFv.s" +} +#pragma pop + +/* 800E2F88-800E3048 0DD8C8 00C0+00 1/1 0/0 0/0 .text checkMagneBootsFly__9daAlink_cFv */ +int daAlink_c::checkMagneBootsFly() { + if (field_0x2fb8 != 0 && i_checkEquipHeavyBoots() && !checkDeadHP() && mProcID != PROC_MAGNE_BOOTS_FLY && !checkEventRun()) { + cXyz vec(field_0x369c); + vec.normalizeZP(); + + if (mMagneBootsTopVec.getDotProduct(vec) > lit_8131 && procMagneBootsFlyInit()) { + return 1; + } + } + + return 0; +} + +/* 800E3048-800E30DC 0DD988 0094+00 2/2 0/0 0/0 .text procBootsEquipInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBootsEquipInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBootsEquipInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E30DC-800E3218 0DDA1C 013C+00 1/0 0/0 0/0 .text procBootsEquip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBootsEquip() { + nofralloc +#include "asm/d/a/d_a_alink/procBootsEquip__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3218-800E3454 0DDB58 023C+00 1/1 0/0 0/0 .text procMagneBootsFlyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procMagneBootsFlyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procMagneBootsFlyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800E3454-800E3760 0DDD94 030C+00 1/0 0/0 0/0 .text procMagneBootsFly__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procMagneBootsFly() { + nofralloc +#include "asm/d/a/d_a_alink/procMagneBootsFly__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_iceleaf.inc b/src/d/a/d_a_alink_iceleaf.inc new file mode 100644 index 00000000000..d18fc409e3a --- /dev/null +++ b/src/d/a/d_a_alink_iceleaf.inc @@ -0,0 +1,278 @@ +/* 80105A84-80105A98 1003C4 0014+00 1/1 0/0 0/0 .text daAlink_searchIceLeaf__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchIceLeaf(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchIceLeaf__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80105A98-80105ABC 1003D8 0024+00 3/3 0/0 0/0 .text checkSnowCode__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSnowCode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkSnowCode__9daAlink_cCFv.s" +} +#pragma pop + +/* 80105ABC-80105B10 1003FC 0054+00 1/1 0/0 1/1 .text + * checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo.s" +} +#pragma pop + +/* 80105B10-80105B58 100450 0048+00 2/2 0/0 0/0 .text checkBoardRestart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBoardRestart() { + nofralloc +#include "asm/d/a/d_a_alink/checkBoardRestart__9daAlink_cFv.s" +} +#pragma pop + +/* 80105B58-80106534 100498 09DC+00 7/7 0/0 0/0 .text boardCommon__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::boardCommon(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/boardCommon__9daAlink_cFi.s" +} +#pragma pop + +/* 80106534-8010658C 100E74 0058+00 6/6 0/0 0/0 .text setCommonBoardAnime__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setCommonBoardAnime(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setCommonBoardAnime__9daAlink_cFi.s" +} +#pragma pop + +/* 8010658C-80106618 100ECC 008C+00 5/5 0/0 0/0 .text checkNextActionBoard__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionBoard() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionBoard__9daAlink_cFv.s" +} +#pragma pop + +/* 80106618-80106650 100F58 0038+00 2/2 0/0 0/0 .text checkBoardSwordTriggerAction__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBoardSwordTriggerAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkBoardSwordTriggerAction__9daAlink_cFv.s" +} +#pragma pop + +/* 80106650-801066B8 100F90 0068+00 3/3 0/0 0/0 .text + * commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC param_0) { + nofralloc +#include "asm/d/a/d_a_alink/commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC.s" +} +#pragma pop + +/* 801066B8-801066EC 100FF8 0034+00 1/1 0/0 0/0 .text getBoardRowAnmSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getBoardRowAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getBoardRowAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 801066EC-80106774 10102C 0088+00 3/3 0/0 0/0 .text setBoardLandAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBoardLandAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setBoardLandAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80106774-801069D0 1010B4 025C+00 1/1 0/0 0/0 .text procBoardRideInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardRideInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardRideInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801069D0-80106A38 101310 0068+00 1/0 0/0 0/0 .text procBoardRide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardRide() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardRide__9daAlink_cFv.s" +} +#pragma pop + +/* 80106A38-80106BCC 101378 0194+00 13/13 0/0 0/0 .text + * procBoardWaitInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardWaitInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBoardWaitInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 80106BCC-80106E88 10150C 02BC+00 1/0 0/0 0/0 .text procBoardWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardWait() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardWait__9daAlink_cFv.s" +} +#pragma pop + +/* 80106E88-80106F00 1017C8 0078+00 1/1 0/0 0/0 .text procBoardRowInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardRowInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardRowInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80106F00-80107060 101840 0160+00 1/0 0/0 0/0 .text procBoardRow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardRow() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardRow__9daAlink_cFv.s" +} +#pragma pop + +/* 80107060-801070DC 1019A0 007C+00 1/1 0/0 0/0 .text procBoardTurnInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801070DC-80107218 101A1C 013C+00 1/0 0/0 0/0 .text procBoardTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 80107218-80107300 101B58 00E8+00 4/4 0/0 0/0 .text procBoardJumpInit__9daAlink_cFfi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardJumpInit(f32 param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procBoardJumpInit__9daAlink_cFfi.s" +} +#pragma pop + +/* 80107300-801073D0 101C40 00D0+00 1/0 0/0 0/0 .text procBoardJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardJump() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardJump__9daAlink_cFv.s" +} +#pragma pop + +/* 801073D0-80107418 101D10 0048+00 1/1 0/0 0/0 .text procBoardSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80107418-801074AC 101D58 0094+00 1/0 0/0 0/0 .text procBoardSubjectivity__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 801074AC-8010755C 101DEC 00B0+00 3/3 0/0 0/0 .text procBoardCutInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardCutInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardCutInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8010755C-801075D4 101E9C 0078+00 1/0 0/0 0/0 .text procBoardCut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardCut() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardCut__9daAlink_cFv.s" +} +#pragma pop + +/* 801075D4-80107744 101F14 0170+00 2/2 0/0 0/0 .text procBoardCutTurnInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardCutTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardCutTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80107744-80107900 102084 01BC+00 1/0 0/0 0/0 .text procBoardCutTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBoardCutTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procBoardCutTurn__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_ironball.inc b/src/d/a/d_a_alink_ironball.inc new file mode 100644 index 00000000000..b8274680358 --- /dev/null +++ b/src/d/a/d_a_alink_ironball.inc @@ -0,0 +1,298 @@ +/* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text getIronBallCenterPos__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::getIronBallCenterPos() { + nofralloc +#include "asm/d/a/d_a_alink/getIronBallCenterPos__9daAlink_cFv.s" +} +#pragma pop + +/* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text getIronBallBgHit__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::getIronBallBgHit() const { + nofralloc +#include "asm/d/a/d_a_alink/getIronBallBgHit__9daAlink_cCFv.s" +} +#pragma pop + +/* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkIronBallThrowMode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallThrowMode__9daAlink_cCFv.s" +} +#pragma pop + +/* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkIronBallThrowReturnMode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallThrowReturnMode__9daAlink_cCFv.s" +} +#pragma pop + +/* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text checkIronBallReturn__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkIronBallReturn() const { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallReturn__9daAlink_cCFv.s" +} +#pragma pop + +/* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkIronBallGroundStop() const { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallGroundStop__9daAlink_cCFv.s" +} +#pragma pop + +/* 80112568-80112628 10CEA8 00C0+00 5/5 0/0 0/0 .text setIronBallWaitUpperAnime__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallWaitUpperAnime(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallWaitUpperAnime__9daAlink_cFi.s" +} +#pragma pop + +/* 80112628-801126F8 10CF68 00D0+00 1/1 0/0 0/0 .text checkIronBallDelete__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkIronBallDelete() { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallDelete__9daAlink_cFv.s" +} +#pragma pop + +/* 801126F8-80112768 10D038 0070+00 2/2 0/0 0/0 .text setIronBallReturn__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallReturn(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallReturn__9daAlink_cFi.s" +} +#pragma pop + +/* 80112768-801127F0 10D0A8 0088+00 2/2 0/0 0/0 .text setIronBallBgCheckPos__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallBgCheckPos() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallBgCheckPos__9daAlink_cFv.s" +} +#pragma pop + +/* 801127F0-80112C80 10D130 0490+00 1/1 0/0 0/0 .text setIronBallModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallModel() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80112C80-80112C84 10D5C0 0004+00 2/2 2/2 0/0 .text __ct__5csXyzFv */ +extern "C" void __ct__5csXyzFv() { + /* empty function */ +} + +/* 80112C84-80112E7C 10D5C4 01F8+00 1/1 0/0 0/0 .text + * setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallGroundVec(cXyz const* param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz.s" +} +#pragma pop + +/* 80112E7C-80113CA0 10D7BC 0E24+00 1/1 0/0 0/0 .text setIronBallChainPos__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallChainPos() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallChainPos__9daAlink_cFv.s" +} +#pragma pop + +/* 80113CA0-80113D58 10E5E0 00B8+00 1/1 0/0 0/0 .text checkIronBallReturnChange__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkIronBallReturnChange() { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallReturnChange__9daAlink_cFv.s" +} +#pragma pop + +/* 80113D58-801150E4 10E698 138C+00 1/1 0/0 0/0 .text setIronBallPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallPos() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallPos__9daAlink_cFv.s" +} +#pragma pop + +/* 801150E4-8011510C 10FA24 0028+00 10/10 0/0 0/0 .text checkIronBallAnime__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkIronBallAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkIronBallAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 8011510C-801151E0 10FA4C 00D4+00 1/1 0/0 0/0 .text setIronBallReadyAnime__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallReadyAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallReadyAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 801151E0-80115254 10FB20 0074+00 2/2 0/0 0/0 .text setIronBallBaseAnime__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setIronBallBaseAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setIronBallBaseAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80115254-801153F8 10FB94 01A4+00 1/1 0/0 0/0 .text checkUpperItemActionIronBall__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpperItemActionIronBall() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpperItemActionIronBall__9daAlink_cFv.s" +} +#pragma pop + +/* 801153F8-801154E4 10FD38 00EC+00 2/2 0/0 0/0 .text checkNextActionIronBall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionIronBall() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionIronBall__9daAlink_cFv.s" +} +#pragma pop + +/* 801154E4-80115564 10FE24 0080+00 1/1 0/0 0/0 .text procIronBallSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80115564-801155EC 10FEA4 0088+00 1/0 0/0 0/0 .text procIronBallSubject__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 801155EC-80115674 10FF2C 0088+00 1/1 0/0 0/0 .text procIronBallMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80115674-8011577C 10FFB4 0108+00 1/0 0/0 0/0 .text procIronBallMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallMove() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8011577C-80115860 1100BC 00E4+00 1/1 0/0 0/0 .text procIronBallThrowInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallThrowInit() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallThrowInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80115860-801159F0 1101A0 0190+00 1/0 0/0 0/0 .text procIronBallThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallThrow() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 801159F0-80115AA0 110330 00B0+00 2/2 0/0 0/0 .text procIronBallReturnInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallReturnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallReturnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80115AA0-80115C20 1103E0 0180+00 1/0 0/0 0/0 .text procIronBallReturn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procIronBallReturn() { + nofralloc +#include "asm/d/a/d_a_alink/procIronBallReturn__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_kandelaar.inc b/src/d/a/d_a_alink_kandelaar.inc new file mode 100644 index 00000000000..0167abe9209 --- /dev/null +++ b/src/d/a/d_a_alink_kandelaar.inc @@ -0,0 +1,236 @@ +/* 80110654-80110668 10AF94 0014+00 1/1 0/0 0/0 .text daAlink_searchTagKandelaar__FP10fopAc_ac_cPv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchTagKandelaar(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchTagKandelaar__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80110668-801106E8 10AFA8 0080+00 1/1 0/0 0/0 .text daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchTagKtOnFire(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 801106E8-8011078C 10B028 00A4+00 1/0 0/0 0/0 .text setKandelaarMtx__9daAlink_cFPA4_fii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setKandelaarMtx(f32 (*param_0)[4], int param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setKandelaarMtx__9daAlink_cFPA4_fii.s" +} +#pragma pop + +/* 8011078C-801107BC 10B0CC 0030+00 2/2 0/0 0/0 .text checkWaterInKandelaarOffset__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWaterInKandelaarOffset__9daAlink_cFf.s" +} +#pragma pop + +/* 801107BC-80110840 10B0FC 0084+00 2/2 0/0 0/0 .text checkWaterInKandelaar__9daAlink_cFf + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWaterInKandelaar(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWaterInKandelaar__9daAlink_cFf.s" +} +#pragma pop + +/* 80110840-8011087C 10B180 003C+00 13/13 0/0 0/0 .text offKandelaarModel__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::offKandelaarModel() { + nofralloc +#include "asm/d/a/d_a_alink/offKandelaarModel__9daAlink_cFv.s" +} +#pragma pop + +/* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text checkUseKandelaar__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkUseKandelaar(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkUseKandelaar__9daAlink_cFi.s" +} +#pragma pop + +/* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text checkKandelaarSwing__9daAlink_cCFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkKandelaarSwing(int param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkKandelaarSwing__9daAlink_cCFi.s" +} +#pragma pop + +/* 801108EC-80110BEC 10B22C 0300+00 1/1 0/0 0/0 .text kandelaarModelCallBack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::kandelaarModelCallBack() { + nofralloc +#include "asm/d/a/d_a_alink/kandelaarModelCallBack__9daAlink_cFv.s" +} +#pragma pop + +/* 80110BEC-80110C28 10B52C 003C+00 1/1 0/0 0/0 .text daAlink_kandelaarModelCallBack__FP8J3DJointi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_kandelaarModelCallBack__FP8J3DJointi.s" +} +#pragma pop + +/* 80110C28-80110C6C 10B568 0044+00 1/0 0/0 0/0 .text getKandelaarFlamePos__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::getKandelaarFlamePos() { + nofralloc +#include "asm/d/a/d_a_alink/getKandelaarFlamePos__9daAlink_cFv.s" +} +#pragma pop + +/* 80110C6C-80110C94 10B5AC 0028+00 3/3 0/0 0/0 .text checkKandelaarEquipAnime__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkKandelaarEquipAnime() const { + nofralloc +#include "asm/d/a/d_a_alink/checkKandelaarEquipAnime__9daAlink_cCFv.s" +} +#pragma pop + +/* 80110C94-80110E80 10B5D4 01EC+00 1/1 0/0 0/0 .text preKandelaarDraw__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::preKandelaarDraw() { + nofralloc +#include "asm/d/a/d_a_alink/preKandelaarDraw__9daAlink_cFv.s" +} +#pragma pop + +/* 80110E80-80110E84 10B7C0 0004+00 0/0 3/0 0/0 .text + * setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 */ +void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { + /* empty function */ +} + +/* 80110E84-80110F88 10B7C4 0104+00 4/4 0/0 0/0 .text setKandelaarModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setKandelaarModel() { + nofralloc +#include "asm/d/a/d_a_alink/setKandelaarModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80110F88-80110FE0 10B8C8 0058+00 3/3 0/0 0/0 .text resetOilBottleModel__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::resetOilBottleModel() { + nofralloc +#include "asm/d/a/d_a_alink/resetOilBottleModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80110FE0-801110B8 10B920 00D8+00 3/3 0/0 0/0 .text commonKandelaarPourInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonKandelaarPourInit() { + nofralloc +#include "asm/d/a/d_a_alink/commonKandelaarPourInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801110B8-8011130C 10B9F8 0254+00 3/3 0/0 0/0 .text commonKandelaarPour__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::commonKandelaarPour(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/commonKandelaarPour__9daAlink_cFi.s" +} +#pragma pop + +/* 8011130C-80111440 10BC4C 0134+00 1/1 0/0 0/0 .text initKandelaarSwing__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initKandelaarSwing() { + nofralloc +#include "asm/d/a/d_a_alink/initKandelaarSwing__9daAlink_cFv.s" +} +#pragma pop + +/* 80111440-801115CC 10BD80 018C+00 2/1 0/0 0/0 .text procKandelaarSwingInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procKandelaarSwingInit() { + nofralloc +#include "asm/d/a/d_a_alink/procKandelaarSwingInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801115CC-8011167C 10BF0C 00B0+00 1/0 0/0 0/0 .text procKandelaarSwing__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procKandelaarSwing() { + nofralloc +#include "asm/d/a/d_a_alink/procKandelaarSwing__9daAlink_cFv.s" +} +#pragma pop + +/* 8011167C-80111724 10BFBC 00A8+00 1/1 0/0 0/0 .text procKandelaarPourInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procKandelaarPourInit() { + nofralloc +#include "asm/d/a/d_a_alink/procKandelaarPourInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80111724-8011174C 10C064 0028+00 1/0 0/0 0/0 .text procKandelaarPour__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procKandelaarPour() { + nofralloc +#include "asm/d/a/d_a_alink/procKandelaarPour__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_link.inc b/src/d/a/d_a_alink_link.inc new file mode 100644 index 00000000000..ecb63a12d71 --- /dev/null +++ b/src/d/a/d_a_alink_link.inc @@ -0,0 +1,2570 @@ +/* 800C2DDC-800C2EAC 0BD71C 00D0+00 17/17 0/0 0/0 .text + * procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c */ +#ifdef NONMATCHING +void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { + commonProcInit(ACT_PROC_PREACTION_UNEQUIP); + mNormalSpeed = 0.0f; + setBlendMoveAnime(4.0f); + allUnequip(0); + field_0x3010 = 0; + + if (param_1 == NULL) { + field_0x300e = 0; + } else { + field_0x280c.setData(param_1); + field_0x300e = 1; + if (fopAcM_GetName(param_1) == 0x2cb) { + if (mEquipItem == KANTERA) { + field_0x3010 = 1; + } else { + if (i_checkNoResetFlg2(1) != 0) { + offKandelaarModel(); + } + } + } + } + + field_0x3198 = param_0; + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPreActionUnequipInit(int param_0, fopAc_ac_c* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c.s" +} +#pragma pop +#endif + +/* 800C2EAC-800C3098 0BD7EC 01EC+00 1/0 0/0 0/0 .text procPreActionUnequip__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procPreActionUnequip() { + nofralloc +#include "asm/d/a/d_a_alink/procPreActionUnequip__9daAlink_cFv.s" +} +#pragma pop + +/* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text procServiceWaitInit__9daAlink_cFv + */ +int daAlink_c::procServiceWaitInit() { + commonProcInit(PROC_SERVICE_WAIT); + setSingleAnimeBase(ANM_SERVICE_WAIT); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCurrent.mAngle.y = mCollisionRot.y; + field_0x2f98 = 4; + return 1; +} + +/* 800C30F0-800C3224 0BDA30 0134+00 1/0 0/0 0/0 .text procServiceWait__9daAlink_cFv */ +int daAlink_c::procServiceWait() { + J3DFrameCtrl* ctrl = &mFrameCtrl1[0]; + if ((!checkNextAction(0) && !checkFrontWallTypeAction()) && + (checkEventRun() || checkGuardActionChange() || mCollisionRot.y != field_0x2fe6)) { + ctrl->setRate(FLOAT_LABEL(lit_6108)); + procWaitInit(); + } else { + if (ctrl->checkPass(lit_10040)) { + voiceStart(Z2SE_AL_V_RELAX_A); + } else if (ctrl->checkPass(lit_11673)) { + voiceStart(Z2SE_AL_V_RELAX_B); + } else if (ctrl->checkPass(lit_25684)) { + voiceStart(Z2SE_AL_V_RELAX_C); + } + } + return 1; +} + +/* 800C3224-800C3338 0BDB64 0114+00 2/2 0/0 0/0 .text procTiredWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procTiredWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procTiredWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C3338-800C33B8 0BDC78 0080+00 1/0 0/0 0/0 .text procTiredWait__9daAlink_cFv */ +int daAlink_c::procTiredWait() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + if (!checkNextAction(0)) { + if (ctrl->checkAnmEnd()) { + setSingleAnimeBase(ANM_TIRED_WAIT); + } else if (ctrl->getAttribute() == 2) { + setTiredVoice(ctrl); + } + } + return 1; +} + +/* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text procWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C3504-800C36CC 0BDE44 01C8+00 1/0 0/0 0/0 .text procWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWait__9daAlink_cFv.s" +} +#pragma pop + +/* 800C36CC-800C3730 0BE00C 0064+00 3/3 0/0 0/0 .text procMoveInit__9daAlink_cFv */ +int daAlink_c::procMoveInit() { + if (!commonProcInitNotSameProc(PROC_MOVE)) { + return false; + } + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + setFootEffectProcType(3); + return 1; +} + +/* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text procMove__9daAlink_cFv */ +// results of cLib_minMaxLimit are put in r4 instead of r3 +#ifdef NONMATCHING +int daAlink_c::procMove() { + setFootEffectProcType(3); + if (!checkNextAction(0) && !checkFrontWallTypeAction()) { + if (mDemo.getDemoMode() == 2 && + mNormalSpeed > field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate) { + mNormalSpeed = field_0x594 * daAlinkHIO_move_c0::m.mWalkChangeRate; + } + setBlendMoveAnime(-1.0f); + if (field_0x3174 != 8) { + field_0x30a0 = + cLib_minMaxLimit((s16)(field_0x2ff0 >> 1), daAlinkHIO_basic_c0::m.mNeckMaxUp, + daAlinkHIO_basic_c0::m.mNeckMaxDown); + } + } + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procMove() { + nofralloc +#include "asm/d/a/d_a_alink/procMove__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800C3810-800C3868 0BE150 0058+00 1/1 0/0 0/0 .text procAtnMoveInit__9daAlink_cFv */ +int daAlink_c::procAtnMoveInit() { + if (!commonProcInitNotSameProc(PROC_ATN_MOVE)) { + return 0; + } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return 1; +} + +/* 800C3868-800C38CC 0BE1A8 0064+00 1/0 0/0 0/0 .text procAtnMove__9daAlink_cFv */ +int daAlink_c::procAtnMove() { + if (!checkNextAction(0)) { + if (field_0x2f98 != 0 || !checkFrontWallTypeAction()) { + setBlendAtnMoveAnime(lit_6041); + } + } + return 1; +} + +/* 800C38CC-800C397C 0BE20C 00B0+00 4/4 0/0 0/0 .text procAtnActorWaitInit__9daAlink_cFv + */ +int daAlink_c::procAtnActorWaitInit() { + if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_WAIT)) { + return 0; + } + + if (mTargetedActor != NULL) { + fopAcM_searchActorAngleY(this, mTargetedActor); + } + mNormalSpeed = FLOAT_LABEL(lit_6108); + if (field_0x2f98 != 2) { + field_0x2f98 = 3; + } + + if (checkAtnWaitAnime()) { + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } else { + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + } + + return 1; +} + +/* 800C397C-800C39EC 0BE2BC 0070+00 1/0 0/0 0/0 .text procAtnActorWait__9daAlink_cFv */ +int daAlink_c::procAtnActorWait() { + if (!checkNextAction(0)) { + if (checkAtnWaitAnime()) { + setBlendAtnMoveAnime(lit_6041); + } else { + setBlendMoveAnime(lit_6041); + } + checkSwordTwirlAction(); + } + return 1; +} + +/* 800C39EC-800C3A44 0BE32C 0058+00 3/3 0/0 0/0 .text procAtnActorMoveInit__9daAlink_cFv + */ +int daAlink_c::procAtnActorMoveInit() { + if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_MOVE)) { + return 0; + } + setBlendAtnMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + return 1; +} + +/* 800C3A44-800C3A94 0BE384 0050+00 1/0 0/0 0/0 .text procAtnActorMove__9daAlink_cFv */ +int daAlink_c::procAtnActorMove() { + if (!checkNextAction(0)) { + setBlendAtnMoveAnime(lit_6041); + checkSwordTwirlAction(); + } + return 1; +} + +/* 800C3A94-800C3B1C 0BE3D4 0088+00 2/2 0/0 0/0 .text procWaitTurnInit__9daAlink_cFv */ +int daAlink_c::procWaitTurnInit() { + if (!commonProcInitNotSameProc(PROC_WAIT_TURN)) { + return 0; + } + + setSingleAnimeBaseSpeed(ANM_WAIT_TURN, daAlinkHIO_basic_c0::m.mWaitTurnSpeed, + daAlinkHIO_basic_c0::m.mAnmBlendFactor); + if (checkEventRun()) { + mNormalSpeed = FLOAT_LABEL(lit_6108); + } + field_0x300e = field_0x2fe2; + mCurrent.mAngle.y = mCollisionRot.y; + return 1; +} + +/* 800C3B1C-800C3C3C 0BE45C 0120+00 1/0 0/0 0/0 .text procWaitTurn__9daAlink_cFv */ +int daAlink_c::procWaitTurn() { + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), daAlinkHIO_move_c0::m.mDeceleration); + if (checkGroundSpecialMode()) { + return 1; + } else { + if (i_checkEndResetFlg0(ERFLG0_UNK_100000)) { + return procFloorDownReboundInit(); + } else { + s16 angle = cLib_addCalcAngleS(&mCollisionRot.y, field_0x300e, 30, 0x3CDF, 8000); + mCurrent.mAngle.y = mCollisionRot.y; + if (checkNextActionFromButton()) { + return 1; + } else { + if (angle == 0) { + if (checkEventRun()) { + if (mDemo.getDemoMode() == 5) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else if (!checkNextAction(0)) { + checkWaitAction(); + } + } else { + checkNextAction(0); + } + } + } + } + } + return 1; +} + +/* 800C3C3C-800C3D38 0BE57C 00FC+00 2/2 0/0 0/0 .text procMoveTurnInit__9daAlink_cFi */ +int daAlink_c::procMoveTurnInit(int param_0) { + if (!commonProcInitNotSameProc(PROC_MOVE_TURN)) { + return 0; + } + + setBlendMoveAnime(daAlinkHIO_basic_c0::m.mAnmBlendFactor); + dComIfGp_setPlayerStatus0(0, 0x800); + + if (param_0 != 0) { + field_0x300e = (daAlinkHIO_move_c0::m.mMaxTurnAngle << 2) + 19030; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x300a = 2; + mCurrent.mAngle.y = field_0x2fe2; + mNormalSpeed *= lit_5943; + } else { + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; + field_0x300a = 3; + } + field_0x300e = daAlinkHIO_move_c0::m.mMaxTurnAngle << 1; + field_0x3010 = daAlinkHIO_move_c0::m.mMaxTurnAngle; + return 1; +} + +/* 800C3D38-800C3DA0 0BE678 0068+00 1/0 0/0 0/0 .text procMoveTurn__9daAlink_cFv */ +int daAlink_c::procMoveTurn() { + setSpeedAndAngleNormal(); + cLib_addCalcAngleS(&mCollisionRot.y, mCurrent.mAngle.y, field_0x300a, field_0x300e, + field_0x3010); + + if (!checkNextAction(0)) { + setBlendMoveAnime(lit_6041); + } + return 1; +} + +/* 800C3DA0-800C3F60 0BE6E0 01C0+00 2/2 0/0 0/0 .text procSideStepInit__9daAlink_cFi */ +int daAlink_c::procSideStepInit(int jump_type) { + if (jump_type == 1 && !checkHeavyStateOn(1, 1) && + (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime())) { + return procBackJumpInit(0); + } else { + commonProcInit(PROC_SIDESTEP); + field_0x2f98 = jump_type; + + if (field_0x2f98 == 1) { + mCurrent.mAngle.y = mCollisionRot.y + 0x8000; + setSingleAnimeParam(ANM_BACK_JUMP, &daAlinkHIO_sideStep_c0::m.mBackJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mBackJumpSpeedV; + field_0x300a = 0; + } else { + daAlink_ANM anm_id; + if (field_0x2f98 == 2) { + anm_id = ANM_SIDE_STEP_LEFT; + mCurrent.mAngle.y = mCollisionRot.y + 0x4000; + } else { + anm_id = ANM_SIDE_STEP_RIGHT; + mCurrent.mAngle.y = mCollisionRot.y - 0x4000; + } + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideJumpAnm); + mNormalSpeed = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedH; + mSpeed.y = daAlinkHIO_sideStep_c0::m.mSideJumpSpeedV; + field_0x300a = 1; + } + if (i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + mSpeed.y *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityY; + } + voiceStart(Z2SE_AL_V_JUMP_S); + mCommonCounter = 0; + field_0x300e = 0; + return 1; + } +} + +/* 800C3F60-800C40F0 0BE8A0 0190+00 1/0 0/0 0/0 .text procSideStep__9daAlink_cFv */ +int daAlink_c::procSideStep() { + if (mTargetedActor != NULL && field_0x300a != 0) { + s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor); + cLib_addCalcAngleS(&mCollisionRot.y, actor_angle, 5, 0x5E8, 0x13C); + if (field_0x2f98 == 2) { + mCurrent.mAngle.y = mCollisionRot.y + 0x4000; + } else { + mCurrent.mAngle.y = mCollisionRot.y - 0x4000; + } + } + if (doTrigger() && field_0x300a != 0) { + mCommonCounter = 1; + } + + if (checkUpperItemActionFly()) { + return true; + } else if (mLinkAcch.ChkGroundHit() && field_0x300e != 0) { + if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + return true; + } else { + return procSideStepLandInit(); + } + } else if (checkNoUpperAnime() && checkForceSwordSwing()) { + setCutDash(1, 0); + } else if (mDemo.getDemoMode() != 16 && + mCurrent.mPosition.y < mLastJumpPos.y - daAlinkHIO_sideStep_c0::m.mFallHeight) { + return procFallInit(2, daAlinkHIO_sideStep_c0::m.mFallInterpolation); + } + + field_0x300e = 1; + checkItemChangeFromButton(); + return 1; +} + +/* 800C40F0-800C4278 0BEA30 0188+00 1/1 0/0 0/0 .text procSideStepLandInit__9daAlink_cFv + */ +int daAlink_c::procSideStepLandInit() { + commonProcInit(PROC_SIDESTEP_LAND); + if (field_0x2f98 == 1) { + field_0x2f9d = 4; + setSingleAnimeParam(ANM_BACK_JUMP_LAND, &daAlinkHIO_sideStep_c0::m.mBackLandAnm); + field_0x3478 = daAlinkHIO_sideStep_c0::m.mBackLandAnm.field_0x10; + field_0x2f98 = 2; + field_0x300a = 0; + field_0x2fb0 = 0; + field_0x2fcc = 10; + } else { + daAlink_ANM anm_id; + u16 uvar3; + if (field_0x2f98 == 2) { + anm_id = ANM_SIDE_STEP_LEFT_LAND; + uvar3 = 0x3F; + } else { + anm_id = ANM_SIDE_STEP_RIGHT_LAND; + uvar3 = 0x40; + } + setSingleAnimeParam(anm_id, &daAlinkHIO_sideStep_c0::m.mSideLandAnm); + field_0x3478 = daAlinkHIO_sideStep_c0::m.mSideLandAnm.field_0x10; + field_0x300a = 1; + field_0x2fb0 = 8; + field_0x2fcc = 0; + if (checkEnemyGroup(mTargetedActor) && mEquipItem == EQUIP_SWORD && checkNoUpperAnime()) { + setUpperAnimeBaseSpeed(uvar3, daAlinkHIO_atnMove_c0::m.mWaitAnmSpeed, lit_6041); + seStartSwordCut(Z2SE_AL_WAIT_SWORD_SWING); + } + } + field_0x2f9d = 4; + setFootEffectProcType(2); + i_onResetFlg1(0x30); + mNormalSpeed = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + mCurrent.mAngle.y = mCollisionRot.y; + setStepLandVibration(); + return 1; +} + +/* 800C4278-800C4378 0BEBB8 0100+00 1/0 0/0 0/0 .text procSideStepLand__9daAlink_cFv */ +int daAlink_c::procSideStepLand() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + i_onEndResetFlg0(ERFLG0_UNK_8000000); + if (field_0x2fcc != 0) { + field_0x2fcc = 10; + } + + if (doTrigger() && field_0x300a != 0) { + mCommonCounter = 1; + } + + if (ctrl->checkAnmEnd()) { + if (mDemo.getDemoMode() == 16) { + dComIfGp_evmng_cutEnd(field_0x3184); + } else { + checkNextAction(0); + } + } else if (ctrl->getFrame() > field_0x3478) { + if (mCommonCounter != 0 && checkSideRollAction(field_0x2f98)) { + return 1; + } + checkNextAction(1); + } + + return 1; +} + +/* 800C4378-800C4514 0BECB8 019C+00 1/1 0/0 0/0 .text procSlideInit__9daAlink_cFs */ +int daAlink_c::procSlideInit(s16 param_0) { + commonProcInit(PROC_SLIDE); + + field_0x814.SetWeight(255); + field_0x3090 = 8; + mCurrent.mAngle.y = param_0; + + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == 0xD4) { + field_0x300e = 1; + } else { + field_0x300e = 0; + } + + if (cLib_distanceAngleS(param_0, mCollisionRot.y) < 0x3800 || field_0x300e != 0) { + field_0x3198 = 1; + setSingleAnimeParam(ANM_FORWARD_SLIDE, &daAlinkHIO_slide_c0::m.mForwardSlideAnm); + dComIfGp_setPlayerStatus1(0, 0x100); + onModeFlg(MODE_UNK_8000); + onModeFlg(MODE_UNK_2000000); + onModeFlg(MODE_UNK_20000000); + mNormalSpeed = FLOAT_LABEL(lit_6108); + field_0x2f9d = 4; + setUpperAnimeBaseMorf(0xCE, lit_6041); + i_onNoResetFlg1(0x10000000); + setFootEffectProcType(0); + } else { + field_0x3198 = 0; + setSingleAnimeParam(ANM_BACKWARD_SLIDE, &daAlinkHIO_slide_c0::m.mBackwardSlideAnm); + dComIfGp_setPlayerStatus1(0, 0x200); + field_0x2f9d = 0x60; + setFootEffectProcType(1); + } + field_0x594 = daAlinkHIO_slide_c0::m.mMaxSpeed; + field_0x33cc = FLOAT_LABEL(lit_6108); + mCommonCounter = 0; + field_0x3010 = 0; + return 1; +} + +/* ############################################################################################## */ +/* 804532E0-804532E4 0018E0 0004+00 1/1 0/0 0/0 .sdata2 @73057 */ +SECTION_SDATA2 static f32 lit_73057 = -4096.0f; + +/* 800C4514-800C47AC 0BEE54 0298+00 1/0 0/0 0/0 .text procSlide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSlide() { + nofralloc +#include "asm/d/a/d_a_alink/procSlide__9daAlink_cFv.s" +} +#pragma pop + +/* 800C47AC-800C4894 0BF0EC 00E8+00 1/1 0/0 0/0 .text procSlideLandInit__9daAlink_cFi */ +int daAlink_c::procSlideLandInit(int param_0) { + commonProcInit(PROC_SLIDE_LAND); + + if (param_0 != 0) { + setSingleAnimeParam(ANM_BACKWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mForwardLandAnm); + field_0x3478 = daAlinkHIO_slide_c0::m.mForwardLandAnm.field_0x10; + field_0x3198 = 1; + field_0x2f99 = 4; + field_0x3588 = l_waitBaseAnime; + } else { + setSingleAnimeParam(ANM_FORWARD_SLIDE_LAND, &daAlinkHIO_slide_c0::m.mBackwardLandAnm); + field_0x3478 = daAlinkHIO_slide_c0::m.mBackwardLandAnm.field_0x10; + field_0x3198 = 0; + } + field_0x814.SetWeight(255); + mNormalSpeed *= lit_5943; + return 1; +} + +/* 800C4894-800C494C 0BF1D4 00B8+00 1/0 0/0 0/0 .text procSlideLand__9daAlink_cFv */ +int daAlink_c::procSlideLand() { + daPy_frameCtrl_c* ctrl = &mFrameCtrl1[0]; + + cLib_chaseF(&mNormalSpeed, FLOAT_LABEL(lit_6108), lit_7450); + if (field_0x3198 != 0) { + field_0x2f99 = 4; + } + + if (ctrl->checkAnmEnd()) { + mCurrent.mAngle.y = mCollisionRot.y; + checkNextAction(0); + } else { + if (ctrl->getFrame() > field_0x3478) { + s16 tmp_angle = mCurrent.mAngle.y; + mCurrent.mAngle.y = mCollisionRot.y; + if (!checkNextAction(1)) { + mCurrent.mAngle.y = tmp_angle; + } + } + } + return 1; +} + +/* 800C494C-800C4B40 0BF28C 01F4+00 4/3 0/0 0/0 .text procFrontRollInit__9daAlink_cFv */ +#ifdef NONMATCHING +int daAlink_c::procFrontRollInit() { + BOOL check = checkUpperGuardAnime(); + if (mProcID == PROC_FRONT_ROLL && mDemo.getDemoMode() == 0x28) { + return 0; + } else { + BOOL check = mProcID == PROC_DIVE_JUMP; + commonProcInit(PROC_FRONT_ROLL); + + f32 fvar1; + if (!check) { + fvar1 = daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04; + } else { + fvar1 = lit_7977; + } + setSingleAnime(ANM_FRONT_ROLL, daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x04, fvar1, + daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x00, + daAlinkHIO_frontRoll_c0::m.mRollAnm.field_0x0c); + mNormalSpeed = + mSpeedF * daAlinkHIO_frontRoll_c0::m.mInitSpeed + daAlinkHIO_frontRoll_c0::m.mSpeedRate; + if (mNormalSpeed > daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08) { + mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mCrashHitAnm.field_0x08; + } + if (mNormalSpeed < daAlinkHIO_frontRoll_c0::m.mMinSpeed) { + mNormalSpeed = daAlinkHIO_frontRoll_c0::m.mMinSpeed; + } + + if (!i_checkNoResetFlg0(UNDER_WATER_MOVEMENT)) { + if (checkHeavyStateOn(1, 1)) { + mNormalSpeed *= mHeavySpeedMultiplier; + } + } else { + mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX; + } + mCurrent.mAngle.y = mCollisionRot.y; + voiceStart(Z2SE_AL_V_BACKTEN); + mCommonCounter = 0; + setFootEffectProcType(0); + if (check) { + i_onNoResetFlg0(2); + } + if (i_checkEquipHeavyBoots()) { + field_0xFB8.SetAtType(0x200000); + field_0xFB8.SetAtHitMark(1); + field_0xFB8.SetAtSe(9); + field_0xFB8.SetAtAtp(2); + field_0xFB8.SetAtMtrl(0); + field_0xFB8.ResetAtHit(); + field_0xFB8.SetR(daAlinkHIO_frontRoll_c0::m.mBootsAttackRadius); + field_0xFB8.OnAtSetBit(); + } + return 1; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procFrontRollInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRollInit__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 800C4B40-800C4F14 0BF480 03D4+00 1/0 0/0 0/0 .text procFrontRoll__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFrontRoll() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRoll__9daAlink_cFv.s" +} +#pragma pop + +/* 800C4F14-800C4FFC 0BF854 00E8+00 1/1 0/0 0/0 .text procFrontRollCrashInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFrontRollCrashInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRollCrashInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C4FFC-800C5160 0BF93C 0164+00 1/0 0/0 0/0 .text procFrontRollCrash__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFrontRollCrash() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRollCrash__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5160-800C5240 0BFAA0 00E0+00 3/3 0/0 0/0 .text procFrontRollSuccessInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFrontRollSuccessInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRollSuccessInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5240-800C5328 0BFB80 00E8+00 1/0 0/0 0/0 .text procFrontRollSuccess__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFrontRollSuccess() { + nofralloc +#include "asm/d/a/d_a_alink/procFrontRollSuccess__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5328-800C5484 0BFC68 015C+00 3/3 0/0 0/0 .text procSideRollInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procSideRollInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procSideRollInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800C5484-800C5700 0BFDC4 027C+00 1/0 0/0 0/0 .text procSideRoll__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSideRoll() { + nofralloc +#include "asm/d/a/d_a_alink/procSideRoll__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5700-800C57A4 0C0040 00A4+00 2/2 0/0 0/0 .text backJumpSpeedDec__9daAlink_cFv */ +void daAlink_c::backJumpSpeedDec() { + if (mLinkAcch.ChkGroundHit()) { + if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { + f32 jump_speed; + if (dBgS_CheckBWallPoly(mLinkAcch.m_gnd)) { + jump_speed = FLOAT_LABEL(lit_6108); + } else { + jump_speed = field_0x3478 * cM_scos(field_0x2ff0); + if (field_0x2ff0 > 0) { + jump_speed *= cM_scos(field_0x2ff0); + } + } + + if (mNormalSpeed > jump_speed) { + mNormalSpeed = jump_speed; + } + } + } +} + +/* 800C57A4-800C5964 0C00E4 01C0+00 6/6 0/0 0/0 .text procBackJumpInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procBackJumpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBackJumpInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800C5964-800C5A54 0C02A4 00F0+00 1/0 0/0 0/0 .text procBackJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBackJump() { + nofralloc +#include "asm/d/a/d_a_alink/procBackJump__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5A54-800C5AF0 0C0394 009C+00 1/1 0/0 0/0 .text procBackJumpLandInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBackJumpLandInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procBackJumpLandInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800C5AF0-800C5C28 0C0430 0138+00 1/0 0/0 0/0 .text procBackJumpLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procBackJumpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procBackJumpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5C28-800C5CA4 0C0568 007C+00 1/1 0/0 0/0 .text procSlipInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSlipInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSlipInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5CA4-800C5E68 0C05E4 01C4+00 1/0 0/0 0/0 .text procSlip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSlip() { + nofralloc +#include "asm/d/a/d_a_alink/procSlip__9daAlink_cFv.s" +} +#pragma pop + +/* 800C5E68-800C61EC 0C07A8 0384+00 4/4 0/0 0/0 .text procAutoJumpInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procAutoJumpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procAutoJumpInit__9daAlink_cFi.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804532E4-804532E8 0018E4 0004+00 1/1 0/0 0/0 .sdata2 @73781 */ +SECTION_SDATA2 static f32 lit_73781 = 2.0f / 3.0f; + +/* 800C61EC-800C66DC 0C0B2C 04F0+00 1/0 0/0 0/0 .text procAutoJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procAutoJump() { + nofralloc +#include "asm/d/a/d_a_alink/procAutoJump__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804532E8-804532EC 0018E8 0004+00 1/1 0/0 0/0 .sdata2 @73790 */ +SECTION_SDATA2 static f32 lit_73790 = 92.0f; + +/* 800C66DC-800C6798 0C101C 00BC+00 1/1 0/0 0/0 .text procDiveJumpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDiveJumpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procDiveJumpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C6798-800C6850 0C10D8 00B8+00 1/0 0/0 0/0 .text procDiveJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procDiveJump() { + nofralloc +#include "asm/d/a/d_a_alink/procDiveJump__9daAlink_cFv.s" +} +#pragma pop + +/* 800C6850-800C692C 0C1190 00DC+00 1/1 0/0 0/0 .text procRollJumpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRollJumpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procRollJumpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C692C-800C6A48 0C126C 011C+00 1/0 0/0 0/0 .text procRollJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procRollJump() { + nofralloc +#include "asm/d/a/d_a_alink/procRollJump__9daAlink_cFv.s" +} +#pragma pop + +/* 800C6A48-800C6D20 0C1388 02D8+00 30/30 0/0 0/0 .text procFallInit__9daAlink_cFif */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procFallInit(int param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procFallInit__9daAlink_cFif.s" +} +#pragma pop + +/* 800C6D20-800C6F18 0C1660 01F8+00 1/0 0/0 0/0 .text procFall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFall() { + nofralloc +#include "asm/d/a/d_a_alink/procFall__9daAlink_cFv.s" +} +#pragma pop + +/* 800C6F18-800C6FE4 0C1858 00CC+00 6/6 0/0 0/0 .text procLandInit__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLandInit(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procLandInit__9daAlink_cFf.s" +} +#pragma pop + +/* 800C6FE4-800C70F8 0C1924 0114+00 1/0 0/0 0/0 .text procLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procLand() { + nofralloc +#include "asm/d/a/d_a_alink/procLand__9daAlink_cFv.s" +} +#pragma pop + +/* 800C70F8-800C72D4 0C1A38 01DC+00 3/3 0/0 0/0 .text procSmallJumpInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procSmallJumpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procSmallJumpInit__9daAlink_cFi.s" +} +#pragma pop + +/* 800C72D4-800C74D4 0C1C14 0200+00 1/0 0/0 0/0 .text procSmallJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSmallJump() { + nofralloc +#include "asm/d/a/d_a_alink/procSmallJump__9daAlink_cFv.s" +} +#pragma pop + +/* 800C74D4-800C755C 0C1E14 0088+00 1/1 0/0 0/0 .text procStepMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procStepMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procStepMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C755C-800C7690 0C1E9C 0134+00 1/0 0/0 0/0 .text procStepMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procStepMove() { + nofralloc +#include "asm/d/a/d_a_alink/procStepMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800C7690-800C76F8 0C1FD0 0068+00 1/0 0/0 0/0 .text procCrouchInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrouchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCrouchInit__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804532EC-804532F0 0018EC 0004+00 1/1 0/0 0/0 .sdata2 @74138 */ +SECTION_SDATA2 static f32 lit_74138 = -80.0f; + +/* 800C76F8-800C77F4 0C2038 00FC+00 1/0 0/0 0/0 .text procCrouch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCrouch() { + nofralloc +#include "asm/d/a/d_a_alink/procCrouch__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804255F8-80425604 052318 000C+00 0/1 0/0 0/0 .bss @4419 */ +#pragma push +#pragma force_active on +static u8 lit_4419[12]; +#pragma pop + +/* 80425604-80425610 052324 000C+00 0/1 0/0 0/0 .bss l_sumouBaseAnimeSp */ +#pragma push +#pragma force_active on +static u8 l_sumouBaseAnimeSp[12]; +#pragma pop + +/* 80425610-8042561C 052330 000C+00 0/1 0/0 0/0 .bss @4420 */ +#pragma push +#pragma force_active on +static u8 lit_4420[12]; +#pragma pop + +/* 8042561C-80425628 05233C 000C+00 37/39 0/0 0/0 .bss l_wolfBaseAnime */ +static Vec l_wolfBaseAnime; + +bool daMidna_c::checkMidnaRealBody() { + return dKy_darkworld_check() == 1 || dComIfGs_isTransformLV(3); +} + +/* 800C77F4-800C7C64 0C2134 0470+00 4/2 0/0 0/0 .text procCoMetamorphoseInit__9daAlink_cFv */ +// 1 missing instruction, lots of regalloc. maybe related +#ifdef NONMATCHING +int daAlink_c::procCoMetamorphoseInit() { + int svar8 = 0; + + if (i_dComIfGp_getEvent().i_isOrderOK()) { + if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { + return 0; + } + mDemo.i_setSpecialDemoType(); + mDamageTimer = 0; + svar8 = 1; + } + + if (!commonProcInitNotSameProc(METAMORPHOSE)) { + return 1; + } + + field_0x3198 = svar8; + field_0x3008 = 0; + field_0x300e = 0; + field_0x3010 = 0; + field_0x347c = 1.0f; + mFallVoiceInit = 0; + + if ((i_checkWolf() && mDemo.getDemoMode() == 0x39) || + (!i_checkWolf() && mDemo.getDemoMode() == 0x3A)) { + field_0x300a = 1; + mSpeed.y = 0.0f; + mNormalSpeed = 0.0f; + if (i_checkWolf()) { + mCommonCounter = mCollisionRot.x; + } + } else { + deleteEquipItem(0, 1); + + if (i_checkEndResetFlg0(ERFLG0_UNK_2) && checkStageName("D_MN08")) { + field_0x3010 = 1; + } + field_0x300a = 0; + + if (i_checkWolf()) { + // Transform Wolf -> Human + setSingleAnimeWolfBase(ANM_TRANFORM_HUMAN); + field_0x3588 = l_wolfBaseAnime; + field_0x347c = 0.5f; + field_0x3480 = daAlinkHIO_basic_c0::m.mWolfLinkTransformSpeed; + mCommonCounter = mCollisionRot.x; + + daMidna_c* midna = getMidnaActor(); + if (i_checkMidnaRide() && midna->checkMidnaRealBody() && midna->checkDemoTypeNone()) { + midna->changeOriginalDemo(); + midna->changeDemoMode(15); + } + } else { + // Transform Human -> Wolf + if (mDemo.getDemoMode() == 0x39 && mDemo.getParam1() == 1) { + voiceStart(Z2SE_AL_V_TRANSFORM); + } + setSingleAnimeBase(ANM_TRANSFORM_WOLF); + setMetamorphoseModel(1); + field_0x3588 = l_waitBaseAnime; + field_0x3480 = daAlinkHIO_basic_c0::m.mLinkWolfTransformSpeed; + + cXyz pos(mCurrent.mPosition.x + (cM_ssin(mCollisionRot.y) * 100.0f), + mCurrent.mPosition.y + 300.0f, + mCurrent.mPosition.z + (cM_scos(mCollisionRot.y) * 100.0f)); + mLinkGndChk.SetPos(&pos); + + f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); + if (gnd_cross != -1000000000.0f) { + pos.y = -1000000000.0f; + cXyz tmp_4c = mCurrent.mPosition; + cXyz tmp_58 = pos; + BOOL check = false; + for (int i = 0; i < 4; i++) { + if (i == 3) { + tmp_4c.y = gnd_cross + 5.0f; + } else { + tmp_4c.y = mCurrent.mPosition.y + field_0x18B0[i].GetWallH(); + } + tmp_58.y = tmp_4c.y; + + if (commonLineCheck(&tmp_4c, &tmp_58) && dBgS_CheckBWallPoly(mLinkLinChk)) { + if (dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7) { + check = true; + break; + } + } + } + + if (check) { + mCommonCounter = field_0x2ff0; + } else { + pos -= mCurrent.mPosition; + pos.atan2sY_XZ(); + mCommonCounter = svar8; + + if (cM_deg2s(70.0f) < abs(mCommonCounter)) { + mCommonCounter = field_0x2ff0; + } + } + } else { + mCommonCounter = 0; + } + } + mSpeed.y = 0.0f; + mNormalSpeed = 0.0f; + field_0x3012 = 0; + } + + field_0x3484 = mCurrent.mPosition.y; + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procCoMetamorphoseInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoMetamorphoseInit__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* ############################################################################################## */ +/* 80392070-8039207C 01E6D0 000C+00 0/1 0/0 0/0 .rodata @74273 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const lit_74273[12] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x80392070, &lit_74273); +#pragma pop + +/* 804532F0-804532F4 0018F0 0004+00 1/1 0/0 0/0 .sdata2 @74385 */ +SECTION_SDATA2 static f32 lit_74385 = 1.0f / 26.0f; + +/* 804532F4-804532F8 0018F4 0004+00 1/1 0/0 0/0 .sdata2 @74386 */ +SECTION_SDATA2 static f32 lit_74386 = -64.0f; + +/* 804532F8-80453300 0018F8 0008+00 1/1 0/0 0/0 .sdata2 @74387 */ +SECTION_SDATA2 static f64 lit_74387 = 15.0; + +/* 80453300-80453308 001900 0008+00 1/1 0/0 0/0 .sdata2 @74388 */ +SECTION_SDATA2 static f64 lit_74388 = 49.0; + +/* 80453308-80453310 001908 0008+00 1/1 0/0 0/0 .sdata2 @74389 */ +SECTION_SDATA2 static f64 lit_74389 = 1.0; + +/* 80453310-80453318 001910 0008+00 1/1 0/0 0/0 .sdata2 @74390 */ +SECTION_SDATA2 static f64 lit_74390 = 1.0 / 14.0; + +/* 80453318-80453320 001918 0008+00 1/1 0/0 0/0 .sdata2 @74391 */ +SECTION_SDATA2 static f64 lit_74391 = -64.0; + +/* 80453320-80453328 001920 0008+00 1/1 0/0 0/0 .sdata2 @74392 */ +SECTION_SDATA2 static f64 lit_74392 = -15.0; + +/* 80453328-80453330 001928 0008+00 1/1 0/0 0/0 .sdata2 @74393 */ +SECTION_SDATA2 static f64 lit_74393 = 1.0 / 9.0; + +/* 80453330-80453334 001930 0004+00 1/1 0/0 0/0 .sdata2 @74394 */ +SECTION_SDATA2 static f32 lit_74394 = 49.0f; + +/* 80453334-80453338 001934 0004+00 1/1 0/0 0/0 .sdata2 @74395 */ +SECTION_SDATA2 static f32 lit_74395 = 1.0f / 36.0f; + +/* 800C7C64-800C82E8 0C25A4 0684+00 1/0 0/0 0/0 .text procCoMetamorphose__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoMetamorphose() { + nofralloc +#include "asm/d/a/d_a_alink/procCoMetamorphose__9daAlink_cFv.s" +} +#pragma pop + +/* 800C82E8-800C83A0 0C2C28 00B8+00 2/0 0/0 0/0 .text procCoMetamorphoseOnlyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoMetamorphoseOnlyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoMetamorphoseOnlyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C83A0-800C8460 0C2CE0 00C0+00 1/0 0/0 0/0 .text procCoMetamorphoseOnly__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoMetamorphoseOnly() { + nofralloc +#include "asm/d/a/d_a_alink/procCoMetamorphoseOnly__9daAlink_cFv.s" +} +#pragma pop + +/* 800C8460-800C84D0 0C2DA0 0070+00 2/2 0/0 0/0 .text procFloorDownReboundInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::procFloorDownReboundInit() { + nofralloc +#include "asm/d/a/d_a_alink/procFloorDownReboundInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800C84D0-800C854C 0C2E10 007C+00 1/0 0/0 0/0 .text procFloorDownRebound__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procFloorDownRebound() { + nofralloc +#include "asm/d/a/d_a_alink/procFloorDownRebound__9daAlink_cFv.s" +} +#pragma pop + +/* 800C854C-800C85D8 0C2E8C 008C+00 1/1 0/0 0/0 .text + * procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 800C85D8-800C8700 0C2F18 0128+00 1/0 0/0 0/0 .text procGoronRideWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGoronRideWait() { + nofralloc +#include "asm/d/a/d_a_alink/procGoronRideWait__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 8039207C-80392088 01E6DC 000C+00 0/1 0/0 0/0 .rodata @74748 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const lit_74748[12] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; +COMPILER_STRIP_GATE(0x8039207C, &lit_74748); +#pragma pop + +/* 80392088-80392094 01E6E8 000C+00 0/1 0/0 0/0 .rodata localBoomCatchPos$74910 */ +#pragma push +#pragma force_active on +SECTION_RODATA static u8 const localBoomCatchPos[12] = { + 0x41, 0x95, 0x99, 0x9A, 0x43, 0x12, 0x4C, 0xCD, 0x42, 0x8A, 0x66, 0x66, +}; +COMPILER_STRIP_GATE(0x80392088, &localBoomCatchPos); +#pragma pop + +/* 80392094-80392094 01E6F4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +#pragma push +#pragma force_active on +SECTION_DEAD static char const* const stringBase_803925D1 = "Alink"; +SECTION_DEAD static char const* const stringBase_803925D7 = "kiko_yami"; +SECTION_DEAD static char const* const stringBase_803925E1 = "fire_insect"; +SECTION_DEAD static char const* const stringBase_803925ED = "MapToolCamera19"; +SECTION_DEAD static char const* const stringBase_803925FD = "yami_mog"; +SECTION_DEAD static char const* const stringBase_80392606 = "R_SP109"; +SECTION_DEAD static char const* const stringBase_8039260E = "MapToolCamera1"; +SECTION_DEAD static char const* const stringBase_8039261D = "MapToolCamera2"; +SECTION_DEAD static char const* const stringBase_8039262C = "MapToolCamera23"; +/* @stringBase0 padding */ +SECTION_DEAD static char const* const pad_8039263C = "\0\0\0"; +#pragma pop + +/* 800C8700-800CAFA8 0C3040 28A8+00 1/1 0/0 0/0 .text execute__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::execute() { + nofralloc +#include "asm/d/a/d_a_alink/execute__9daAlink_cFv.s" +} +#pragma pop + +/* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text daAlink_Execute__FP9daAlink_c */ +static void daAlink_Execute(daAlink_c* pLinkPtr) { + pLinkPtr->execute(); +} + +/* 800CAFC8-800CB480 0C5908 04B8+00 2/2 0/0 0/0 .text setDrawHand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDrawHand() { + nofralloc +#include "asm/d/a/d_a_alink/setDrawHand__9daAlink_cFv.s" +} +#pragma pop + +/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */ +bool daAlink_c::checkSwordDraw() { + return ((i_checkSwordGet() && mSwordChangeWaitTimer == 0) && + !i_checkNoResetFlg2(FLG2_UNK_2080000)) && + (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); +} + +bool daPy_py_c::i_checkShieldGet() const { + return dComIfGs_getSelectEquipShield() != NO_ITEM; +} + +/* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text checkShieldDraw__9daAlink_cFv */ +bool daAlink_c::checkShieldDraw() { + return ((i_checkShieldGet() && mShieldChangeWaitTimer == 0) && + !i_checkNoResetFlg2(FLG2_UNK_4080000)) && + (!i_checkWolf() || !i_dComIfGs_isEventBit(0x0C08)); +} + +/* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */ +bool daAlink_c::checkItemDraw() { + if (mHeldItemModel != NULL && (mEquipItem != IRONBALL || !checkSwordEquipAnime())) { + if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() || + field_0x2e44.checkPassNum(15)) { + return true; + } + } + return false; +} + +/* 800CB694-800CBA38 0C5FD4 03A4+00 0/0 0/0 1/1 .text initShadowScaleLight__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initShadowScaleLight() { + nofralloc +#include "asm/d/a/d_a_alink/initShadowScaleLight__9daAlink_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 80453338-8045333C 001938 0004+00 1/1 0/0 0/0 .sdata2 @75939 */ +SECTION_SDATA2 static f32 lit_75939 = 50000.0f; + +/* 800CBA38-800CBC18 0C6378 01E0+00 0/0 0/0 1/1 .text moveShadowScaleLight__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::moveShadowScaleLight() { + nofralloc +#include "asm/d/a/d_a_alink/moveShadowScaleLight__9daAlink_cFv.s" +} +#pragma pop + +/* 800CBC18-800CC25C 0C6558 0644+00 1/1 0/0 0/0 .text shadowDraw__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::shadowDraw() { + nofralloc +#include "asm/d/a/d_a_alink/shadowDraw__9daAlink_cFv.s" +} +#pragma pop + +/* 800CC25C-800CC298 0C6B9C 003C+00 3/3 0/0 0/0 .text modelCalc__9daAlink_cFP8J3DModel */ +void daAlink_c::modelCalc(J3DModel* p_model) { + if (mClothesChangeWaitTimer == 0) { + p_model->calc(); + } +} + +/* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::basicModelDraw(J3DModel* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/basicModelDraw__9daAlink_cFP8J3DModel.s" +} +#pragma pop + +/* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text modelDraw__9daAlink_cFP8J3DModeli + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::modelDraw(J3DModel* param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/modelDraw__9daAlink_cFP8J3DModeli.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 8045333C-80453344 00193C 0008+00 1/1 0/0 0/0 .sdata2 notColor0$76211 */ +SECTION_SDATA2 static u8 notColor0[8] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, +}; + +/* 800CC364-800CC7DC 0C6CA4 0478+00 2/2 0/0 0/0 .text + * setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWaterDropColor__9daAlink_cFPC13J3DGXColorS10.s" +} +#pragma pop + +/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ +void daAlink_c::initTevCustomColor() { + mTevStr.field_0x367 = 0; + mTevStr.mFogColor.r = 0; + mTevStr.mFogColor.g = 0; + mTevStr.mFogColor.b = 0; + mTevStr.field_0x360 = 0; + mTevStr.field_0x362 = 0; +} + +/* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text draw__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::draw() { + nofralloc +#include "asm/d/a/d_a_alink/draw__9daAlink_cFv.s" +} +#pragma pop + +/* 800CD78C-800CD7AC 0C80CC 0020+00 1/0 0/0 0/0 .text daAlink_Draw__FP9daAlink_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_Draw(daAlink_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_Draw__FP9daAlink_c.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 803B3580-803B3590 0106A0 0010+00 3/3 0/0 0/0 .data __vt__15daAlink_sight_c */ +SECTION_DATA extern void* __vt__15daAlink_sight_c[4] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)draw__15daAlink_sight_cFv, + (void*)__dt__15daAlink_sight_cFv, +}; + +/* 803B3590-803B35A0 0106B0 0010+00 4/4 0/0 0/0 .data __vt__20daAlink_lockCursor_c */ +SECTION_DATA extern void* __vt__20daAlink_lockCursor_c[4] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)draw__20daAlink_lockCursor_cFv, + (void*)__dt__20daAlink_lockCursor_cFv, +}; + +/* 803B35A0-803B35B4 0106C0 0014+00 3/3 0/0 0/0 .data __vt__14daAlink_blur_c */ +SECTION_DATA extern void* __vt__14daAlink_blur_c[5] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)entry__9J3DPacketFP13J3DDrawBuffer, + (void*)draw__14daAlink_blur_cFv, + (void*)__dt__14daAlink_blur_cFv, +}; + +/* 803B35B4-803B35C8 0106D4 0014+00 3/3 0/0 0/0 .data __vt__29dAlink_bottleWaterPcallBack_c */ +SECTION_DATA extern void* __vt__29dAlink_bottleWaterPcallBack_c[5] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__29dAlink_bottleWaterPcallBack_cFv, + (void*)execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle, + (void*)draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle, +}; + +/* 800CD7AC-800CE208 0C80EC 0A5C+00 1/1 0/0 0/0 .text __dt__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlink_c::~daAlink_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__9daAlink_cFv.s" +} +#pragma pop + +/* 800CE208-800CE294 0C8B48 008C+00 1/0 0/0 0/0 .text daAlink_Delete__FP9daAlink_c */ +// destructor issue +#ifdef NONMATCHING +static bool daAlink_Delete(daAlink_c* p_link) { + if (p_link->getClothesChangeWaitTimer() != 0) { + p_link->loadModelDVD(); + return false; + } else if (p_link->getShieldChangeWaitTimer() != 0) { + p_link->loadShieldModelDVD(); + return false; + } else { + delete p_link; + return true; + } +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm bool daAlink_Delete(daAlink_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_Delete__FP9daAlink_c.s" +} +#pragma pop +#endif + +/* 800CE294-800CE468 0C8BD4 01D4+00 1/1 0/0 0/0 .text checkNoSubjectModeCamera__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNoSubjectModeCamera() { + nofralloc +#include "asm/d/a/d_a_alink/checkNoSubjectModeCamera__9daAlink_cFv.s" +} +#pragma pop + +/* 800CE468-800CE628 0C8DA8 01C0+00 2/2 0/0 0/0 .text acceptSubjectModeChange__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::acceptSubjectModeChange() { + nofralloc +#include "asm/d/a/d_a_alink/acceptSubjectModeChange__9daAlink_cFv.s" +} +#pragma pop + +/* 800CE628-800CE728 0C8F68 0100+00 5/5 0/0 0/0 .text checkSubjectAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSubjectAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkSubjectAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800CE728-800CE8A0 0C9068 0178+00 1/1 0/0 0/0 .text checkBodyAngleX__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkBodyAngleX(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkBodyAngleX__9daAlink_cFs.s" +} +#pragma pop + +/* 800CE8A0-800CEAF4 0C91E0 0254+00 15/15 0/0 0/0 .text setBodyAngleToCamera__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBodyAngleToCamera() { + nofralloc +#include "asm/d/a/d_a_alink/setBodyAngleToCamera__9daAlink_cFv.s" +} +#pragma pop + +/* 800CEAF4-800CEB58 0C9434 0064+00 9/9 0/0 0/0 .text setSubjectMode__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSubjectMode() { + nofralloc +#include "asm/d/a/d_a_alink/setSubjectMode__9daAlink_cFv.s" +} +#pragma pop + +/* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text subjectCancelTrigger__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::subjectCancelTrigger() { + nofralloc +#include "asm/d/a/d_a_alink/subjectCancelTrigger__9daAlink_cFv.s" +} +#pragma pop + +/* 800CEBD8-800CECE4 0C9518 010C+00 9/9 0/0 0/0 .text checkSubjectEnd__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSubjectEnd(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkSubjectEnd__9daAlink_cFi.s" +} +#pragma pop + +/* 800CECE4-800CED48 0C9624 0064+00 1/1 0/0 0/0 .text searchPeepObj__9daAlink_cFP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::searchPeepObj(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/searchPeepObj__9daAlink_cFP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800CED48-800CED84 0C9688 003C+00 1/1 0/0 0/0 .text daAlink_searchPeepObj__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchPeepObj(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchPeepObj__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 800CED84-800CEE08 0C96C4 0084+00 2/2 0/0 0/0 .text procCoSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800CEE08-800CEF70 0C9748 0168+00 1/0 0/0 0/0 .text procCoSubjectivity__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 800CEF70-800CF018 0C98B0 00A8+00 1/1 0/0 0/0 .text procCoSwimSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSwimSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSwimSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800CF018-800CF100 0C9958 00E8+00 1/0 0/0 0/0 .text procCoSwimSubjectivity__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoSwimSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procCoSwimSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 800CF100-800CF1B8 0C9A40 00B8+00 1/1 0/0 0/0 .text procCoPeepSubjectivityInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPeepSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPeepSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800CF1B8-800CF25C 0C9AF8 00A4+00 1/0 0/0 0/0 .text procCoPeepSubjectivity__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoPeepSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procCoPeepSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 800CF25C-800CF270 0C9B9C 0014+00 1/0 0/0 0/0 .text checkBoardRide__9daAlink_cCFv */ +u32 daAlink_c::checkBoardRide() const { + return mRideStatus == 4; +} + +/* 800CF270-800CF284 0C9BB0 0014+00 1/0 0/0 0/0 .text checkCanoeRide__9daAlink_cCFv */ +u32 daAlink_c::checkCanoeRide() const { + return mRideStatus == 3; +} + +/* 800CF284-800CF298 0C9BC4 0014+00 1/0 0/0 0/0 .text checkHorseRide__9daAlink_cCFv */ +u32 daAlink_c::checkHorseRide() const { + return mRideStatus == 1; +} + +/* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text getLeftItemMatrix__9daAlink_cFv */ +MtxP daAlink_c::getLeftItemMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30c0); +} + +/* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text checkBoarRide__9daAlink_cCFv */ +u32 daAlink_c::checkBoarRide() const { + return mRideStatus == 2; +} + +/* 800CF2C8-800CF2DC 0C9C08 0014+00 1/0 0/0 0/0 .text checkSpinnerRide__9daAlink_cCFv */ +u32 daAlink_c::checkSpinnerRide() const { + return mRideStatus == 5; +} + +/* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text getLeftHandMatrix__9daAlink_cFv */ +MtxP daAlink_c::getLeftHandMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30b8); +} + +/* 800CF2F8-800CF314 0C9C38 001C+00 1/0 0/0 0/0 .text getRightHandMatrix__9daAlink_cFv */ +MtxP daAlink_c::getRightHandMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30ba); +} + +/* 800CF314-800CF328 0C9C54 0014+00 1/0 0/0 0/0 .text + * onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c */ +void daAlink_c::onSceneChangeArea(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { + mExitID = exitID; + mExitDirection = exitDirection; + mpScnChg = (daScex_c*)scexAc; +} + +/* 800CF328-800CF344 0C9C68 001C+00 1/0 0/0 0/0 .text getRightItemMatrix__9daAlink_cFv */ +MtxP daAlink_c::getRightItemMatrix() { + return field_0x0650->i_getAnmMtx(field_0x30c2); +} + +/* 800CF344-800CF380 0C9C84 003C+00 1/0 0/0 0/0 .text checkPlayerNoDraw__9daAlink_cFv */ +BOOL daAlink_c::checkPlayerNoDraw() { + return dComIfGp_checkCameraAttentionStatus(field_0x317c, 2) || + i_checkNoResetFlg0(PLAYER_NO_DRAW); +} + +/* 800CF380-800CFC3C 0C9CC0 08BC+00 1/1 0/0 0/0 .text __ct__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlink_c::daAlink_c() { + nofralloc +#include "asm/d/a/d_a_alink/__ct__9daAlink_cFv.s" +} +#pragma pop + +/* 800CFC3C-800CFC78 0CA57C 003C+00 2/2 0/0 0/0 .text __dt__Q29daAlink_c14firePointEff_cFv */ +daAlink_c::firePointEff_c::~firePointEff_c() {} + +/* 800CFC78-800CFC7C 0CA5B8 0004+00 1/1 0/0 0/0 .text __ct__Q29daAlink_c14firePointEff_cFv */ +daAlink_c::firePointEff_c::firePointEff_c() { + /* empty function */ +} + +/* 800CFC7C-800CFCB8 0CA5BC 003C+00 0/0 2/2 0/0 .text __dt__15LIGHT_INFLUENCEFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void __dt__15LIGHT_INFLUENCEFv() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s" +} +#pragma pop + +/* 800CFCB8-800CFCF4 0CA5F8 003C+00 2/2 0/0 0/0 .text __dt__18daAlink_footData_cFv */ +daAlink_footData_c::~daAlink_footData_c() {} + +/* 800CFCF4-800CFCF8 0CA634 0004+00 1/1 0/0 0/0 .text __ct__18daAlink_footData_cFv */ +daAlink_footData_c::daAlink_footData_c() { + /* empty function */ +} + +/* 800CFCF8-800CFD58 0CA638 0060+00 1/0 0/0 0/0 .text __dt__29dAlink_bottleWaterPcallBack_cFv */ +dAlink_bottleWaterPcallBack_c::~dAlink_bottleWaterPcallBack_c() {} + +/* 800CFD58-800CFDF4 0CA698 009C+00 1/0 0/0 0/0 .text __dt__14daAlink_blur_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlink_blur_c::~daAlink_blur_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__14daAlink_blur_cFv.s" +} +#pragma pop + +/* 800CFDF4-800CFE68 0CA734 0074+00 1/0 0/0 0/0 .text __dt__15daAlink_sight_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlink_sight_c::~daAlink_sight_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__15daAlink_sight_cFv.s" +} +#pragma pop + +/* 800CFE68-800CFEB0 0CA7A8 0048+00 1/0 0/0 0/0 .text __dt__20daAlink_lockCursor_cFv */ +daAlink_lockCursor_c::~daAlink_lockCursor_c() {} + +/* 800CFEB0-800CFEC4 0CA7F0 0014+00 1/1 0/0 0/0 .text checkRideOn__9daAlink_cCFv */ +BOOL daAlink_c::checkRideOn() const { + return mRideStatus != 0; +} + +/* 800CFEC4-800CFEF4 0CA804 0030+00 1/1 0/0 0/0 .text dComIfGp_att_getCatghTarget__Fv */ +#ifdef NONMATCHING +static s32 dComIfGp_att_getCatghTarget() { + return dComIfGp_getAttention().getCatghTarget().getCatghTarget(); +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void dComIfGp_att_getCatghTarget() { + nofralloc +#include "asm/d/a/d_a_alink/dComIfGp_att_getCatghTarget__Fv.s" +} +#pragma pop +#endif + +/* 800CFEF4-800CFF2C 0CA834 0038+00 1/1 0/0 0/0 .text mDoAud_setLinkHp__Fll */ +static void mDoAud_setLinkHp(s32 param_0, s32 param_1) { + if (Z2GetLink() != NULL) { + Z2GetLink()->setLinkHp(param_0, param_1); + } +} + +/* 800CFF2C-800CFF3C 0CA86C 0010+00 1/1 0/0 0/0 .text dComIfGs_getLife__Fv */ +static u16 dComIfGs_getLife() { + return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getLife(); +} + +/* 800CFF3C-800CFF4C 0CA87C 0010+00 1/1 0/0 0/0 .text dComIfGp_getRStatus__Fv */ +static u8 dComIfGp_getRStatus() { + return g_dComIfG_gameInfo.play.getRStatus(); +} + +/* 800CFF4C-800CFFA4 0CA88C 0058+00 1/1 0/0 0/0 .text checkAttentionLock__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkAttentionLock() { + nofralloc +#include "asm/d/a/d_a_alink/checkAttentionLock__9daAlink_cFv.s" +} +#pragma pop + +/* 800CFFA4-800CFFC0 0CA8E4 001C+00 1/1 0/0 0/0 .text dComIfGp_setItemLifeCount__FfUc */ +void dComIfGp_setItemLifeCount(f32 amount, u8 type) { + g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); +} + +/* 800CFFC0-800CFFE0 0CA900 0020+00 1/1 0/0 0/0 .text cMtx_multVec__FPA4_CfPC3VecP3Vec */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void cMtx_multVec(f32 const (*param_0)[4], Vec const* param_1, Vec* param_2) { + nofralloc +#include "asm/d/a/d_a_alink/cMtx_multVec__FPA4_CfPC3VecP3Vec.s" +} +#pragma pop + +/* 800CFFE0-800CFFF4 0CA920 0014+00 1/1 0/0 0/0 .text getAnmMtx__8J3DModelFi */ +MtxP J3DModel::getAnmMtx(int i) { + return mMtxBuffer->getAnmMtx(i); +} + +/* 800CFFF4-800D0020 0CA934 002C+00 1/1 0/0 0/0 .text setBaseTRMtx__8J3DModelFPA4_f */ +void J3DModel::setBaseTRMtx(MtxP matrix) { + PSMTXCopy(matrix, mBaseTransformMtx); +} + +/* 800D0020-800D0048 0CA960 0028+00 1/1 0/0 0/0 .text checkFmChainGrabAnime__9daAlink_cCFv */ +BOOL daAlink_c::checkFmChainGrabAnime() const { + return checkUpperAnime(ANM_HUMAN_CHAIN_GRAB) || checkUpperAnime(ANM_WOLF_CHAIN_GRAB); +} + +/* 800D0048-800D005C 0CA988 0014+00 1/1 0/0 0/0 .text checkSmallUpperGuardAnime__9daAlink_cCFv */ +BOOL daAlink_c::checkSmallUpperGuardAnime() const { + return checkUpperAnime(ANM_SMALL_GUARD); +} + +/* 800D005C-800D008C 0CA99C 0030+00 1/1 0/0 0/0 .text dComIfGp_evmng_startCheck__FPCc */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void dComIfGp_evmng_startCheck(char const* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/dComIfGp_evmng_startCheck__FPCc.s" +} +#pragma pop + +/* 800D008C-800D00BC 0CA9CC 0030+00 1/1 0/0 0/0 .text mDoAud_setLinkGroupInfo__FUc */ +static void mDoAud_setLinkGroupInfo(u8 param_0) { + if (Z2GetLink() != NULL) { + Z2GetLink()->setLinkGroupInfo(param_0); + } +} + +/* 800D00BC-800D00D0 0CA9FC 0014+00 1/1 0/0 0/0 .text getAnm__25mDoExt_MtxCalcAnmBlendTblFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void mDoExt_MtxCalcAnmBlendTbl::getAnm(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/getAnm__25mDoExt_MtxCalcAnmBlendTblFi.s" +} +#pragma pop + +/* 800D00D0-800D00DC 0CAA10 000C+00 1/1 0/0 0/0 .text ChkRoofHit__9dBgS_AcchCFv */ +bool dBgS_Acch::ChkRoofHit() const { + return m_flags & ROOF_HIT; +} + +/* 800D00DC-800D00EC 0CAA1C 0010+00 1/1 0/0 0/0 .text ClrGroundHit__9dBgS_AcchFv */ +void dBgS_Acch::ClrGroundHit() { + m_flags &= ~GROUND_HIT; +} + +/* 800D00EC-800D0110 0CAA2C 0024+00 1/1 0/0 0/0 .text checkReinRide__9daAlink_cCFv */ +BOOL daAlink_c::checkReinRide() const { + return mRideStatus == 1 || mRideStatus == 2; +} + +/* 800D0110-800D0138 0CAA50 0028+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAnime__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfEnemyThrowAnime() const { + return checkUpperAnime(ANM_WOLF_ENEMY_THROW_LEFT) || + checkUpperAnime(ANM_WOLF_ENEMY_THROW_RIGHT); +} + +/* 800D0138-800D014C 0CAA78 0014+00 1/1 0/0 0/0 .text checkSpecialDemoMode__9daAlink_cCFv + */ +u16 daAlink_c::checkSpecialDemoMode() const { + return mDemo.getDemoType() == 5; +} + +/* 800D014C-800D0164 0CAA8C 0018+00 1/1 0/0 0/0 .text setMidnaTalkStatus__9daAlink_cFUc + */ +void daAlink_c::setMidnaTalkStatus(u8 status) { + dComIfGp_setZStatus(status, 0); +} + +/* 800D0164-800D0180 0CAAA4 001C+00 1/1 0/0 0/0 .text set3DStatus__9daAlink_cFUcUc */ +void daAlink_c::set3DStatus(u8 status, u8 direction) { + dComIfGp_set3DStatus(status, direction, 0); +} + +/* 800D0180-800D018C 0CAAC0 000C+00 1/1 0/0 0/0 .text offSetFlg__16daAlink_matAnm_cFv */ +void daAlink_matAnm_c::offSetFlg() { + mSetFlag = 0; +} + +/* 800D018C-800D0198 0CAACC 000C+00 1/1 0/0 0/0 .text checkModeFlg__9daAlink_cCFUl */ +u32 daAlink_c::checkModeFlg(u32 pFlag) const { + return mModeFlg & pFlag; +} + +/* 800D0198-800D01A0 0CAAD8 0008+00 1/0 0/0 0/0 .text getShieldChangeWaitTimer__9daAlink_cCFv */ +u8 daAlink_c::getShieldChangeWaitTimer() const { + return mShieldChangeWaitTimer; +} + +/* 800D01A0-800D01A8 0CAAE0 0008+00 1/0 0/0 0/0 .text getClothesChangeWaitTimer__9daAlink_cCFv */ +u8 daAlink_c::getClothesChangeWaitTimer() const { + return mClothesChangeWaitTimer; +} + +/* 800D01A8-800D01E0 0CAAE8 0038+00 1/0 0/0 0/0 .text checkHorseStart__9daAlink_cFv */ +u32 daPy_py_c::getLastSceneMode() { + return dComIfGs_getLastSceneMode() & 0xF; +} + +BOOL daAlink_c::checkHorseStart() { + return checkHorseStart(getLastSceneMode(), getStartMode()); +} + +/* 800D01E0-800D0208 0CAB20 0028+00 1/0 0/0 0/0 .text checkCutTurnCharge__9daAlink_cCFv + */ +BOOL daAlink_c::checkCutTurnCharge() const { + return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter == 0; +} + +/* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */ +bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) { + return checkAcceptWarp(); +} + +/* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */ +fopAc_ac_c* daAlink_c::getSpinnerActor() { + fopAc_ac_c* spinnerActor; + + if (!checkSpinnerRide()) { + spinnerActor = NULL; + } else { + spinnerActor = mRideAcKeep.getActor(); + } + return spinnerActor; +} + +/* 800D0274-800D027C 0CABB4 0008+00 1/0 0/0 0/0 .text getSumouCounter__9daAlink_cCFv */ +s16 daAlink_c::getSumouCounter() const { + return mCommonCounter; +} + +/* 800D027C-800D0284 0CABBC 0008+00 1/0 0/0 0/0 .text checkSumouWithstand__9daAlink_cCFv + */ +s16 daAlink_c::checkSumouWithstand() const { + return field_0x300e; +} + +/* 800D0284-800D0290 0CABC4 000C+00 1/0 0/0 0/0 .text setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs + */ +void daAlink_c::setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) { + mMidnaMsgNum = pMsgNum; + static_cast(mMidnaMsg) = param_0; +} + +/* 800D0290-800D029C 0CABD0 000C+00 1/0 0/0 0/0 .text getModelMtx__9daAlink_cFv */ +MtxP daAlink_c::getModelMtx() { + return field_0x0650->getBaseTRMtx(); +} + +/* 800D029C-800D02A4 0CABDC 0008+00 1/0 0/0 0/0 .text getInvMtx__9daAlink_cFv */ +MtxP daAlink_c::getInvMtx() { + return mInvMtx; +} + +/* 800D02A4-800D02B8 0CABE4 0014+00 1/0 0/0 0/0 .text getLinkBackBone1Matrix__9daAlink_cFv */ +MtxP daAlink_c::getLinkBackBone1Matrix() { + return field_0x0650->i_getAnmMtx(1); +} + +/* 800D02B8-800D02CC 0CABF8 0014+00 1/0 0/0 0/0 .text getWolfMouthMatrix__9daAlink_cFv */ +MtxP daAlink_c::getWolfMouthMatrix() { + return field_0x0650->i_getAnmMtx(13); +} + +/* 800D02CC-800D02E0 0CAC0C 0014+00 1/0 0/0 0/0 .text getWolfBackbone2Matrix__9daAlink_cFv */ +MtxP daAlink_c::getWolfBackbone2Matrix() { + return field_0x0650->i_getAnmMtx(2); +} + +/* 800D02E0-800D0334 0CAC20 0054+00 1/0 0/0 0/0 .text getBottleMtx__9daAlink_cFv */ +MtxP daAlink_c::getBottleMtx() { + if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) { + return mHeldItemModel->getBaseTRMtx(); + } + + return NULL; +} + +/* 800D0334-800D0350 0CAC74 001C+00 1/0 0/0 0/0 .text getHeadMtx__9daAlink_cFv */ +MtxP daAlink_c::getHeadMtx() { + return field_0x0650->i_getAnmMtx(field_0x30b4); +} + +/* 800D0350-800D0358 0CAC90 0008+00 1/0 0/0 0/0 .text getGroundY__9daAlink_cFv */ +f32 daAlink_c::getGroundY() { + return mLinkAcch.GetGroundH(); +} + +/* 800D0358-800D0360 0CAC98 0008+00 1/0 0/0 0/0 .text getBaseAnimeFrameRate__9daAlink_cCFv */ +f32 daAlink_c::getBaseAnimeFrameRate() const { + return mFrameCtrl1[0].getRate(); +} + +/* 800D0360-800D0368 0CACA0 0008+00 1/0 0/0 0/0 .text getAtnActorID__9daAlink_cCFv */ +s32 daAlink_c::getAtnActorID() const { + return mAtnActorID; +} + +/* 800D0368-800D0370 0CACA8 0008+00 1/0 0/0 0/0 .text getItemID__9daAlink_cCFv */ +s32 daAlink_c::getItemID() const { + return mItemAcKeep.getID(); +} + +/* 800D0370-800D038C 0CACB0 001C+00 1/0 0/0 0/0 .text getGrabActorID__9daAlink_cCFv */ +s32 daAlink_c::getGrabActorID() const { + if (mEquipItem == 0x102) { + return mItemAcKeep.getID(); + } else { + return mGrabItemAcKeep.getID(); + } +} + +/* 800D038C-800D03B4 0CACCC 0028+00 1/0 0/0 0/0 .text setForcePutPos__9daAlink_cFRC4cXyz + */ +void daAlink_c::setForcePutPos(cXyz const& pPutPos) { + mForcePutPos = pPutPos; + i_onEndResetFlg1(UNK_FORCE_PUT_POS); +} + +/* 800D03B4-800D03C8 0CACF4 0014+00 1/0 0/0 0/0 .text checkPlayerFly__9daAlink_cCFv */ +u32 daAlink_c::checkPlayerFly() const { + return i_checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 | + MODE_NO_COLLISION | MODE_CLIMB | MODE_JUMP); +} + +/* 800D03C8-800D03DC 0CAD08 0014+00 1/0 0/0 0/0 .text checkFrontRoll__9daAlink_cCFv */ +BOOL daAlink_c::checkFrontRoll() const { + return mProcID == PROC_FRONT_ROLL; +} + +/* 800D03DC-800D03F0 0CAD1C 0014+00 1/0 0/0 0/0 .text checkWolfDash__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfDash() const { + return mProcID == PROC_WOLF_DASH; +} + +/* 800D03F0-800D0414 0CAD30 0024+00 1/0 0/0 0/0 .text checkAutoJump__9daAlink_cCFv */ +BOOL daAlink_c::checkAutoJump() const { + return mProcID == PROC_AUTO_JUMP || mProcID == PROC_WOLF_AUTO_JUMP; +} + +/* 800D0414-800D0444 0CAD54 0030+00 1/0 0/0 0/0 .text checkSideStep__9daAlink_cCFv */ +bool daAlink_c::checkSideStep() const { + return (mProcID == PROC_SIDESTEP || mProcID == PROC_WOLF_SIDESTEP) && field_0x300a != 0; +} + +/* 800D0444-800D0468 0CAD84 0024+00 1/0 0/0 0/0 .text checkWolfTriggerJump__9daAlink_cCFv + */ +bool daAlink_c::checkWolfTriggerJump() const { + return mProcID == PROC_WOLF_SIDESTEP || mProcID == PROC_WOLF_JUMP_ATTACK; +} + +/* 800D0468-800D047C 0CADA8 0014+00 1/0 0/0 0/0 .text checkGuardBreakMode__9daAlink_cCFv + */ +BOOL daAlink_c::checkGuardBreakMode() const { + return mProcID == PROC_GUARD_BREAK; +} + +/* 800D047C-800D04A4 0CADBC 0028+00 1/0 0/0 0/0 .text checkLv3Slide__9daAlink_cCFv */ +bool daAlink_c::checkLv3Slide() const { + return mProcID == PROC_SLIDE && field_0x300e != 0; +} + +/* 800D04A4-800D04B8 0CADE4 0014+00 1/0 0/0 0/0 .text checkWolfHowlDemoMode__9daAlink_cCFv */ +bool daAlink_c::checkWolfHowlDemoMode() const { + return mProcID == PROC_WOLF_HOWL_DEMO; +} + +/* 800D04B8-800D04CC 0CADF8 0014+00 1/0 0/0 0/0 .text checkElecDamage__9daAlink_cCFv */ +BOOL daAlink_c::checkElecDamage() const { + return mProcID == PROC_ELEC_DAMAGE; +} + +/* 800D04CC-800D04F4 0CAE0C 0028+00 1/0 0/0 0/0 .text checkEmptyBottleSwing__9daAlink_cCFv */ +BOOL daAlink_c::checkEmptyBottleSwing() const { + return mEquipItem == EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; +} + +/* 800D04F4-800D0508 0CAE34 0014+00 1/0 0/0 0/0 .text checkBottleSwingMode__9daAlink_cCFv + */ +BOOL daAlink_c::checkBottleSwingMode() const { + return mProcID == PROC_BOTTLE_SWING; +} + +/* 800D0508-800D051C 0CAE48 0014+00 1/0 0/0 0/0 .text checkHawkWait__9daAlink_cCFv */ +BOOL daAlink_c::checkHawkWait() const { + return mProcID == PROC_HAWK_SUBJECT; +} + +/* 800D051C-800D0544 0CAE5C 0028+00 1/0 0/0 0/0 .text checkGoatThrow__9daAlink_cCFv */ +BOOL daAlink_c::checkGoatThrow() const { + return mProcID == PROC_GOAT_CATCH && mCommonCounter != 0; +} + +/* 800D0544-800D0570 0CAE84 002C+00 1/0 0/0 0/0 .text checkGoatThrowAfter__9daAlink_cCFv + */ +BOOL daAlink_c::checkGoatThrowAfter() const { + return mProcID == PROC_GOAT_CATCH && field_0x3478 > FLOAT_LABEL(lit_6108); +} + +/* 800D0570-800D0598 0CAEB0 0028+00 1/0 0/0 0/0 .text checkWolfTagLockJump__9daAlink_cCFv + */ +BOOL daAlink_c::checkWolfTagLockJump() const { + return mProcID == PROC_WOLF_TAG_JUMP && field_0x3198 == 0; +} + +/* 800D0598-800D05AC 0CAED8 0014+00 1/0 0/0 0/0 .text checkWolfTagLockJumpLand__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfTagLockJumpLand() const { + return mProcID == PROC_WOLF_TAG_JUMP_LAND; +} + +/* 800D05AC-800D05C0 0CAEEC 0014+00 1/0 0/0 0/0 .text checkWolfRopeHang__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfRopeHang() const { + return mProcID == PROC_WOLF_ROPE_HANG; +} + +/* 800D05C0-800D05D4 0CAF00 0014+00 1/0 0/0 0/0 .text checkRollJump__9daAlink_cCFv */ +BOOL daAlink_c::checkRollJump() const { + return mProcID == PROC_ROLL_JUMP; +} + +/* 800D05D4-800D05E8 0CAF14 0014+00 1/0 0/0 0/0 .text checkGoronRideWait__9daAlink_cCFv + */ +BOOL daAlink_c::checkGoronRideWait() const { + return mProcID == PROC_GORON_RIDE_WAIT; +} + +/* 800D05E8-800D05FC 0CAF28 0014+00 1/0 0/0 0/0 .text checkWolfChain__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfChain() const { + return mProcID == PROC_WOLF_CHAIN_WAIT; +} + +/* 800D05FC-800D0610 0CAF3C 0014+00 1/0 0/0 0/0 .text checkWolfWait__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfWait() const { + return mProcID == PROC_WOLF_WAIT; +} + +/* 800D0610-800D0624 0CAF50 0014+00 1/0 0/0 0/0 .text checkWolfJumpAttack__9daAlink_cCFv + */ +BOOL daAlink_c::checkWolfJumpAttack() const { + return mProcID == PROC_WOLF_JUMP_ATTACK; +} + +/* 800D0624-800D0638 0CAF64 0014+00 1/0 0/0 0/0 .text checkWolfRSit__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfRSit() const { + return mProcID == PROC_WOLF_SIT; +} + +/* 800D0638-800D0660 0CAF78 0028+00 1/0 0/0 0/0 .text checkBottleDrinkEnd__9daAlink_cCFv + */ +BOOL daAlink_c::checkBottleDrinkEnd() const { + return mProcID == PROC_BOTTLE_DRINK && field_0x300e != 0; +} + +/* 800D0660-800D0674 0CAFA0 0014+00 1/0 0/0 0/0 .text checkWolfDig__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfDig() const { + return mProcID == PROC_WOLF_DIG; +} + +/* 800D0674-800D0688 0CAFB4 0014+00 1/0 0/0 0/0 .text checkCutCharge__9daAlink_cCFv */ +BOOL daAlink_c::checkCutCharge() const { + return mProcID == PROC_CUT_TURN_MOVE; +} + +/* 800D0688-800D06B0 0CAFC8 0028+00 1/0 0/0 0/0 .text checkCutLargeJumpCharge__9daAlink_cCFv */ +BOOL daAlink_c::checkCutLargeJumpCharge() const { + return mProcID == PROC_CUT_TURN_MOVE && mCommonCounter != 0; +} + +/* 800D06B0-800D06D8 0CAFF0 0028+00 1/0 0/0 0/0 .text checkComboCutTurn__9daAlink_cCFv */ +BOOL daAlink_c::checkComboCutTurn() const { + return mProcID == PROC_CUT_TURN && mComboCutCount != 0; +} + +/* 800D06D8-800D0704 0CB018 002C+00 1/0 0/0 0/0 .text checkClimbMove__9daAlink_cCFv */ +BOOL daAlink_c::checkClimbMove() const { + return mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_LADDER_MOVE || + mProcID == PROC_CLIMB_MOVE_SIDE; +} + +/* 800D0704-800D0718 0CB044 0014+00 1/0 0/0 0/0 .text checkGrassWhistle__9daAlink_cCFv */ +BOOL daAlink_c::checkGrassWhistle() const { + return mProcID == PROC_GRASS_WHISTLE_WAIT; +} + +/* 800D0718-800D072C 0CB058 0014+00 1/0 0/0 0/0 .text checkBoarRun__9daAlink_cCFv */ +BOOL daAlink_c::checkBoarRun() const { + return mProcID == PROC_BOAR_RUN; +} + +/* 800D072C-800D0794 0CB06C 0068+00 1/0 0/0 0/0 .text checkHorseRideNotReady__9daAlink_cCFv */ +BOOL daAlink_c::checkHorseRideNotReady() const { + return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF; +} + +/* 800D0794-800D079C 0CB0D4 0008+00 1/0 0/0 0/0 .text getSearchBallScale__9daAlink_cCFv + */ +f32 daAlink_c::getSearchBallScale() const { + return mSearchBallScale; +} + +/* 800D079C-800D07A4 0CB0DC 0008+00 1/0 0/0 0/0 .text checkFastShotTime__9daAlink_cFv */ +s16 daAlink_c::checkFastShotTime() { + return mFastShotTime; +} + +/* 800D07A4-800D07D4 0CB0E4 0030+00 1/0 0/0 0/0 .text checkCutJumpCancelTurn__9daAlink_cCFv */ +BOOL daAlink_c::checkCutJumpCancelTurn() const { + return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2; +} + +/* 800D07D4-800D07FC 0CB114 0028+00 1/0 0/0 0/0 .text + * checkSingleBoarBattleSecondBowReady__9daAlink_cCFv */ +BOOL daAlink_c::checkSingleBoarBattleSecondBowReady() const { + return mProcID == PROC_HORSE_BOW_SUBJECT && mCommonCounter != 0; +} + +/* 800D07FC-800D0818 0CB13C 001C+00 1/0 0/0 0/0 .text cancelDungeonWarpReadyNeck__9daAlink_cFv */ +void daAlink_c::cancelDungeonWarpReadyNeck() { + if (mProcID != PROC_DUNGEON_WARP_READY) { + return; + } + offModeFlg(MODE_UNK_100); +} + +/* 800D0818-800D0830 0CB158 0018+00 1/0 0/0 0/0 .text + * onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c */ +void daAlink_c::onSceneChangeAreaJump(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) { + mExitID = exitID | 0x8000; + mExitDirection = exitDirection; + mpScnChg = (daScex_c*)scexAc; +} + +/* 800D0830-800D084C 0CB170 001C+00 1/0 0/0 0/0 .text onSceneChangeDead__9daAlink_cFUci + */ +void daAlink_c::onSceneChangeDead(u8 param_0, int param_1) { + if (mProcID != PROC_DEAD) { + return; + } + field_0x3012 = param_0; + field_0x3198 = param_1; +} + +/* 800D084C-800D0860 0CB18C 0014+00 1/0 0/0 0/0 .text checkNoEquipItem__9daAlink_cCFv */ +bool daAlink_c::checkNoEquipItem() const { + return mEquipItem == NO_ITEM; +} + +/* 800D0860-800D087C 0CB1A0 001C+00 1/0 0/0 0/0 .text getBoardCutTurnOffsetAngleY__9daAlink_cCFv + */ +s16 daAlink_c::getBoardCutTurnOffsetAngleY() const { + if (mProcID == PROC_BOARD_CUT_TURN) { + return field_0x3012; + } + return 0; +} + +/* 800D087C-800D0884 0CB1BC 0008+00 1/0 0/0 0/0 .text getMagneBootsTopVec__9daAlink_cFv + */ +cXyz* daAlink_c::getMagneBootsTopVec() { + return &mMagneBootsTopVec; +} + +/* 800D0884-800D08B0 0CB1C4 002C+00 1/0 0/0 0/0 .text setCargoCarry__9daAlink_cFP10fopAc_ac_c */ +void daAlink_c::setCargoCarry(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_CARGO_CARRY; + mCargoCarryAcKeep.setData(p_actor); +} + +/* 800D08B0-800D08DC 0CB1F0 002C+00 1/0 0/0 0/0 .text setGoronSideMove__9daAlink_cFP10fopAc_ac_c + */ +void daAlink_c::setGoronSideMove(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_GORON_THROW; + mCargoCarryAcKeep.setData(p_actor); +} + +/* 800D08DC-800D091C 0CB21C 0040+00 1/0 0/0 0/0 .text setSumouReady__9daAlink_cFP10fopAc_ac_c */ +void daAlink_c::setSumouReady(fopAc_ac_c* p_actor) { + mSpecialMode = SMODE_SUMO_READY; + mCargoCarryAcKeep.setData(p_actor); + mDemo.setDemoMode(1); +} + +/* 800D091C-800D0930 0CB25C 0014+00 1/0 0/0 0/0 .text setSumouPushBackDirection__9daAlink_cFs */ +void daAlink_c::setSumouPushBackDirection(s16 param_0) { + if (mProcID != PROC_SUMOU_MOVE) { + return; + } + field_0x3010 = param_0; +} + +/* 800D0930-800D0948 0CB270 0018+00 1/0 0/0 0/0 .text setSumouLoseHeadUp__9daAlink_cFv */ +void daAlink_c::setSumouLoseHeadUp() { + if (mProcID != PROC_SUMOU_WIN_LOSE) { + return; + } + mSpecialMode = SMODE_SUMO_LOSE; +} + +/* 800D0948-800D095C 0CB288 0014+00 1/0 0/0 0/0 .text checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c + */ +bool daAlink_c::checkPriActorOwn(fopAc_ac_c const* p_actor) const { + return field_0x27f4 == p_actor; +} + +/* 800D095C-800D0970 0CB29C 0014+00 1/0 0/0 0/0 .text + * checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c */ +bool daAlink_c::checkWolfEnemyBiteAllOwn(fopAc_ac_c const* p_actor) const { + return field_0x281c.getActorConst() == p_actor; +} + +/* 800D0970-800D0984 0CB2B0 0014+00 1/0 0/0 0/0 .text setWolfEnemyHangBiteAngle__9daAlink_cFs */ +void daAlink_c::setWolfEnemyHangBiteAngle(s16 angle) { + if (mProcID != PROC_WOLF_ENEMY_HANG_BITE) { + return; + } + field_0x3010 = angle; +} + +/* 800D0984-800D0998 0CB2C4 0014+00 1/0 0/0 0/0 .text setSumouGraspCancelCount__9daAlink_cFi */ +void daAlink_c::setSumouGraspCancelCount(int param_0) { + if (mProcID != PROC_SUMOU_MOVE) { + return; + } + mCommonCounter = param_0; +} + +/* 800D0998-800D09AC 0CB2D8 0014+00 1/0 0/0 0/0 .text checkItemSwordEquip__9daAlink_cCFv + */ +bool daAlink_c::checkItemSwordEquip() const { + return mEquipItem == EQUIP_SWORD; +} + +/* 800D09AC-800D09B4 0CB2EC 0008+00 1/0 0/0 0/0 .text getSinkShapeOffset__9daAlink_cCFv + */ +f32 daAlink_c::getSinkShapeOffset() const { + return mSinkShapeOffset; +} + +/* 800D09B4-800D09C8 0CB2F4 0014+00 1/0 0/0 0/0 .text checkSinkDead__9daAlink_cCFv */ +BOOL daAlink_c::checkSinkDead() const { + return field_0x2fbd == 0xFF; +} + +/* 800D09C8-800D09DC 0CB308 0014+00 1/0 0/0 0/0 .text checkCutJumpMode__9daAlink_cCFv */ +BOOL daAlink_c::checkCutJumpMode() const { + return mProcID == PROC_CUT_JUMP; +} + +/* 800D09DC-800D09E4 0CB31C 0008+00 1/0 0/0 0/0 .text getGiantPuzzleAimAngle__9daAlink_cCFv */ +s16 daAlink_c::getGiantPuzzleAimAngle() const { + return mCommonCounter; +} + +/* 800D09E4-800D09EC 0CB324 0008+00 1/0 0/0 0/0 .text getSwordChangeWaitTimer__9daAlink_cCFv */ +u8 daAlink_c::getSwordChangeWaitTimer() const { + return mSwordChangeWaitTimer; +} + +/* 800D09EC-800D0A14 0CB32C 0028+00 1/0 0/0 0/0 .text checkMetamorphose__9daAlink_cCFv */ +BOOL daAlink_c::checkMetamorphose() const { + return mProcID == PROC_METAMORPHOSE && field_0x300a == 0; +} + +/* 800D0A14-800D0A28 0CB354 0014+00 1/0 0/0 0/0 .text checkWolfDownAttackPullOut__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfDownAttackPullOut() const { + return mProcID == PROC_WOLF_DOWN_AT_LAND; +} + +/* 800D0A28-800D0A30 0CB368 0008+00 1/0 0/0 0/0 .text getMidnaAtnPos__9daAlink_cCFv */ +// vtable issue +#ifdef NONMATCHING +cXyz* daAlink_c::getMidnaAtnPos() const { + return &mMidnaAtnPos; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() { + // asm bool daAlink_c::getMidnaAtnPos() const { + nofralloc +#include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s" +} +#pragma pop +#endif + +/* 800D0A30-800D0A44 0CB370 0014+00 1/0 0/0 0/0 .text checkCopyRodEquip__9daAlink_cCFv */ +bool daAlink_c::checkCopyRodEquip() const { + return mEquipItem == COPY_ROD; +} + +/* 800D0A44-800D0A6C 0CB384 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetLeft__9daAlink_cCFv */ +bool daAlink_c::checkCanoeFishingGetLeft() const { + return mProcID == PROC_CANOE_FISHING_GET && field_0x300e == 0; +} + +/* 800D0A6C-800D0A94 0CB3AC 0028+00 1/0 0/0 0/0 .text checkCanoeFishingGetRight__9daAlink_cCFv */ +bool daAlink_c::checkCanoeFishingGetRight() const { + return mProcID == PROC_CANOE_FISHING_GET && field_0x300e == 1; +} + +/* 800D0A94-800D0A9C 0CB3D4 0008+00 1/0 0/0 0/0 .text checkBeeChildDrink__9daAlink_cCFv + */ +u8 daAlink_c::checkBeeChildDrink() const { + return field_0x2fd3; +} + +/* 800D0A9C-800D0AA4 0CB3DC 0008+00 1/0 0/0 0/0 .text getWolfHowlMgrP__9daAlink_cFv */ +Z2WolfHowlMgr* daAlink_c::getWolfHowlMgrP() { + return &mZ2WolfHowlMgr; +} + +/* 800D0AA4-800D0AC8 0CB3E4 0024+00 1/0 0/0 0/0 .text checkWolfHowlSuccessAnime__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfHowlSuccessAnime() const { + return checkUnderMove0BckNoArcWolf(ANM_WOLF_HOWL_SUCCESS); +} + +/* 800D0AC8-800D0AF0 0CB408 0028+00 1/0 0/0 0/0 .text checkOctaIealHang__9daAlink_cCFv */ +bool daAlink_c::checkOctaIealHang() const { + return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc == 0; +} + +/* 800D0AF0-800D0B08 0CB430 0018+00 1/0 0/0 0/0 .text cancelOctaIealHang__9daAlink_cFv */ +void daAlink_c::cancelOctaIealHang() { + if (mProcID != PROC_BOSS_BODY_HANG) { + return; + } + field_0x300e = 1; +} + +/* 800D0B08-800D0B20 0CB448 0018+00 1/0 0/0 0/0 .text cancelDragonHangBackJump__9daAlink_cFv */ +void daAlink_c::cancelDragonHangBackJump() { + if (mProcID != PROC_BOSS_BODY_HANG) { + return; + } + field_0x300e = -1; +} + +/* 800D0B20-800D0B38 0CB460 0018+00 1/0 0/0 0/0 .text setOctaIealWildHang__9daAlink_cFv + */ +void daAlink_c::setOctaIealWildHang() { + if (mProcID != PROC_BOSS_BODY_HANG) { + return; + } + field_0x3008 = 1; +} + +/* 800D0B38-800D0B60 0CB478 0028+00 1/0 0/0 0/0 .text checkDragonHangRide__9daAlink_cCFv + */ +bool daAlink_c::checkDragonHangRide() const { + return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0; +} + +/* 800D0B60-800D0B8C 0CB4A0 002C+00 1/0 0/0 0/0 .text playerStartCollisionSE__9daAlink_cFUlUl */ +void daAlink_c::playerStartCollisionSE(u32 param_0, u32 param_1) { + mZ2Link.startCollisionSE(param_0, param_1); +} + +/* 800D0B8C-800D0C6C 0CB4CC 00E0+00 1/0 0/0 0/0 .text __dt__16daAlink_matAnm_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm daAlink_matAnm_c::~daAlink_matAnm_c() { +extern "C" asm void __dt__16daAlink_matAnm_cFv() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__16daAlink_matAnm_cFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 803B35C8-803B35EC 0106E8 0024+00 2/2 5/5 0/0 .data __vt__12dBgS_ObjAcch */ +SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)__dt__12dBgS_ObjAcchFv, + (void*)NULL, + (void*)NULL, + (void*)func_801446DC, + (void*)NULL, + (void*)NULL, + (void*)func_801446D4, +}; + +/* 800D0C6C-800D0CDC 0CB5AC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +// asm dBgS_ObjAcch::~dBgS_ObjAcch() { +extern "C" asm void __dt__12dBgS_ObjAcchFv() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__12dBgS_ObjAcchFv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 803B35EC-803B3610 01070C 0014+10 3/3 0/0 0/0 .data __vt__Q29daAlink_c14hsChainShape_c + */ +SECTION_DATA extern void* __vt__Q29daAlink_c14hsChainShape_c[5 + 4 /* padding */] = { + (void*)NULL /* RTTI */, + (void*)NULL, + (void*)entry__9J3DPacketFP13J3DDrawBuffer, + (void*)draw__Q29daAlink_c14hsChainShape_cFv, + (void*)__dt__Q29daAlink_c14hsChainShape_cFv, + /* padding */ + NULL, + NULL, + NULL, + NULL, +}; + +/* 800D0CDC-800D0D38 0CB61C 005C+00 1/0 0/0 0/0 .text __dt__Q29daAlink_c14hsChainShape_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm daAlink_c::hsChainShape_c::~hsChainShape_c() { + nofralloc +#include "asm/d/a/d_a_alink/__dt__Q29daAlink_c14hsChainShape_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_spinner.inc b/src/d/a/d_a_alink_spinner.inc new file mode 100644 index 00000000000..e8e3d1f001c --- /dev/null +++ b/src/d/a/d_a_alink_spinner.inc @@ -0,0 +1,357 @@ +#include "rel/d/a/d_a_spinner/d_a_spinner.h" + +/* 8010D93C-8010D94C 10827C 0010+00 0/0 0/0 1/1 .text getSpinnerGravity__9daAlink_cCFv */ +f32 daAlink_c::getSpinnerGravity() const { + return daAlinkHIO_spinner_c0::m.mGravity; +} + +/* 8010D94C-8010D95C 10828C 0010+00 0/0 0/0 1/1 .text getSpinnerMaxFallSpeed__9daAlink_cCFv */ +f32 daAlink_c::getSpinnerMaxFallSpeed() const { + return daAlinkHIO_spinner_c0::m.mMaxFallSpeed; +} + +/* 8010D95C-8010D96C 10829C 0010+00 0/0 0/0 1/1 .text getSpinnerJumpRate__9daAlink_cCFv + */ +f32 daAlink_c::getSpinnerJumpRate() const { + return daAlinkHIO_spinner_c0::m.mJumpRate; +} + +/* 8010D96C-8010D9B0 1082AC 0044+00 1/1 0/0 2/2 .text getSpinnerRideMoveTime__9daAlink_cFv */ +s16 daAlink_c::getSpinnerRideMoveTime() { + if (checkLv4BossRoom()) { + return daAlinkHIO_spinner_c0::m.mBossRideMoveTime; + } + + return daAlinkHIO_spinner_c0::m.mRideMoveTime; +} + +/* 8010D9B0-8010D9F4 1082F0 0044+00 1/1 0/0 3/3 .text getSpinnerRideSpeedF__9daAlink_cFv + */ +f32 daAlink_c::getSpinnerRideSpeedF() { + if (checkLv4BossRoom()) { + return daAlinkHIO_spinner_c0::m.mBossRideSpeed; + } + + return daAlinkHIO_spinner_c0::m.mRideSpeed; +} + +/* 8010D9F4-8010DA04 108334 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMax__9daAlink_cCFv */ +f32 daAlink_c::getSpinnerRideDecSpeedMax() const { + return daAlinkHIO_spinner_c0::m.mDecelSpeedMax; +} + +/* 8010DA04-8010DA14 108344 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMin__9daAlink_cCFv */ +f32 daAlink_c::getSpinnerRideDecSpeedMin() const { + return daAlinkHIO_spinner_c0::m.mDecelSpeedMin; +} + +/* 8010DA14-8010DA24 108354 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedRate__9daAlink_cCFv */ +f32 daAlink_c::getSpinnerRideDecSpeedRate() const { + return daAlinkHIO_spinner_c0::m.mDecelRate; +} + +/* 8010DA24-8010DA34 108364 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMax__9daAlink_cCFv */ +s16 daAlink_c::getSpinnerRideRotAngleMax() const { + return daAlinkHIO_spinner_c0::m.mRideRotAngleMax; +} + +/* 8010DA34-8010DA44 108374 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMin__9daAlink_cCFv */ +s16 daAlink_c::getSpinnerRideRotAngleMin() const { + return daAlinkHIO_spinner_c0::m.mRideRotAngleMin; +} + +/* 8010DA44-8010DA98 108384 0054+00 1/0 0/0 0/0 .text onSpinnerPathForceRemove__9daAlink_cFv */ +void daAlink_c::onSpinnerPathForceRemove() { + if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) { + ((daSpinner_c*)mRideAcKeep.getActor())->onPathForceRemove(); + } +} + +/* 8010DA98-8010DAFC 1083D8 0064+00 1/0 0/0 0/0 .text checkSpinnerPathMove__9daAlink_cFv + */ +bool daAlink_c::checkSpinnerPathMove() { + if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) { + if (((daSpinner_c*)mRideAcKeep.getActor())->checkPathMoveNow() != NULL) { + return true; + } + } + + return false; +} + +/* 8010DAFC-8010DB28 10843C 002C+00 2/2 0/0 0/0 .text checkLv4BossRoom__9daAlink_cFv */ +bool daAlink_c::checkLv4BossRoom() { + return checkStageName("D_MN10A"); +} + +/* 8010DB28-8010DBC8 108468 00A0+00 1/0 0/0 0/0 .text checkSpinnerTriggerAttack__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +bool daAlink_c::checkSpinnerTriggerAttack() { + if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) { + if (((daSpinner_c*)mRideAcKeep.getActor())->reflectAccept()) { + return true; + } + } + + return false; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkSpinnerTriggerAttack() { + nofralloc +#include "asm/d/a/d_a_alink/checkSpinnerTriggerAttack__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8010DBC8-8010DC64 108508 009C+00 2/2 0/0 0/0 .text setSpinnerSyncPos__9daAlink_cFv */ +void daAlink_c::setSpinnerSyncPos() { + daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor(); + + mDoMtx_multVecZero(spinner->getModelMtx(), &mCurrent.mPosition); + mDoMtx_stack_c::ZXYrotS(spinner->mCollisionRot); + mDoMtx_stack_c::YrotM(mCollisionRot.y - spinner->mCollisionRot.y); + mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &mCollisionRot); + field_0x37a4 = spinner->mCurrent.mPosition; +} + +/* 8010DC64-8010DDCC 1085A4 0168+00 1/1 0/0 0/0 .text procSpinnerReadyInit__9daAlink_cFv + */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSpinnerReadyInit() { + fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate( + PROC_SPINNER, daSpinner_c::getWaitArg(), &mCurrent.mPosition, fopAcM_GetRoomNo(this), + &mCollisionRot, NULL, -1, NULL, NULL); + + if (spinner == NULL) { + return 0; + } + + commonProcInit(PROC_SPINNER_READY); + mRideAcKeep.setData(spinner); + setSingleAnime(ANM_BOARD_SPINNER, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mRate, 6.0f, + daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mEndF, + daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mInterpolation); + mNormalSpeed = 0.0f; + setHeavyBoots(0); + + mSpeed.y = 26.0f; + voiceStart(Z2SE_AL_V_JUMP_S); + seStartOnlyReverb(Z2SE_AL_SPINNER_START); + + field_0x2f99 = 15; + deleteEquipItem(1, 1); + + mCurrent.mAngle.y = mCollisionRot.y; + field_0x3588 = l_waitBaseAnime; + field_0x33b0 = field_0x3588.y; + field_0x34d4 = l_waitBaseAnime; + mCommonCounter = 8; + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procSpinnerReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSpinnerReadyInit__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8010DDCC-8010DE64 10870C 0098+00 1/0 0/0 0/0 .text procSpinnerReady__9daAlink_cFv */ +int daAlink_c::procSpinnerReady() { + daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor(); + + if (spinner == NULL) { + return checkNextAction(0); + } + + mCurrent.mPosition.x = spinner->mCurrent.mPosition.x; + mCurrent.mPosition.z = spinner->mCurrent.mPosition.z; + + mCommonCounter--; + field_0x2f99 = 15; + + if ((mCommonCounter < 0 && mCurrent.mPosition.y <= spinner->getModelMtx()[1][3]) || + mCommonCounter < -30) { + mCurrent.mPosition.y = spinner->getModelMtx()[1][3]; + procSpinnerWaitInit(); + } + + return 1; +} + +/* 8010DE64-8010DE78 1087A4 0014+00 1/1 0/0 0/0 .text setSpinnerStatus__9daAlink_cFUcUc + */ +void daAlink_c::setSpinnerStatus(u8 status, u8 flag) { + dComIfGp_setDoStatus(status, flag); +} + +/* 8010DE78-8010DF4C 1087B8 00D4+00 2/2 0/0 0/0 .text procSpinnerWaitInit__9daAlink_cFv + */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSpinnerWaitInit() { + if (!commonProcInitNotSameProc(PROC_SPINNER_WAIT)) { + return 0; + } + + mRideStatus = 5; + setBgCheckParam(); + setSingleAnimeBaseSpeed(ANM_SPINNER_RIDE, daAlinkHIO_board_c0::m.mSitAnmSpeed, 4.0f); + mSpeed.y = 0.0f; + setSpecialGravity(0.0f, mMaxFallSpeed, 0); + mNormalSpeed = 0.0f; + mCommonCounter = 0; + + field_0x300e = mCollisionRot.y; + field_0x3010 = 0; + field_0x3198 = ANM_SPINNER_RIDE; + field_0x33b0 = 70.0f; + field_0x3012 = 0; + field_0x37a4 = mRideAcKeep.getActor()->mCurrent.mPosition; + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procSpinnerWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSpinnerWaitInit__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 8010DF4C-8010E48C 10888C 0540+00 1/0 0/0 0/0 .text procSpinnerWait__9daAlink_cFv */ +// matches with literals +#ifdef NONMATCHING +int daAlink_c::procSpinnerWait() { + daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor(); + + if (spinner == NULL || spinner->getDeleteFlg() || checkWindSpeedOnXZ() || + i_checkEndResetFlg1(ERFLG1_UNK_1) || i_checkEndResetFlg0(ERFLG0_UNK_2)) { + mNormalSpeed = 0.0f; + setJumpMode(); + return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation); + } + + if (spinner->checkSpinnerTagEnd()) { + return procSmallJumpInit(2); + } + + int itemSetBtn = checkItemSetButton(SPINNER); + if (mCommonCounter == 0) { + if (!itemButton()) { + mCommonCounter = 1; + mNormalSpeed = getSpinnerRideSpeedF(); + spinner->setMove(mNormalSpeed, getSpinnerRideMoveTime()); + } else if (checkInputOnR()) { + int direction = getDirectionFromAngle(mStickAngle); + s16 angle = field_0x33ac * 384.0f * field_0x33ac; + + if (direction == DIR_LEFT) { + mCollisionRot.y += angle; + } else if (direction == DIR_RIGHT) { + mCollisionRot.y -= angle; + } + + mCurrent.mAngle.y = mCollisionRot.y; + field_0x300e = mCollisionRot.y; + } + } else { + if (checkSetItemTrigger(SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { + if (swordSwingTrigger()) { + swordEquip(0); + } + setJumpMode(); + mNormalSpeed = 0.0f; + return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation); + } + + daPy_frameCtrl_c* frameCtrl = mFrameCtrl1; + dMeter2Info_onDirectUseItem(itemSetBtn); + + if (spinner->checkPathMoveNow() == NULL) { + seStartOnlyReverbLevel(Z2SE_AL_SPINNER_RIDE); + setSpinnerStatus(ACTION_STR_ATTACK, 0); + } else { + seStartOnlyReverbLevel(Z2SE_AL_SPINNER_RAIL); + setSpinnerStatus(ACTION_STR_JUMP2, 0); + } + + mNormalSpeed = spinner->mSpeedF; + mCurrent.mAngle.y = spinner->mCurrent.mAngle.y; + + if (spinner->checkSpinnerTagIntoIncRot()) { + field_0x3012 = 1; + setSpinnerStatus(ACTION_STR_SPIN, 4); + + if (field_0x3198 != ANM_SPINNER_PUSH && field_0x2060->getOldFrameRate() < 0.01f) { + setSingleAnimeBaseSpeed(ANM_SPINNER_RIDE, daAlinkHIO_board_c0::m.mSitAnmSpeed, + daAlinkHIO_board_c0::m.mFastPushInterpolation); + field_0x3198 = ANM_SPINNER_PUSH; + fopAcM_seStartCurrent(spinner, Z2SE_OBJ_SPNR_SW_PUSH, 0); + } + } else if (spinner->checkSpinnerTagInto()) { + if (field_0x3012 != 0) { + setSpinnerStatus(ACTION_STR_SPIN, 4); + } else { + setSpinnerStatus(ACTION_STR_SPIN, 0); + } + + if ((field_0x3198 == ANM_SPINNER_PUSH && field_0x2060->getOldFrameRate() < 0.01f) || + (field_0x3198 != ANM_SPINNER_PUSH && field_0x3198 != ANM_SPINNER_STAND)) { + setSingleAnimeBaseSpeed(ANM_SPINNER_STAND, daAlinkHIO_board_c0::m.mStandAnmSpeed, + daAlinkHIO_board_c0::m.mStandInterpolation); + field_0x3198 = ANM_SPINNER_STAND; + } + } else if (spinner->getButtonJump() && field_0x3198 != ANM_SPINNER_ATTACK) { + field_0x3198 = ANM_SPINNER_ATTACK; + setSingleAnime(ANM_SPINNER_ATTACK, 0.0f, daAlinkHIO_board_c0::m.mAirborneAnm.mStart, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndF, + daAlinkHIO_board_c0::m.mAirborneAnm.mInterpolation); + field_0x3010 = 0; + } else if (field_0x3198 == ANM_SPINNER_ATTACK) { + if (!spinner->getJumpFlg()) { + setSingleAnime(ANM_SPINNER_ATTACK_LAND, daAlinkHIO_board_c0::m.mLandAnm.mRate, + daAlinkHIO_board_c0::m.mLandAnm.mStart, 16, + daAlinkHIO_board_c0::m.mLandAnm.mInterpolation); + field_0x3198 = ANM_SPINNER_ATTACK_LAND; + } else if (field_0x3010 == 0 && field_0x2060->getOldFrameRate() < 0.01f) { + setSingleAnime(ANM_SPINNER_ATTACK, daAlinkHIO_board_c0::m.mAirborneAnm.mRate, + daAlinkHIO_board_c0::m.mAirborneAnm.mStart, + daAlinkHIO_board_c0::m.mAirborneAnm.mEndF, -1.0f); + field_0x3010 = 1; + } + } else if ((field_0x3198 == ANM_SPINNER_ATTACK_LAND && frameCtrl->checkAnmEnd()) || + (field_0x3198 != ANM_SPINNER_ATTACK_LAND && field_0x3198 != ANM_SPINNER_RIDE)) { + setSingleAnimeBaseSpeed(ANM_SPINNER_RIDE, daAlinkHIO_board_c0::m.mSitAnmSpeed, + daAlinkHIO_board_c0::m.mSitInterpolation); + field_0x3198 = ANM_SPINNER_RIDE; + } + } + + setSpinnerSyncPos(); + mCollisionRot.y = field_0x300e; + + return 1; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procSpinnerWait() { + nofralloc +#include "asm/d/a/d_a_alink/procSpinnerWait__9daAlink_cFv.s" +} +#pragma pop +#endif \ No newline at end of file diff --git a/src/d/a/d_a_alink_sumou.inc b/src/d/a/d_a_alink_sumou.inc new file mode 100644 index 00000000000..032ad4a8772 --- /dev/null +++ b/src/d/a/d_a_alink_sumou.inc @@ -0,0 +1,170 @@ +/* 800EA844-800EA8D0 0E5184 008C+00 5/5 0/0 0/0 .text checkSumouVsActor__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSumouVsActor() { + nofralloc +#include "asm/d/a/d_a_alink/checkSumouVsActor__9daAlink_cFv.s" +} +#pragma pop + +/* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text cancelSumouMode__9daAlink_cFv */ +void daAlink_c::cancelSumouMode() { + mCargoCarryAcKeep.clearData(); + mSpecialMode = 0; +} + +/* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text sumouPunchTrigger__9daAlink_cFv */ +void daAlink_c::sumouPunchTrigger() { + itemTriggerCheck(BTN_B); +} + +/* 800EA92C-800EA950 0E526C 0024+00 5/5 0/0 0/0 .text setSumouPunchStatus__9daAlink_cFv + */ +void daAlink_c::setSumouPunchStatus() { + setBStatus(0x44); +} + +/* 800EA950-800EAA28 0E5290 00D8+00 4/4 0/0 0/0 .text procSumouReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EAA28-800EAC4C 0E5368 0224+00 1/0 0/0 0/0 .text procSumouReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouReady() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouReady__9daAlink_cFv.s" +} +#pragma pop + +/* 800EAC4C-800EAD84 0E558C 0138+00 1/1 0/0 0/0 .text procSumouMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EAD84-800EB208 0E56C4 0484+00 1/0 0/0 0/0 .text procSumouMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouMove() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800EB208-800EB2BC 0E5B48 00B4+00 4/4 0/0 0/0 .text procSumouSideMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouSideMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouSideMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EB2BC-800EB624 0E5BFC 0368+00 1/0 0/0 0/0 .text procSumouSideMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouSideMove() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouSideMove__9daAlink_cFv.s" +} +#pragma pop + +/* 800EB624-800EBCE0 0E5F64 06BC+00 4/4 0/0 0/0 .text procSumouActionInit__9daAlink_cFiii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouActionInit(int param_0, int param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procSumouActionInit__9daAlink_cFiii.s" +} +#pragma pop + +/* 800EBCE0-800EC0F8 0E6620 0418+00 1/0 0/0 0/0 .text procSumouAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouAction() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouAction__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC0F8-800EC170 0E6A38 0078+00 1/1 0/0 0/0 .text procSumouStaggerInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouStaggerInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouStaggerInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC170-800EC20C 0E6AB0 009C+00 1/0 0/0 0/0 .text procSumouStagger__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouStagger() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouStagger__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC20C-800EC3D8 0E6B4C 01CC+00 1/1 0/0 0/0 .text procSumouWinLoseInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouWinLoseInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouWinLoseInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC3D8-800EC538 0E6D18 0160+00 1/0 0/0 0/0 .text procSumouWinLose__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouWinLose() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouWinLose__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC538-800EC5F4 0E6E78 00BC+00 1/0 0/0 0/0 .text procSumouShikoInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouShikoInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouShikoInit__9daAlink_cFv.s" +} +#pragma pop + +/* 800EC5F4-800EC724 0E6F34 0130+00 1/0 0/0 0/0 .text procSumouShiko__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSumouShiko() { + nofralloc +#include "asm/d/a/d_a_alink/procSumouShiko__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_swim.inc b/src/d/a/d_a_alink_swim.inc new file mode 100644 index 00000000000..06b28b32ee3 --- /dev/null +++ b/src/d/a/d_a_alink_swim.inc @@ -0,0 +1,422 @@ +/* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text checkZoraWearMaskDraw__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkZoraWearMaskDraw() { + nofralloc +#include "asm/d/a/d_a_alink/checkZoraWearMaskDraw__9daAlink_cFv.s" +} +#pragma pop + +/* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkAcceptUseItemInWater(u16 param_0) const { + nofralloc +#include "asm/d/a/d_a_alink/checkAcceptUseItemInWater__9daAlink_cCFUs.s" +} +#pragma pop + +/* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text swimDeleteItem__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::swimDeleteItem() { + nofralloc +#include "asm/d/a/d_a_alink/swimDeleteItem__9daAlink_cFv.s" +} +#pragma pop + +/* 801019B8-80101A18 0FC2F8 0060+00 11/11 0/0 0/0 .text getZoraSwim__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getZoraSwim() const { + nofralloc +#include "asm/d/a/d_a_alink/getZoraSwim__9daAlink_cCFv.s" +} +#pragma pop + +/* 80101A18-80101AA8 0FC358 0090+00 6/6 0/0 0/0 .text getSwimFrontMaxSpeed__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getSwimFrontMaxSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getSwimFrontMaxSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 80101AA8-80101B44 0FC3E8 009C+00 5/5 0/0 0/0 .text getSwimMaxFallSpeed__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getSwimMaxFallSpeed() const { + nofralloc +#include "asm/d/a/d_a_alink/getSwimMaxFallSpeed__9daAlink_cCFv.s" +} +#pragma pop + +/* 80101B44-80101C94 0FC484 0150+00 1/1 0/0 0/0 .text checkOxygenTimer__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkOxygenTimer() { + nofralloc +#include "asm/d/a/d_a_alink/checkOxygenTimer__9daAlink_cFv.s" +} +#pragma pop + +/* 80101C94-80101CB8 0FC5D4 0024+00 3/3 0/0 0/0 .text offOxygenTimer__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::offOxygenTimer() { + nofralloc +#include "asm/d/a/d_a_alink/offOxygenTimer__9daAlink_cFv.s" +} +#pragma pop + +/* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkPossibleWaterInMode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkPossibleWaterInMode__9daAlink_cCFv.s" +} +#pragma pop + +/* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text + * setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf.s" +} +#pragma pop + +/* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text swimBgCheck__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::swimBgCheck(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/swimBgCheck__9daAlink_cFf.s" +} +#pragma pop + +/* 801023E4-801029C8 0FCD24 05E4+00 3/3 0/0 0/0 .text setSpeedAndAngleSwim__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSpeedAndAngleSwim() { + nofralloc +#include "asm/d/a/d_a_alink/setSpeedAndAngleSwim__9daAlink_cFv.s" +} +#pragma pop + +/* 801029C8-80102B1C 0FD308 0154+00 3/3 0/0 0/0 .text checkNextActionSwim__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionSwim() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionSwim__9daAlink_cFv.s" +} +#pragma pop + +/* 80102B1C-80103058 0FD45C 053C+00 3/3 0/0 0/0 .text checkSwimAction__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimAction(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimAction__9daAlink_cFi.s" +} +#pragma pop + +/* 80103058-801032C8 0FD998 0270+00 7/7 0/0 0/0 .text checkSwimUpAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimUpAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimUpAction__9daAlink_cFv.s" +} +#pragma pop + +/* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text swimOutAfter__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::swimOutAfter(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/swimOutAfter__9daAlink_cFi.s" +} +#pragma pop + +/* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text checkSwimFall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimFall() { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimFall__9daAlink_cFv.s" +} +#pragma pop + +/* 801033CC-80103698 0FDD0C 02CC+00 1/1 0/0 0/0 .text checkSwimOutAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimOutAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimOutAction__9daAlink_cFv.s" +} +#pragma pop + +/* 80103698-80103EE0 0FDFD8 0848+00 4/4 0/0 0/0 .text setSwimMoveAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwimMoveAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setSwimMoveAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80103EE0-80103F08 0FE820 0028+00 5/5 0/0 0/0 .text checkSwimButtonAccept__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimButtonAccept() { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimButtonAccept__9daAlink_cFv.s" +} +#pragma pop + +/* 80103F08-80103F24 0FE848 001C+00 4/4 0/0 0/0 .text checkUpSwimButtonAccept__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkUpSwimButtonAccept() { + nofralloc +#include "asm/d/a/d_a_alink/checkUpSwimButtonAccept__9daAlink_cFv.s" +} +#pragma pop + +/* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text checkSwimButtonMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimButtonMove() { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimButtonMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80103F94-80103FE8 0FE8D4 0054+00 3/3 0/0 0/0 .text checkZoraSwimMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkZoraSwimMove() { + nofralloc +#include "asm/d/a/d_a_alink/checkZoraSwimMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text checkSwimNeckUpDown__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkSwimNeckUpDown() const { + nofralloc +#include "asm/d/a/d_a_alink/checkSwimNeckUpDown__9daAlink_cCFv.s" +} +#pragma pop + +/* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text setSwimUpDownOffset__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSwimUpDownOffset() { + nofralloc +#include "asm/d/a/d_a_alink/setSwimUpDownOffset__9daAlink_cFv.s" +} +#pragma pop + +/* 801040F8-801041E8 0FEA38 00F0+00 2/2 0/0 0/0 .text procSwimUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801041E8-801042F8 0FEB28 0110+00 1/0 0/0 0/0 .text procSwimUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimUp() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimUp__9daAlink_cFv.s" +} +#pragma pop + +/* 801042F8-801044B4 0FEC38 01BC+00 15/15 0/0 0/0 .text procSwimWaitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procSwimWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 801044B4-80104670 0FEDF4 01BC+00 1/0 0/0 0/0 .text procSwimWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimWait() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimWait__9daAlink_cFv.s" +} +#pragma pop + +/* 80104670-801047B8 0FEFB0 0148+00 9/9 0/0 0/0 .text procSwimMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801047B8-80104958 0FF0F8 01A0+00 1/0 0/0 0/0 .text procSwimMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimMove() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80104958-80104AA0 0FF298 0148+00 4/4 0/0 0/0 .text procSwimDiveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimDiveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimDiveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80104AA0-80104C50 0FF3E0 01B0+00 1/0 0/0 0/0 .text procSwimDive__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimDive() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimDive__9daAlink_cFv.s" +} +#pragma pop + +/* 80104C50-80104D7C 0FF590 012C+00 1/1 0/0 0/0 .text procSwimHookshotSubjectInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimHookshotSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimHookshotSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimHookshotSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimHookshotSubject__9daAlink_cFv.s" +} +#pragma pop + +/* 80104EB8-80104FC4 0FF7F8 010C+00 1/1 0/0 0/0 .text procSwimHookshotMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimHookshotMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimHookshotMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80104FC4-8010519C 0FF904 01D8+00 1/0 0/0 0/0 .text procSwimHookshotMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimHookshotMove() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimHookshotMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8010519C-80105728 0FFADC 058C+00 1/1 0/0 0/0 .text + * procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 80105728-801058A0 100068 0178+00 1/0 0/0 0/0 .text procSwimDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procSwimDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procSwimDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 801058A0-80105A00 1001E0 0160+00 2/2 0/0 0/0 .text procOctaIealSpitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procOctaIealSpitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procOctaIealSpitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text procOctaIealSpit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procOctaIealSpit() { + nofralloc +#include "asm/d/a/d_a_alink/procOctaIealSpit__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_swindow.inc b/src/d/a/d_a_alink_swindow.inc new file mode 100644 index 00000000000..f78c36711a9 --- /dev/null +++ b/src/d/a/d_a_alink_swindow.inc @@ -0,0 +1,100 @@ +/* 801406A8-80140888 13AFE8 01E0+00 0/0 1/1 0/0 .text initStatusWindow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initStatusWindow() { + nofralloc +#include "asm/d/a/d_a_alink/initStatusWindow__9daAlink_cFv.s" +} +#pragma pop + +/* 80140888-80140984 13B1C8 00FC+00 0/0 1/1 0/0 .text statusWindowExecute__9daAlink_cFPC4cXyzs */ +void daAlink_c::statusWindowExecute(cXyz const* param_0, s16 param_1) { + if (loadModelDVD()) { + if (mSwordChangeWaitTimer != 0) { + mSwordChangeWaitTimer--; + } + loadShieldModelDVD(); + setSelectEquipItem(1); + + if (mSwordChangeWaitTimer >= 30) { + mSwordChangeWaitTimer = 0; + } + + mDoMtx_stack_c::transS(*param_0); + mDoMtx_stack_c::YrotM(param_1); + field_0x0650->i_setBaseTRMtx(mDoMtx_stack_c::get()); + m_sWindowBck->play(); + m_sWindowBck->entry(field_0x064C); + field_0x0650->calc(); + + if (i_checkWolf()) { + setWolfItemMatrix(); + } else { + setItemMatrix(1); + } + } +} + +/* 80140984-80140AC8 13B2C4 0144+00 0/0 1/1 0/0 .text statusWindowDraw__9daAlink_cFv */ +void daAlink_c::statusWindowDraw() { + if (mClothesChangeWaitTimer == 0) { + g_env_light.settingTevStruct(12, &mCurrent.mPosition, &mTevStr); + initTevCustomColor(); + + if (!i_checkWolf()) { + setWaterDropColor((J3DGXColorS10*)&waterColor); + setDrawHand(); + } + + basicModelDraw(field_0x0650); + + if (!i_checkWolf()) { + basicModelDraw(field_0x065c); + basicModelDraw(field_0x0658); + basicModelDraw(field_0x0654); + + if (i_checkEquipHeavyBoots()) { + for (int i = 0; i < 2; i++) { + basicModelDraw(field_0x784[i]); + } + } + } + + if (checkSwordDraw()) { + basicModelDraw(mSwordModel); + if (!checkWoodSwordEquip()) { + basicModelDraw(field_0x06bc); + } + } + + if (checkShieldDraw()) { + basicModelDraw(mShieldModel); + } + } +} + +/* 80140AC8-80140B88 13B408 00C0+00 0/0 1/1 0/0 .text resetStatusWindow__9daAlink_cFv */ +void daAlink_c::resetStatusWindow() { + i_offNoResetFlg2(0x400000); + + if (i_checkWolf()) { + changeModelDataDirectWolf(1); + } else { + changeModelDataDirect(1); + } + + setMatrix(); + field_0x0650->calc(); + i_onNoResetFlg2(0x400000); + setSelectEquipItem(0); + + if (i_checkWolf()) { + setWolfItemMatrix(); + } else { + setItemMatrix(0); + } + + i_offNoResetFlg2(0x400000); + m_sWindowBck = NULL; +} \ No newline at end of file diff --git a/src/d/a/d_a_alink_whistle.inc b/src/d/a/d_a_alink_whistle.inc new file mode 100644 index 00000000000..2ea2abae8d5 --- /dev/null +++ b/src/d/a/d_a_alink_whistle.inc @@ -0,0 +1,154 @@ +/* 8011174C-80111770 10C08C 0024+00 1/1 0/0 0/0 .text daAlink_searchWhistle__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchWhistle(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchWhistle__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80111770-80111784 10C0B0 0014+00 1/1 0/0 0/0 .text daAlink_searchHawk__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchHawk(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchHawk__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 8045069C-804506A4 -00001 0008+00 1/1 0/0 0/0 .sdata grassWhistleArcName$33096 */ +SECTION_SDATA static void* grassWhistleArcName[2] = { + (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0xAD), + (void*)(((char*)&d_a_d_a_alink__stringBase0) + 0xB4), +}; + +/* 80111784-8011181C 10C0C4 0098+00 1/1 0/0 0/0 .text setGrassWhistleModel__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setGrassWhistleModel(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setGrassWhistleModel__9daAlink_cFi.s" +} +#pragma pop + +/* 8011181C-80111894 10C15C 0078+00 1/1 0/0 0/0 .text setHorseWhistleModel__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setHorseWhistleModel() { + nofralloc +#include "asm/d/a/d_a_alink/setHorseWhistleModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80111894-801119D8 10C1D4 0144+00 2/2 0/0 0/0 .text procGrassWhistleGetInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrassWhistleGetInit() { + nofralloc +#include "asm/d/a/d_a_alink/procGrassWhistleGetInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801119D8-80111A9C 10C318 00C4+00 1/0 0/0 0/0 .text procGrassWhistleGet__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrassWhistleGet() { + nofralloc +#include "asm/d/a/d_a_alink/procGrassWhistleGet__9daAlink_cFv.s" +} +#pragma pop + +/* 80111A9C-80111CA4 10C3DC 0208+00 2/2 0/0 0/0 .text + * procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s16 param_3, + cXyz* param_4) { + nofralloc +#include "asm/d/a/d_a_alink/procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz.s" +} +#pragma pop + +/* 80111CA4-80111FF0 10C5E4 034C+00 1/0 0/0 0/0 .text procGrassWhistleWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procGrassWhistleWait() { + nofralloc +#include "asm/d/a/d_a_alink/procGrassWhistleWait__9daAlink_cFv.s" +} +#pragma pop + +/* 80111FF0-801120C8 10C930 00D8+00 2/2 0/0 0/0 .text procCoHorseCallWaitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoHorseCallWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procCoHorseCallWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 801120C8-801121B4 10CA08 00EC+00 1/0 0/0 0/0 .text procCoHorseCallWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procCoHorseCallWait() { + nofralloc +#include "asm/d/a/d_a_alink/procCoHorseCallWait__9daAlink_cFv.s" +} +#pragma pop + +/* 801121B4-80112220 10CAF4 006C+00 1/0 0/0 0/0 .text procHawkCatchInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHawkCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHawkCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80112220-80112278 10CB60 0058+00 1/0 0/0 0/0 .text procHawkCatch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHawkCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procHawkCatch__9daAlink_cFv.s" +} +#pragma pop + +/* 80112278-80112304 10CBB8 008C+00 2/2 0/0 0/0 .text procHawkSubjectInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHawkSubjectInit() { + nofralloc +#include "asm/d/a/d_a_alink/procHawkSubjectInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80112304-8011243C 10CC44 0138+00 1/0 0/0 0/0 .text procHawkSubject__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procHawkSubject() { + nofralloc +#include "asm/d/a/d_a_alink/procHawkSubject__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_alink_wolf.inc b/src/d/a/d_a_alink_wolf.inc new file mode 100644 index 00000000000..b429fb80e9f --- /dev/null +++ b/src/d/a/d_a_alink_wolf.inc @@ -0,0 +1,2647 @@ +/* 80126740-80126928 121080 01E8+00 2/2 0/0 0/0 .text changeCommon__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeCommon() { + nofralloc +#include "asm/d/a/d_a_alink/changeCommon__9daAlink_cFv.s" +} +#pragma pop + +/* 80126928-80126F3C 121268 0614+00 2/2 0/0 0/0 .text changeWolf__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeWolf() { + nofralloc +#include "asm/d/a/d_a_alink/changeWolf__9daAlink_cFv.s" +} +#pragma pop + +/* 80126F3C-80127C54 12187C 0D18+00 2/2 0/0 0/0 .text changeLink__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeLink(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeLink__9daAlink_cFi.s" +} +#pragma pop + +/* 80127C54-80127CAC 122594 0058+00 2/2 0/0 0/0 .text onWolfEyeUp__9daAlink_cFv */ +void daAlink_c::onWolfEyeUp() { + if (mWolfEyeUp == 0) { + mZ2Link.setWolfEyeOpen(true); + mWolfEyeUp = daAlinkHIO_wolf_c0::m.mSensesLingerTime; + field_0x2fd2 = 20; + } +} + +/* 80127CAC-80127CF0 1225EC 0044+00 5/5 0/0 0/0 .text offWolfEyeUp__9daAlink_cFv */ +void daAlink_c::offWolfEyeUp() { + if (mWolfEyeUp != 0) { + mWolfEyeUp = 0; + field_0x2fd2 = 20; + mZ2Link.setWolfEyeOpen(false); + } +} + +/* 80127CF0-80127D14 122630 0024+00 1/1 0/0 0/0 .text wolfSenseTrigger__9daAlink_cFv */ +BOOL daAlink_c::wolfSenseTrigger() { + return itemTriggerCheck(BTN_X); +} + +/* 80127D14-80127D2C 122654 0018+00 1/1 0/0 0/0 .text setWolfSenceStatus__9daAlink_cFUc + */ +void daAlink_c::setWolfSenceStatus(u8 status) { + dComIfGp_setXStatus(status, 0); +} + +/* 80127D2C-80127D50 12266C 0024+00 1/1 0/0 0/0 .text wolfClawTrigger__9daAlink_cFv */ +void daAlink_c::wolfClawTrigger() { + itemTriggerCheck(BTN_Y); +} + +/* 80127D50-80127D68 122690 0018+00 2/2 0/0 0/0 .text setWolfDigStatus__9daAlink_cFUc */ +void daAlink_c::setWolfDigStatus(u8 flag) { + dComIfGp_setYStatus(13, flag); +} + +/* 80127D68-80127DC4 1226A8 005C+00 4/4 0/0 0/0 .text checkWolfShapeReverse__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm BOOL daAlink_c::checkWolfShapeReverse() const { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfShapeReverse__9daAlink_cCFv.s" +} +#pragma pop + +/* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text checkWolfSideStep__9daAlink_cCFv */ +BOOL daAlink_c::checkWolfSideStep() const { + return field_0x2f98 != 0 && + ((mProcID == PROC_WOLF_ATN_AC_MOVE && !i_checkModeFlg(1)) || mProcID == PROC_WOLF_SIDESTEP_LAND || + mProcID == PROC_WOLF_BACKJUMP_LAND); +} + +/* 80127E08-80127F20 122748 0118+00 1/1 0/0 0/0 .text setWolfTailAngle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfTailAngle() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfTailAngle__9daAlink_cFv.s" +} +#pragma pop + +/* 80127F20-80127F50 122860 0030+00 5/5 0/0 0/0 .text checkWolfSlowDash__9daAlink_cFv */ +BOOL daAlink_c::checkWolfSlowDash() { + return field_0x2fc7 == 1 || field_0x2fc7 == 3 || field_0x3174 == 11; +} + +/* 80127F50-80128478 122890 0528+00 1/1 0/0 0/0 .text setSpeedAndAngleWolf__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSpeedAndAngleWolf() { + nofralloc +#include "asm/d/a/d_a_alink/setSpeedAndAngleWolf__9daAlink_cFv.s" +} +#pragma pop + +/* 80128478-80128798 122DB8 0320+00 2/2 0/0 0/0 .text setSpeedAndAngleWolfAtn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSpeedAndAngleWolfAtn() { + nofralloc +#include "asm/d/a/d_a_alink/setSpeedAndAngleWolfAtn__9daAlink_cFv.s" +} +#pragma pop + +/* 80128798-8012880C 1230D8 0074+00 4/4 0/0 0/0 .text checkWolfAtnWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfAtnWait() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfAtnWait__9daAlink_cFv.s" +} +#pragma pop + +/* void daAlink_c::checkWolfAtnWait() { + return checkEnemyGroup(mTargetedActor) && mDemo.getDemoMode() == 0x17 || mTargetedActor != NULL +|| fopAcM_GetName(mTargetedActor) == 0x262 || +} */ + +/* 8012880C-80128844 12314C 0038+00 27/27 0/0 0/0 .text + * checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM */ +BOOL daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM anm_id) const { + return mUnderAnime[0].checkNoSetArcNo() && + m_wlAnmDataTable[anm_id].field_0x0 == mUnderAnime[0].getIdx(); +} + +/* 80128844-80128F0C 123184 06C8+00 11/11 0/0 0/0 .text setBlendWolfMoveAnime__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setBlendWolfMoveAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 80128F0C-80128F5C 12384C 0050+00 2/2 0/0 0/0 .text checkWolfAtnMoveBack__9daAlink_cFs + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfAtnMoveBack(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfAtnMoveBack__9daAlink_cFs.s" +} +#pragma pop + +/* 80128F5C-80129114 12389C 01B8+00 5/5 0/0 0/0 .text setWolfAtnMoveDirection__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfAtnMoveDirection() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfAtnMoveDirection__9daAlink_cFv.s" +} +#pragma pop + +/* 80129114-8012933C 123A54 0228+00 2/2 0/0 0/0 .text setBlendWolfAtnMoveAnime__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBlendWolfAtnMoveAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setBlendWolfAtnMoveAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 8012933C-8012948C 123C7C 0150+00 1/1 0/0 0/0 .text setBlendWolfAtnBackMoveAnime__9daAlink_cFf + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setBlendWolfAtnBackMoveAnime__9daAlink_cFf.s" +} +#pragma pop + +/* 8012948C-80129678 123DCC 01EC+00 3/3 0/0 0/0 .text + * setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2, + daAlink_c::daAlink_WANM param_3, + daAlink_c::daAlink_WANM param_4, int param_5, f32 param_6) { + nofralloc +#include "asm/d/a/d_a_alink/setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif.s" +} +#pragma pop + +/* 80129678-801296A8 123FB8 0030+00 35/35 0/0 0/0 .text + * setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSingleAnimeWolfBase(daAlink_c::daAlink_WANM param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM.s" +} +#pragma pop + +/* 801296A8-801296D8 123FE8 0030+00 3/3 0/0 0/0 .text + * setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" +} +#pragma pop + +/* 801296D8-80129704 124018 002C+00 44/44 0/0 0/0 .text + * setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM param_0, f32 param_1, + f32 param_2) { + nofralloc +#include "asm/d/a/d_a_alink/setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff.s" +} +#pragma pop + +/* 80129704-80129848 124044 0144+00 29/29 0/0 0/0 .text + * setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM param_0, f32 param_1, f32 param_2, + s16 param_3, f32 param_4) { + nofralloc +#include "asm/d/a/d_a_alink/setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf.s" +} +#pragma pop + +/* 80129848-8012987C 124188 0034+00 53/53 0/0 0/0 .text + * setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSingleAnimeWolfParam(daAlink_c::daAlink_WANM param_0, + daAlinkHIO_anm_c const* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c.s" +} +#pragma pop + +/* 8012987C-80129958 1241BC 00DC+00 5/5 0/0 0/0 .text checkWolfLandAction__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfLandAction(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfLandAction__9daAlink_cFi.s" +} +#pragma pop + +/* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text checkMidnaUseAbility__9daAlink_cCFv + */ +BOOL daAlink_c::checkMidnaUseAbility() const { + return i_dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check(); +} + +/* 801299A8-80129A80 1242E8 00D8+00 1/1 0/0 0/0 .text checkWolfUseAbility__9daAlink_cFv + */ +void daAlink_c::checkWolfUseAbility() { + if (mProcID == PROC_WOLF_GIANT_PUZZLE) { + return; + } + + if (checkMidnaLockJumpPoint() != NULL && !i_checkMidnaRide()) { + offWolfEyeUp(); + } else { + if (i_dComIfGs_isEventBit(0x4308) && field_0x2fd2 == 0 && !checkEventRun() && + mWolfEyeUp < daAlinkHIO_wolf_c0::m.mSensesLingerTime && wolfSenseTrigger()) { + if (mWolfEyeUp == 0) { + onWolfEyeUp(); + } else { + offWolfEyeUp(); + } + } + } +} + +/* 80129A80-80129B44 1243C0 00C4+00 13/13 0/0 0/0 .text checkWolfGroundSpecialMode__9daAlink_cFv + */ +int daAlink_c::checkWolfGroundSpecialMode() { + if (mLinkAcch.ChkGroundHit() && !i_checkModeFlg(MODE_PLAYER_FLY) && + i_checkEndResetFlg0(ERFLG0_UNK_1)) { + return procCoMetamorphoseInit(); + } else if (mSpecialMode == SMODE_WOLF_PUZZLE || mSpecialMode == 0x28) { + return procWolfGiantPuzzleInit(); + } else if (checkCargoCarry()) { + return procWolfCargoCarryInit(); + } else if (checkSlideAction()) { + return 1; + } else if (i_checkEndResetFlg1(ERFLG1_UNK_1)) { + return procWolfScreamWaitInit(); + } + return 0; +} + +/* 80129B44-8012A02C 124484 04E8+00 46/46 0/0 0/0 .text checkNextActionWolf__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionWolf(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionWolf__9daAlink_cFi.s" +} +#pragma pop + +/* 8012A02C-8012A228 12496C 01FC+00 3/3 0/0 0/0 .text wolfSideBgCheck__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::wolfSideBgCheck(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/wolfSideBgCheck__9daAlink_cFs.s" +} +#pragma pop + +/* 8012A228-8012A330 124B68 0108+00 4/4 0/0 0/0 .text checkWolfAttackReverse__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfAttackReverse(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfAttackReverse__9daAlink_cFi.s" +} +#pragma pop + +/* 8012A330-8012A41C 124C70 00EC+00 1/1 0/0 0/0 .text checkWolfBarrierHitReverse__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfBarrierHitReverse() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfBarrierHitReverse__9daAlink_cFv.s" +} +#pragma pop + +/* 8012A41C-8012A498 124D5C 007C+00 2/2 0/0 0/0 .text + * checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo.s" +} +#pragma pop + +/* 8012A498-8012ACCC 124DD8 0834+00 1/1 0/0 0/0 .text wolfBgCheck__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::wolfBgCheck() { + nofralloc +#include "asm/d/a/d_a_alink/wolfBgCheck__9daAlink_cFv.s" +} +#pragma pop + +/* 8012ACCC-8012AD1C 12560C 0050+00 1/1 0/0 0/0 .text changeWolfBlendRate__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeWolfBlendRate(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/changeWolfBlendRate__9daAlink_cFi.s" +} +#pragma pop + +/* 8012AD1C-8012B724 12565C 0A08+00 1/1 0/0 0/0 .text setWolfFootMatrix__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfFootMatrix() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfFootMatrix__9daAlink_cFv.s" +} +#pragma pop + +/* 8012B724-8012BFA8 126064 0884+00 1/1 0/0 0/0 .text wolfFootBgCheck__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::wolfFootBgCheck() { + nofralloc +#include "asm/d/a/d_a_alink/wolfFootBgCheck__9daAlink_cFv.s" +} +#pragma pop + +/* 8012BFA8-8012C1F4 1268E8 024C+00 6/6 0/0 0/0 .text checkWolfWaitSlipPolygon__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfWaitSlipPolygon() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfWaitSlipPolygon__9daAlink_cFv.s" +} +#pragma pop + +/* 8012C1F4-8012C308 126B34 0114+00 2/2 0/0 0/0 .text setWolfWaitSlip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfWaitSlip() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfWaitSlip__9daAlink_cFv.s" +} +#pragma pop + +/* 8012C308-8012C30C 126C48 0004+00 4/4 0/0 0/0 .text checkWolfAtnDoCharge__9daAlink_cFv + */ +void daAlink_c::checkWolfAtnDoCharge() { + /* empty function */ +} + +/* 8012C30C-8012CB0C 126C4C 0800+00 1/1 0/0 0/0 .text setWolfChainPos__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfChainPos() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfChainPos__9daAlink_cFv.s" +} +#pragma pop + +/* 8012CB0C-8012CBE4 12744C 00D8+00 1/1 0/0 0/0 .text setWolfAnmVoice__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfAnmVoice() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfAnmVoice__9daAlink_cFv.s" +} +#pragma pop + +/* 8012CBE4-8012CD28 127524 0144+00 4/4 0/0 0/0 .text procWolfServiceWaitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfServiceWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfServiceWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012CD28-8012CF68 127668 0240+00 1/0 0/0 0/0 .text procWolfServiceWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfServiceWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfServiceWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8012CF68-8012CFEC 1278A8 0084+00 1/1 0/0 0/0 .text procWolfTiredWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTiredWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTiredWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012CFEC-8012D050 12792C 0064+00 1/0 0/0 0/0 .text procWolfTiredWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTiredWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTiredWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D050-8012D104 127990 00B4+00 3/2 0/0 0/0 .text procWolfMidnaRideShockInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfMidnaRideShockInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfMidnaRideShockInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D104-8012D1A8 127A44 00A4+00 1/0 0/0 0/0 .text procWolfMidnaRideShock__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfMidnaRideShock() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfMidnaRideShock__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D1A8-8012D2A8 127AE8 0100+00 13/13 0/0 0/0 .text procWolfWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D2A8-8012D380 127BE8 00D8+00 1/0 0/0 0/0 .text procWolfWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D380-8012D3E4 127CC0 0064+00 2/2 0/0 0/0 .text procWolfMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D3E4-8012D474 127D24 0090+00 1/0 0/0 0/0 .text procWolfMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D474-8012D590 127DB4 011C+00 1/1 0/0 0/0 .text procWolfDashInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDashInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDashInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D590-8012D8C0 127ED0 0330+00 1/0 0/0 0/0 .text procWolfDash__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDash() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDash__9daAlink_cFv.s" +} +#pragma pop + +/* 8012D8C0-8012DA5C 128200 019C+00 2/2 0/0 0/0 .text procWolfDashReverseInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDashReverseInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDashReverseInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012DA5C-8012DBA8 12839C 014C+00 1/0 0/0 0/0 .text procWolfDashReverse__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDashReverse() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDashReverse__9daAlink_cFv.s" +} +#pragma pop + +/* 8012DBA8-8012DC44 1284E8 009C+00 1/1 0/0 0/0 .text procWolfAtnActorMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAtnActorMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAtnActorMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012DC44-8012DD08 128584 00C4+00 1/0 0/0 0/0 .text procWolfAtnActorMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAtnActorMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAtnActorMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8012DD08-8012DDB4 128648 00AC+00 1/1 0/0 0/0 .text procWolfWaitTurnInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012DDB4-8012DEC8 1286F4 0114+00 1/0 0/0 0/0 .text procWolfWaitTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8012DEC8-8012E0AC 128808 01E4+00 2/2 0/0 0/0 .text procWolfSideStepInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSideStepInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSideStepInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012E0AC-8012E1E8 1289EC 013C+00 1/0 0/0 0/0 .text procWolfSideStep__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSideStep() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSideStep__9daAlink_cFv.s" +} +#pragma pop + +/* 8012E1E8-8012E2DC 128B28 00F4+00 1/1 0/0 0/0 .text procWolfSideStepLandInit__9daAlink_cFs */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSideStepLandInit(s16 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSideStepLandInit__9daAlink_cFs.s" +} +#pragma pop + +/* 8012E2DC-8012E398 128C1C 00BC+00 1/0 0/0 0/0 .text procWolfSideStepLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSideStepLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSideStepLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8012E398-8012E508 128CD8 0170+00 3/3 0/0 0/0 .text procWolfBackJumpInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfBackJumpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfBackJumpInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012E508-8012E5F4 128E48 00EC+00 1/0 0/0 0/0 .text procWolfBackJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfBackJump() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfBackJump__9daAlink_cFv.s" +} +#pragma pop + +/* 8012E5F4-8012E684 128F34 0090+00 1/1 0/0 0/0 .text procWolfBackJumpLandInit__9daAlink_cFss */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfBackJumpLandInit__9daAlink_cFss.s" +} +#pragma pop + +/* 8012E684-8012E754 128FC4 00D0+00 1/0 0/0 0/0 .text procWolfBackJumpLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfBackJumpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfBackJumpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8012E754-8012E83C 129094 00E8+00 2/2 0/0 0/0 .text procWolfHowlInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHowlInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHowlInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012E83C-8012E9C8 12917C 018C+00 1/0 0/0 0/0 .text procWolfHowl__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHowl() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHowl__9daAlink_cFv.s" +} +#pragma pop + +/* 8012E9C8-8012EB94 129308 01CC+00 2/2 0/0 0/0 .text procWolfAutoJumpInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAutoJumpInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAutoJumpInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012EB94-8012EDD0 1294D4 023C+00 1/0 0/0 0/0 .text procWolfAutoJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAutoJump() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAutoJump__9daAlink_cFv.s" +} +#pragma pop + +/* 8012EDD0-8012EFB8 129710 01E8+00 12/12 0/0 0/0 .text procWolfFallInit__9daAlink_cFif + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfFallInit(int param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfFallInit__9daAlink_cFif.s" +} +#pragma pop + +/* 8012EFB8-8012F138 1298F8 0180+00 1/0 0/0 0/0 .text procWolfFall__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfFall() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfFall__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F138-8012F1F0 129A78 00B8+00 2/2 0/0 0/0 .text procWolfLandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F1F0-8012F278 129B30 0088+00 1/0 0/0 0/0 .text procWolfLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F278-8012F358 129BB8 00E0+00 1/1 0/0 0/0 .text procWolfSitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012F358-8012F41C 129C98 00C4+00 1/0 0/0 0/0 .text procWolfSit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F41C-8012F500 129D5C 00E4+00 1/1 0/0 0/0 .text procWolfStepMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfStepMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfStepMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F500-8012F634 129E40 0134+00 1/0 0/0 0/0 .text procWolfStepMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfStepMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfStepMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F634-8012F6EC 129F74 00B8+00 1/1 0/0 0/0 .text procWolfSlipInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlipInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlipInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F6EC-8012F840 12A02C 0154+00 1/0 0/0 0/0 .text procWolfSlip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlip() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlip__9daAlink_cFv.s" +} +#pragma pop + +/* 8012F840-8012F9C0 12A180 0180+00 2/2 0/0 0/0 .text procWolfSlipTurnInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlipTurnInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlipTurnInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8012F9C0-8012FB18 12A300 0158+00 1/0 0/0 0/0 .text procWolfSlipTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlipTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlipTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8012FB18-8012FBB4 12A458 009C+00 1/1 0/0 0/0 .text procWolfSlipTurnLandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlipTurnLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlipTurnLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8012FBB4-8012FC38 12A4F4 0084+00 1/0 0/0 0/0 .text procWolfSlipTurnLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlipTurnLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlipTurnLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8012FC38-8012FD2C 12A578 00F4+00 2/2 0/0 0/0 .text procWolfSlideReadyInit__9daAlink_cFsi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlideReadyInit(s16 param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlideReadyInit__9daAlink_cFsi.s" +} +#pragma pop + +/* 8012FD2C-8012FE80 12A66C 0154+00 1/0 0/0 0/0 .text procWolfSlideReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlideReady() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlideReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8012FE80-8012FFA4 12A7C0 0124+00 2/2 0/0 0/0 .text procWolfSlideInit__9daAlink_cFsi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlideInit(s16 param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlideInit__9daAlink_cFsi.s" +} +#pragma pop + +/* 8012FFA4-801300D4 12A8E4 0130+00 1/0 0/0 0/0 .text procWolfSlide__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlide() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlide__9daAlink_cFv.s" +} +#pragma pop + +/* 801300D4-80130138 12AA14 0064+00 1/1 0/0 0/0 .text procWolfSlideLandInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlideLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlideLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80130138-801301E4 12AA78 00AC+00 1/0 0/0 0/0 .text procWolfSlideLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlideLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlideLand__9daAlink_cFv.s" +} +#pragma pop + +/* 801301E4-80130268 12AB24 0084+00 3/3 0/0 0/0 .text procWolfWaitSlipInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitSlipInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitSlipInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80130268-80130440 12ABA8 01D8+00 1/0 0/0 0/0 .text procWolfWaitSlip__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitSlip() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitSlip__9daAlink_cFv.s" +} +#pragma pop + +/* 80130440-801304D4 12AD80 0094+00 2/2 0/0 0/0 .text procWolfSlopeStartInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlopeStartInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlopeStartInit__9daAlink_cFi.s" +} +#pragma pop + +/* 801304D4-8013056C 12AE14 0098+00 1/0 0/0 0/0 .text procWolfSlopeStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSlopeStart() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSlopeStart__9daAlink_cFv.s" +} +#pragma pop + +/* 8013056C-80130580 12AEAC 0014+00 1/1 0/0 0/0 .text daAlink_searchGoldWolf__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchGoldWolf(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchGoldWolf__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80130580-80130654 12AEC0 00D4+00 1/1 0/0 0/0 .text daAlink_searchWolfHowl__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchWolfHowl(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchWolfHowl__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80130654-80130700 12AF94 00AC+00 1/1 0/0 0/0 .text setWolfHowlNotHappen__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfHowlNotHappen(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfHowlNotHappen__9daAlink_cFi.s" +} +#pragma pop + +/* 80130700-80130BC4 12B040 04C4+00 1/1 0/0 0/0 .text procWolfHowlDemoInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHowlDemoInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHowlDemoInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80130BC4-801312C8 12B504 0704+00 1/0 0/0 0/0 .text procWolfHowlDemo__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHowlDemo() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHowlDemo__9daAlink_cFv.s" +} +#pragma pop + +/* 801312C8-80131408 12BC08 0140+00 1/1 0/0 0/0 .text setWolfHowling__15daObj_Sekizoa_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daObj_Sekizoa_c::setWolfHowling() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfHowling__15daObj_Sekizoa_cFv.s" +} +#pragma pop + +/* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text checkWolfRope__9daAlink_cFv */ +#ifdef NONMATCHING +bool daAlink_c::checkWolfRope() { + bool ret = false; + bool bvar1 = false; + + if (i_checkModeFlg(MODE_UNK_20000) && field_0x280c.getActor() != NULL) { + bvar1 = true; + } + + // actor is Crope + if (bvar1 && fopAcM_GetName(field_0x280c.getActor()) == 0x2BE) { + ret = true; + } + return ret; +} +#else +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::checkWolfRope() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfRope__9daAlink_cFv.s" +} +#pragma pop +#endif + +/* 80131450-80131628 12BD90 01D8+00 2/2 0/0 0/0 .text + * checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfRopeHit(dCcD_GObjInf* param_0, cXyz const* param_1, + int param_2) const { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi.s" +} +#pragma pop + +/* 80131628-801316A4 12BF68 007C+00 2/2 0/0 0/0 .text checkWolfRopeJumpHang__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfRopeJumpHang() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfRopeJumpHang__9daAlink_cFv.s" +} +#pragma pop + +/* 801316A4-80131718 12BFE4 0074+00 1/1 0/0 0/0 .text getWolfRopeMoveSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWolfRopeMoveSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfRopeMoveSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 80131718-801319F0 12C058 02D8+00 6/6 0/0 0/0 .text setWolfRopePosY__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfRopePosY() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfRopePosY__9daAlink_cFv.s" +} +#pragma pop + +/* 801319F0-80131A6C 12C330 007C+00 5/5 0/0 0/0 .text initWolfRopeShapeAngle__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::initWolfRopeShapeAngle() { + nofralloc +#include "asm/d/a/d_a_alink/initWolfRopeShapeAngle__9daAlink_cFv.s" +} +#pragma pop + +/* 80131A6C-80131AFC 12C3AC 0090+00 5/5 0/0 0/0 .text wolfRopeSwingInc__9daAlink_cFf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::wolfRopeSwingInc(f32 param_0) { + nofralloc +#include "asm/d/a/d_a_alink/wolfRopeSwingInc__9daAlink_cFf.s" +} +#pragma pop + +/* 80131AFC-80131C00 12C43C 0104+00 8/8 0/0 0/0 .text setWolfRopeOffsetY__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfRopeOffsetY(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfRopeOffsetY__9daAlink_cFi.s" +} +#pragma pop + +/* 80131C00-80131C74 12C540 0074+00 2/2 0/0 0/0 .text getDirectionRopeMove__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getDirectionRopeMove() const { + nofralloc +#include "asm/d/a/d_a_alink/getDirectionRopeMove__9daAlink_cCFv.s" +} +#pragma pop + +/* 80131C74-80131DA0 12C5B4 012C+00 5/5 0/0 0/0 .text procWolfRopeMoveInit__9daAlink_cFii + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeMoveInit__9daAlink_cFii.s" +} +#pragma pop + +/* 80131DA0-80132738 12C6E0 0998+00 1/0 0/0 0/0 .text procWolfRopeMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80132738-80132914 12D078 01DC+00 5/5 0/0 0/0 .text procWolfRopeHangInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeHangInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeHangInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80132914-80132D68 12D254 0454+00 1/0 0/0 0/0 .text procWolfRopeHang__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeHang() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeHang__9daAlink_cFv.s" +} +#pragma pop + +/* 80132D68-80132E88 12D6A8 0120+00 1/1 0/0 0/0 .text procWolfRopeTurnInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeTurnInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeTurnInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80132E88-80133054 12D7C8 01CC+00 1/0 0/0 0/0 .text procWolfRopeTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 80133054-80133164 12D994 0110+00 1/1 0/0 0/0 .text procWolfRopeStaggerInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeStaggerInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeStaggerInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80133164-8013384C 12DAA4 06E8+00 1/0 0/0 0/0 .text procWolfRopeStagger__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeStagger() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeStagger__9daAlink_cFv.s" +} +#pragma pop + +/* 8013384C-80133930 12E18C 00E4+00 1/1 0/0 0/0 .text procWolfRopeSubjectivityInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeSubjectivityInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeSubjectivityInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80133930-80133D6C 12E270 043C+00 1/0 0/0 0/0 .text procWolfRopeSubjectivity__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRopeSubjectivity() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRopeSubjectivity__9daAlink_cFv.s" +} +#pragma pop + +/* 80133D6C-80133EF0 12E6AC 0184+00 0/0 0/0 1/1 .text getWolfTagJumpTime__9daAlink_cCFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWolfTagJumpTime() const { + nofralloc +#include "asm/d/a/d_a_alink/getWolfTagJumpTime__9daAlink_cCFv.s" +} +#pragma pop + +/* 80133EF0-80134000 12E830 0110+00 3/3 1/1 1/1 .text checkMidnaLockJumpPoint__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm cXyz* daAlink_c::checkMidnaLockJumpPoint() const { + nofralloc +#include "asm/d/a/d_a_alink/checkMidnaLockJumpPoint__9daAlink_cCFv.s" +} +#pragma pop + +/* 80134000-80134838 12E940 0838+00 4/4 0/0 0/0 .text + * procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 80134838-80134DB8 12F178 0580+00 1/0 0/0 0/0 .text procWolfTagJump__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTagJump() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTagJump__9daAlink_cFv.s" +} +#pragma pop + +/* 80134DB8-80134EBC 12F6F8 0104+00 1/1 0/0 0/0 .text + * procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c.s" +} +#pragma pop + +/* 80134EBC-80135050 12F7FC 0194+00 1/0 0/0 0/0 .text procWolfTagJumpLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfTagJumpLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfTagJumpLand__9daAlink_cFv.s" +} +#pragma pop + +/* 80135050-801350A4 12F990 0054+00 1/1 0/0 0/0 .text daAlink_searchGiant__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchGiant(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchGiant__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 801350A4-80135160 12F9E4 00BC+00 1/1 0/0 0/0 .text daAlink_searchGiantTalk__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchGiantTalk(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchGiantTalk__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 80135160-801351F8 12FAA0 0098+00 1/1 0/0 0/0 .text procWolfGiantPuzzleInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procWolfGiantPuzzleInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGiantPuzzleInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801351F8-80135458 12FB38 0260+00 1/0 0/0 0/0 .text procWolfGiantPuzzle__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGiantPuzzle() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGiantPuzzle__9daAlink_cFv.s" +} +#pragma pop + +/* 80135458-801354C8 12FD98 0070+00 2/2 0/0 0/0 .text setWolfHangGroundY__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfHangGroundY() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfHangGroundY__9daAlink_cFv.s" +} +#pragma pop + +/* 801354C8-801355EC 12FE08 0124+00 2/2 0/0 0/0 .text changeWolfHangEndProc__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::changeWolfHangEndProc() { + nofralloc +#include "asm/d/a/d_a_alink/changeWolfHangEndProc__9daAlink_cFv.s" +} +#pragma pop + +/* 801355EC-80135668 12FF2C 007C+00 2/2 0/0 0/0 .text procWolfHangReadyInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80135668-801356F0 12FFA8 0088+00 1/0 0/0 0/0 .text procWolfHangReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangReady() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangReady__9daAlink_cFv.s" +} +#pragma pop + +/* 801356F0-80135AF4 130030 0404+00 3/3 0/0 0/0 .text procWolfHangWallCatchInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangWallCatchInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangWallCatchInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80135AF4-80135CD8 130434 01E4+00 1/0 0/0 0/0 .text procWolfHangWallCatch__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangWallCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangWallCatch__9daAlink_cFv.s" +} +#pragma pop + +/* 80135CD8-80135F00 130618 0228+00 1/1 0/0 0/0 .text + * procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla.s" +} +#pragma pop + +/* 80135F00-80136064 130840 0164+00 1/0 0/0 0/0 .text procWolfHangFallStart__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfHangFallStart() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfHangFallStart__9daAlink_cFv.s" +} +#pragma pop + +/* 80136064-801360EC 1309A4 0088+00 1/1 0/0 0/0 .text setWolfHeadDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfHeadDamage() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfHeadDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 801360EC-80136508 130A2C 041C+00 1/1 0/0 0/0 .text + * procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf.s" +} +#pragma pop + +/* 80136508-80136624 130E48 011C+00 1/0 0/0 0/0 .text procWolfDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 80136624-801369E4 130F64 03C0+00 2/2 0/0 0/0 .text procWolfLargeDamageUpInit__9daAlink_cFiiss + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLargeDamageUpInit__9daAlink_cFiiss.s" +} +#pragma pop + +/* 801369E4-80136C18 131324 0234+00 1/0 0/0 0/0 .text procWolfLargeDamageUp__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLargeDamageUp() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLargeDamageUp__9daAlink_cFv.s" +} +#pragma pop + +/* 80136C18-80136DE4 131558 01CC+00 1/1 0/0 0/0 .text procWolfLandDamageInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLandDamageInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLandDamageInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80136DE4-80136EC4 131724 00E0+00 1/0 0/0 0/0 .text procWolfLandDamage__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLandDamage() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLandDamage__9daAlink_cFv.s" +} +#pragma pop + +/* 80136EC4-80136F54 131804 0090+00 2/2 0/0 0/0 .text setWolfScreamWaitAnime__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfScreamWaitAnime() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfScreamWaitAnime__9daAlink_cFv.s" +} +#pragma pop + +/* 80136F54-80136FF8 131894 00A4+00 1/1 0/0 0/0 .text procWolfScreamWaitInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procWolfScreamWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfScreamWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80136FF8-801370E4 131938 00EC+00 1/0 0/0 0/0 .text procWolfScreamWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfScreamWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfScreamWait__9daAlink_cFv.s" +} +#pragma pop + +/* 801370E4-8013712C 131A24 0048+00 3/3 0/0 0/0 .text getWolfLieMoveAnmSpeed__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWolfLieMoveAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfLieMoveAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 8013712C-801371A0 131A6C 0074+00 3/3 0/0 0/0 .text getWolfLieMoveSpeed__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWolfLieMoveSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfLieMoveSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 801371A0-801371FC 131AE0 005C+00 0/0 0/0 2/2 .text checkMidnaDisappearMode__9daAlink_cCFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkMidnaDisappearMode() const { + nofralloc +#include "asm/d/a/d_a_alink/checkMidnaDisappearMode__9daAlink_cCFv.s" +} +#pragma pop + +/* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text checkWolfLieContinue__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfLieContinue(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfLieContinue__9daAlink_cFi.s" +} +#pragma pop + +/* 801372B4-80137330 131BF4 007C+00 3/3 0/0 0/0 .text checkNextActionWolfFromLie__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkNextActionWolfFromLie() { + nofralloc +#include "asm/d/a/d_a_alink/checkNextActionWolfFromLie__9daAlink_cFv.s" +} +#pragma pop + +/* 80137330-801373F8 131C70 00C8+00 3/3 0/0 0/0 .text setWolfLieMoveVoice__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfLieMoveVoice(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfLieMoveVoice__9daAlink_cFi.s" +} +#pragma pop + +/* 801373F8-80137420 131D38 0028+00 2/2 0/0 0/0 .text checkWolfLieCode__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfLieCode() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfLieCode__9daAlink_cFv.s" +} +#pragma pop + +/* 80137420-8013753C 131D60 011C+00 2/2 0/0 0/0 .text procWolfLieStartInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieStartInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieStartInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013753C-80137634 131E7C 00F8+00 1/0 0/0 0/0 .text procWolfLieStart__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieStart() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieStart__9daAlink_cFv.s" +} +#pragma pop + +/* 80137634-801377F0 131F74 01BC+00 5/5 0/0 0/0 .text procWolfLieMoveInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieMoveInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieMoveInit__9daAlink_cFi.s" +} +#pragma pop + +/* 801377F0-80137C90 132130 04A0+00 1/0 0/0 0/0 .text procWolfLieMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80137C90-80137D4C 1325D0 00BC+00 1/1 0/0 0/0 .text procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz.s" +} +#pragma pop + +/* 80137D4C-80138000 13268C 02B4+00 1/0 0/0 0/0 .text procWolfLieAutoMove__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLieAutoMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLieAutoMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80138000-80138188 132940 0188+00 2/2 0/0 0/0 .text setSpeedAndAngleSwimWolf__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setSpeedAndAngleSwimWolf() { + nofralloc +#include "asm/d/a/d_a_alink/setSpeedAndAngleSwimWolf__9daAlink_cFv.s" +} +#pragma pop + +/* 80138188-801381F8 132AC8 0070+00 2/2 0/0 0/0 .text getWolfSwimMoveAnmSpeed__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::getWolfSwimMoveAnmSpeed() { + nofralloc +#include "asm/d/a/d_a_alink/getWolfSwimMoveAnmSpeed__9daAlink_cFv.s" +} +#pragma pop + +/* 801381F8-801383D8 132B38 01E0+00 2/2 0/0 0/0 .text decideDoStatusSwimWolf__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::decideDoStatusSwimWolf() { + nofralloc +#include "asm/d/a/d_a_alink/decideDoStatusSwimWolf__9daAlink_cFv.s" +} +#pragma pop + +/* 801383D8-80138484 132D18 00AC+00 2/2 0/0 0/0 .text procWolfSwimUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80138484-8013852C 132DC4 00A8+00 1/0 0/0 0/0 .text procWolfSwimUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimUp() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimUp__9daAlink_cFv.s" +} +#pragma pop + +/* 8013852C-80138644 132E6C 0118+00 7/7 0/0 0/0 .text procWolfSwimWaitInit__9daAlink_cFi + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80138644-8013871C 132F84 00D8+00 1/0 0/0 0/0 .text procWolfSwimWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8013871C-801387A0 13305C 0084+00 4/4 0/0 0/0 .text procWolfSwimMoveInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 801387A0-8013890C 1330E0 016C+00 1/0 0/0 0/0 .text procWolfSwimMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimMove__9daAlink_cFv.s" +} +#pragma pop + +/* 8013890C-80138A18 13324C 010C+00 2/2 0/0 0/0 .text procWolfSwimEndWaitInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimEndWaitInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimEndWaitInit__9daAlink_cFi.s" +} +#pragma pop + +/* 80138A18-80138B6C 133358 0154+00 1/0 0/0 0/0 .text procWolfSwimEndWait__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfSwimEndWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfSwimEndWait__9daAlink_cFv.s" +} +#pragma pop + +/* 80138B6C-80138C04 1334AC 0098+00 1/0 0/0 0/0 .text + * onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2.s" +} +#pragma pop + +/* 80138C04-80138C44 133544 0040+00 4/4 0/0 0/0 .text resetWolfEnemyBiteAll__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::resetWolfEnemyBiteAll() { + nofralloc +#include "asm/d/a/d_a_alink/resetWolfEnemyBiteAll__9daAlink_cFv.s" +} +#pragma pop + +/* 80138C44-80138CB8 133584 0074+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAction__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfEnemyThrowAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfEnemyThrowAction__9daAlink_cFv.s" +} +#pragma pop + +/* 80138CB8-80138DC0 1335F8 0108+00 1/1 0/0 0/0 .text setWolfLockDomeModel__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfLockDomeModel() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfLockDomeModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80138DC0-80138F18 133700 0158+00 1/1 0/0 0/0 .text setWolfBallModel__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfBallModel() { + nofralloc +#include "asm/d/a/d_a_alink/setWolfBallModel__9daAlink_cFv.s" +} +#pragma pop + +/* 80138F18-80139048 133858 0130+00 2/2 0/0 0/0 .text resetWolfBallGrab__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::resetWolfBallGrab() { + nofralloc +#include "asm/d/a/d_a_alink/resetWolfBallGrab__9daAlink_cFv.s" +} +#pragma pop + +/* 80139048-8013911C 133988 00D4+00 1/1 0/0 0/0 .text checkWolfLockData__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfLockData() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfLockData__9daAlink_cFv.s" +} +#pragma pop + +/* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */ +bool daAlink_c::checkWolfLock(fopAc_ac_c* p_actor) const { + u32 id = fopAcM_GetID(p_actor); + + for (int i = 0; i < mWolfLockNum; i++) { + if (id == mWolfLockAcKeep[i].getID()) { + return true; + } + } + return false; +} + +/* 8013916C-801391DC 133AAC 0070+00 1/0 0/0 0/0 .text cancelWolfLock__9daAlink_cFP10fopAc_ac_c */ +bool daAlink_c::cancelWolfLock(fopAc_ac_c* p_actor) { + u32 id = fopAcM_GetID(p_actor); + + for (int i = 0; i < mWolfLockNum; i++) { + if (id == mWolfLockAcKeep[i].getID()) { + mWolfLockAcKeep[i].clearData(); + return true; + } + } + return false; +} + +/* 801391DC-801391E4 133B1C 0008+00 0/0 0/0 1/1 .text getWolfLockActorEnd__9daAlink_cFv + */ +fopAc_ac_c* daAlink_c::getWolfLockActorEnd() { + return mWolfLockAcKeep[0].getActor(); +} + +/* 801391E4-801392A8 133B24 00C4+00 1/1 0/0 0/0 .text + * searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 801392A8-801392E4 133BE8 003C+00 1/1 0/0 0/0 .text + * daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchWolfLockEnemy(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 801392E4-801393A4 133C24 00C0+00 1/1 0/0 0/0 .text checkWolfComboCnt__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfComboCnt() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfComboCnt__9daAlink_cFv.s" +} +#pragma pop + +/* 801393A4-801395B4 133CE4 0210+00 4/4 0/0 0/0 .text checkWolfAttackAction__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfAttackAction() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfAttackAction__9daAlink_cFv.s" +} +#pragma pop + +/* 801395B4-80139600 133EF4 004C+00 2/2 0/0 0/0 .text + * setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM param_0, f32 param_1) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf.s" +} +#pragma pop + +/* 80139600-801396F8 133F40 00F8+00 2/2 0/0 0/0 .text + * setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c.s" +} +#pragma pop + +/* ############################################################################################## */ +/* 804256EC-804256F8 05240C 000C+00 0/1 0/0 0/0 .bss @50952 */ +#pragma push +#pragma force_active on +static u8 lit_50952[12]; +#pragma pop + +/* 804256F8-80425708 052418 000C+04 1/2 0/0 0/0 .bss l_wolfBiteHitMarkScale */ +static u8 l_wolfBiteHitMarkScale[12 + 4 /* padding */]; + +/* 801396F8-801397A4 134038 00AC+00 1/1 0/0 0/0 .text + * setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c.s" +} +#pragma pop + +/* 801397A4-801398A8 1340E4 0104+00 1/1 0/0 0/0 .text checkWolfLockAttackChargeState__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::checkWolfLockAttackChargeState() { + nofralloc +#include "asm/d/a/d_a_alink/checkWolfLockAttackChargeState__9daAlink_cFv.s" +} +#pragma pop + +/* 801398A8-80139908 1341E8 0060+00 1/1 0/0 0/0 .text procWolfRollAttackChargeInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttackChargeInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttackChargeInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80139908-801399C4 134248 00BC+00 1/0 0/0 0/0 .text procWolfRollAttackCharge__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttackCharge() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttackCharge__9daAlink_cFv.s" +} +#pragma pop + +/* 801399C4-80139A70 134304 00AC+00 1/1 0/0 0/0 .text procWolfRollAttackMoveInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttackMoveInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttackMoveInit__9daAlink_cFv.s" +} +#pragma pop + +/* 80139A70-80139DE0 1343B0 0370+00 1/0 0/0 0/0 .text procWolfRollAttackMove__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttackMove() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttackMove__9daAlink_cFv.s" +} +#pragma pop + +/* 80139DE0-8013A4F8 134720 0718+00 5/5 0/0 0/0 .text procWolfJumpAttackInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013A4F8-8013A7EC 134E38 02F4+00 1/0 0/0 0/0 .text procWolfJumpAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 8013A7EC-8013A8A0 13512C 00B4+00 2/2 0/0 0/0 .text procWolfJumpAttackKickInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackKickInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackKickInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013A8A0-8013A8FC 1351E0 005C+00 1/0 0/0 0/0 .text procWolfJumpAttackKick__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackKick() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackKick__9daAlink_cFv.s" +} +#pragma pop + +/* 8013A8FC-8013AAC4 13523C 01C8+00 2/2 0/0 0/0 .text + * procWolfJumpAttackSlideLandInit__9daAlink_cFiii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int param_2) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLandInit__9daAlink_cFiii.s" +} +#pragma pop + +/* 8013AAC4-8013AC44 135404 0180+00 1/0 0/0 0/0 .text procWolfJumpAttackSlideLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackSlideLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackSlideLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8013AC44-8013ACF4 135584 00B0+00 1/1 0/0 0/0 .text + * procWolfJumpAttackNormalLandInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLandInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013ACF4-8013ADF0 135634 00FC+00 1/0 0/0 0/0 .text procWolfJumpAttackNormalLand__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfJumpAttackNormalLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfJumpAttackNormalLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8013ADF0-8013AFC0 135730 01D0+00 2/2 0/0 0/0 .text procWolfWaitAttackInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitAttackInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitAttackInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013AFC0-8013B2A0 135900 02E0+00 1/0 0/0 0/0 .text procWolfWaitAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfWaitAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfWaitAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 8013B2A0-8013B424 135BE0 0184+00 5/5 0/0 0/0 .text procWolfRollAttackInit__9daAlink_cFii */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttackInit(int param_0, int param_1) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttackInit__9daAlink_cFii.s" +} +#pragma pop + +/* 8013B424-8013B528 135D64 0104+00 1/0 0/0 0/0 .text procWolfRollAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfRollAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfRollAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 8013B528-8013B808 135E68 02E0+00 1/1 0/0 0/0 .text procWolfDownAttackInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAttackInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAttackInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013B808-8013B964 136148 015C+00 1/0 0/0 0/0 .text procWolfDownAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 8013B964-8013BA44 1362A4 00E0+00 1/1 0/0 0/0 .text + * procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c.s" +} +#pragma pop + +/* 8013BA44-8013BC94 136384 0250+00 1/0 0/0 0/0 .text procWolfDownAtLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAtLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAtLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8013BC94-8013BD54 1365D4 00C0+00 1/1 0/0 0/0 .text procWolfDownAtMissLandInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAtMissLandInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAtMissLandInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013BD54-8013BE24 136694 00D0+00 1/0 0/0 0/0 .text procWolfDownAtMissLand__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDownAtMissLand() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDownAtMissLand__9daAlink_cFv.s" +} +#pragma pop + +/* 8013BE24-8013C3E4 136764 05C0+00 2/2 0/0 0/0 .text procWolfLockAttackInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLockAttackInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLockAttackInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013C3E4-8013C630 136D24 024C+00 1/0 0/0 0/0 .text procWolfLockAttack__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLockAttack() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLockAttack__9daAlink_cFv.s" +} +#pragma pop + +/* 8013C630-8013C7A4 136F70 0174+00 1/1 0/0 0/0 .text procWolfLockAttackTurnInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLockAttackTurnInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLockAttackTurnInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013C7A4-8013C8C8 1370E4 0124+00 1/0 0/0 0/0 .text procWolfLockAttackTurn__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfLockAttackTurn() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfLockAttackTurn__9daAlink_cFv.s" +} +#pragma pop + +/* 8013C8C8-8013C9EC 137208 0124+00 1/1 0/0 0/0 .text procWolfAttackReverseInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAttackReverseInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAttackReverseInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013C9EC-8013CB48 13732C 015C+00 1/0 0/0 0/0 .text procWolfAttackReverse__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfAttackReverse() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfAttackReverse__9daAlink_cFv.s" +} +#pragma pop + +/* 8013CB48-8013CC5C 137488 0114+00 2/2 0/0 0/0 .text procWolfEnemyThrowInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfEnemyThrowInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfEnemyThrowInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013CC5C-8013CCF4 13759C 0098+00 1/0 0/0 0/0 .text procWolfEnemyThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfEnemyThrow() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfEnemyThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 8013CCF4-8013CDEC 137634 00F8+00 1/1 0/0 0/0 .text procWolfEnemyHangBiteInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfEnemyHangBiteInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfEnemyHangBiteInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013CDEC-8013D0D4 13772C 02E8+00 1/0 0/0 0/0 .text procWolfEnemyHangBite__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfEnemyHangBite() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfEnemyHangBite__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D0D4-8013D3FC 137A14 0328+00 1/1 0/0 0/0 .text procWolfGrabUpInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D3FC-8013D588 137D3C 018C+00 1/0 0/0 0/0 .text procWolfGrabUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabUp() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabUp__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D588-8013D65C 137EC8 00D4+00 2/2 0/0 0/0 .text procWolfGrabPutInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabPutInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabPutInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D65C-8013D818 137F9C 01BC+00 1/0 0/0 0/0 .text procWolfGrabPut__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabPut() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabPut__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D818-8013D86C 138158 0054+00 1/1 0/0 0/0 .text procWolfGrabThrowInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabThrowInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabThrowInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D86C-8013D930 1381AC 00C4+00 1/0 0/0 0/0 .text procWolfGrabThrow__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGrabThrow() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGrabThrow__9daAlink_cFv.s" +} +#pragma pop + +/* 8013D930-8013DA8C 138270 015C+00 1/1 0/0 0/0 .text procWolfPushInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfPushInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfPushInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DA8C-8013DB58 1383CC 00CC+00 1/0 0/0 0/0 .text procWolfPush__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfPush() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfPush__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DB58-8013DB6C 138498 0014+00 1/1 0/0 0/0 .text daAlink_searchEnemyCargo__FP10fopAc_ac_cPv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +static asm void daAlink_searchEnemyCargo(fopAc_ac_c* param_0, void* param_1) { + nofralloc +#include "asm/d/a/d_a_alink/daAlink_searchEnemyCargo__FP10fopAc_ac_cPv.s" +} +#pragma pop + +/* 8013DB6C-8013DC5C 1384AC 00F0+00 3/2 0/0 0/0 .text procWolfCargoCarryInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm int daAlink_c::procWolfCargoCarryInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfCargoCarryInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DC5C-8013DDF8 13859C 019C+00 1/0 0/0 0/0 .text procWolfCargoCarry__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfCargoCarry() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfCargoCarry__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DDF8-8013DE70 138738 0078+00 1/1 0/0 0/0 .text procWolfChainUpInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainUpInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainUpInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DE70-8013DF30 1387B0 00C0+00 1/0 0/0 0/0 .text procWolfChainUp__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainUp() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainUp__9daAlink_cFv.s" +} +#pragma pop + +/* 8013DF30-8013E034 138870 0104+00 1/1 0/0 0/0 .text procWolfGanonCatchInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGanonCatchInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGanonCatchInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013E034-8013E240 138974 020C+00 1/0 0/0 0/0 .text procWolfGanonCatch__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGanonCatch() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGanonCatch__9daAlink_cFv.s" +} +#pragma pop + +/* 8013E240-8013E2A8 138B80 0068+00 1/1 0/0 0/0 .text procWolfChainReadyInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainReadyInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainReadyInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013E2A8-8013E6C0 138BE8 0418+00 1/0 0/0 0/0 .text procWolfChainReady__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainReady() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainReady__9daAlink_cFv.s" +} +#pragma pop + +/* 8013E6C0-8013E80C 139000 014C+00 1/1 0/0 0/0 .text procWolfChainWaitInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainWaitInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainWaitInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013E80C-8013ED44 13914C 0538+00 1/0 0/0 0/0 .text procWolfChainWait__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfChainWait() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfChainWait__9daAlink_cFv.s" +} +#pragma pop + +/* 8013ED44-8013F1F0 139684 04AC+00 1/1 0/0 0/0 .text procWolfDigInit__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDigInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDigInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013F1F0-8013F4A8 139B30 02B8+00 1/0 0/0 0/0 .text procWolfDig__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDig() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDig__9daAlink_cFv.s" +} +#pragma pop + +/* 8013F4A8-8013F7C4 139DE8 031C+00 2/2 0/0 0/0 .text procWolfDigThroughInit__9daAlink_cFi */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDigThroughInit(int param_0) { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDigThroughInit__9daAlink_cFi.s" +} +#pragma pop + +/* 8013F7C4-8013F90C 13A104 0148+00 1/0 0/0 0/0 .text procWolfDigThrough__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfDigThrough() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfDigThrough__9daAlink_cFv.s" +} +#pragma pop + +/* 8013F90C-8013FA14 13A24C 0108+00 1/1 0/0 0/0 .text setSmellSave__9daAlink_cFv */ +void daAlink_c::setSmellSave() { + if (dComIfGs_getCollectSmell() == SMELL_MEDICINE) { + dComIfGs_offEventBit(0x2F04); // OFF: Got Medicine Scent + } + + dMsgObject_setSmellType(field_0x3012); + + if (field_0x3012 == SMELL_MEDICINE) { + dComIfGs_onEventBit(0x2F04); // ON: Got Medicine Scent + } else if (field_0x3012 == SMELL_CHILDREN) { + i_fopAcM_onSwitch(this, 102); + } else if (field_0x3012 == SMELL_YELIA_POUCH) { + i_fopAcM_onSwitch(this, 103); + } else if (field_0x3012 == SMELL_FISH) { + dComIfGs_onEventBit(0x6120); // ON: Got Reekfish scent + } else if (field_0x3012 == SMELL_POH) { + dComIfGs_onEventBit(0x6210); // ON: Got Poe scent + } + + setGetSubBgm(field_0x3012); +} + +/* 8013FA14-8013FC24 13A354 0210+00 1/1 0/0 0/0 .text procWolfGetSmellInit__9daAlink_cFv + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGetSmellInit() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGetSmellInit__9daAlink_cFv.s" +} +#pragma pop + +/* 8013FC24-8013FF28 13A564 0304+00 1/0 0/0 0/0 .text procWolfGetSmell__9daAlink_cFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void daAlink_c::procWolfGetSmell() { + nofralloc +#include "asm/d/a/d_a_alink/procWolfGetSmell__9daAlink_cFv.s" +} +#pragma pop \ No newline at end of file diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp index 736bfbf2fbd..180e9413444 100644 --- a/src/d/a/d_a_obj_item.cpp +++ b/src/d/a/d_a_obj_item.cpp @@ -721,7 +721,7 @@ int daItem_c::_daItem_execute() { if (mCollider.ChkTgHit()) { cCcD_Obj* hitObj = mCollider.GetTgHitObj(); - if (hitObj != NULL && hitObj->ChkAtType(0x4000)) { + if (hitObj != NULL && hitObj->ChkAtType(AT_TYPE_HOOKSHOT)) { field_0x978.startCollisionSE(Z2SE_HIT_HOOKSHOT_STICK, 0, NULL); } } diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 58aed46deae..d4de8b490f4 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -137,22 +137,22 @@ void cBgS_ChkElm::Init() { m_bgw_base_ptr = NULL; m_used = false; m_actor_ptr = NULL; - field_0x8 = 0xFFFFFFFF; + m_actor_id = 0xFFFFFFFF; } /* 80074110-80074128 06EA50 0018+00 1/0 0/0 0/0 .text Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv */ -void cBgS_ChkElm::Regist2(dBgW_Base* base_ptr, unsigned int param_1, void* param_2) { +void cBgS_ChkElm::Regist2(dBgW_Base* p_data, unsigned int actor_id, void* p_actor) { m_used = true; - m_bgw_base_ptr = base_ptr; - field_0x8 = param_1; - m_actor_ptr = (fopAc_ac_c*)param_2; + m_bgw_base_ptr = p_data; + m_actor_id = actor_id; + m_actor_ptr = (fopAc_ac_c*)p_actor; } /* 80074128-80074144 06EA68 001C+00 2/2 0/0 0/0 .text Release__11cBgS_ChkElmFv */ void cBgS_ChkElm::Release() { m_used = false; m_bgw_base_ptr = NULL; - field_0x8 = 0xFFFFFFFF; + m_actor_id = 0xFFFFFFFF; m_actor_ptr = NULL; } @@ -161,8 +161,7 @@ void cBgS_ChkElm::Release() { static int l_SetCounter; /* 80074144-80074250 06EA84 010C+00 1/1 0/0 0/0 .text Regist__4cBgSFP9dBgW_BaseUiPv */ -#ifdef NONMATCHING -bool cBgS::Regist(dBgW_Base* p_data, unsigned int param_1, void* param_2) { +bool cBgS::Regist(dBgW_Base* p_data, unsigned int actor_id, void* p_actor) { if (p_data == NULL) { return true; } else if (p_data->ChkUsed()) { @@ -170,42 +169,45 @@ bool cBgS::Regist(dBgW_Base* p_data, unsigned int param_1, void* param_2) { } else if (p_data->ChkMemoryError()) { return true; } else { - for (int i = 0; i < 0x100; i++) { - if (!m_chk_element[i].m_bgw_base_ptr->ChkUsed()) { - m_chk_element[i].Regist2(p_data, param_1, param_2); + int i = l_SetCounter; + do { + if (!m_chk_element[i].m_used) { + m_chk_element[i].Regist2(p_data, actor_id, p_actor); p_data->Regist(i); l_SetCounter = i + 1; - if (l_SetCounter > 0x100) { + if (l_SetCounter >= 0x100) { l_SetCounter = 0; } return false; } - } + + i++; + if (i >= 0x100) { + i = 0; + } + } while (l_SetCounter != i); p_data->Release(); } return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool cBgS::Regist(dBgW_Base* param_0, unsigned int param_1, void* param_2) { - nofralloc -#include "asm/d/bg/d_bg_s/Regist__4cBgSFP9dBgW_BaseUiPv.s" -} -#pragma pop -#endif /* 80074250-800742E4 06EB90 0094+00 0/0 2/2 187/187 .text Release__4cBgSFP9dBgW_Base */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::Release(dBgW_Base* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/Release__4cBgSFP9dBgW_Base.s" +int cBgS::Release(dBgW_Base* p_data) { + if (p_data == NULL) { + return 1; + } + + int id = p_data->GetId(); + if (p_data->ChkUsed() && id >= 0 && id < 0x100 && m_chk_element[id].ChkUsed()) { + m_chk_element[id].Release(); + p_data->Release(); + } else { + return 1; + } + + return 0; } -#pragma pop /* 800742E4-80074338 06EC24 0054+00 2/1 0/0 0/0 .text Ct__4cBgSFv */ void cBgS::Ct() { @@ -229,52 +231,99 @@ void cBgS::Dt() { } /* 800743B4-800744A0 06ECF4 00EC+00 0/0 16/16 305/305 .text LineCross__4cBgSFP11cBgS_LinChk */ -#ifdef NONMATCHING -bool cBgS::LineCross(cBgS_LinChk* param_0) { - param_0->ClearPi(); - param_0->ClrHit(); - param_0->PreCalc(); +bool cBgS::LineCross(cBgS_LinChk* p_line) { + p_line->ClearPi(); + p_line->ClrHit(); + p_line->PreCalc(); + cBgS_ChkElm* elm = m_chk_element; for (int i = 0; i < 0x100; i++) { - if (m_chk_element[i].ChkUsed() && !m_chk_element[i].m_bgw_base_ptr->ChkLock() && - !param_0->ChkSameActorPid(m_chk_element[i].field_0x8) && - m_chk_element[i].m_bgw_base_ptr->LineCheck(param_0)) { - param_0->SetActorInfo(i, &m_chk_element[0], m_chk_element[i].field_0x8); - param_0->SetHit(); + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady() && + !p_line->ChkSameActorPid(elm->m_actor_id) && elm->m_bgw_base_ptr->LineCheck(p_line)) { + p_line->SetActorInfo(i, elm->m_bgw_base_ptr, elm->m_actor_id); + p_line->SetHit(); } + elm++; } - return param_0->ChkHit() ? true : false; -} -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool cBgS::LineCross(cBgS_LinChk* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/LineCross__4cBgSFP11cBgS_LinChk.s" -} -#pragma pop -#endif -/* ############################################################################################## */ -/* 804526B8-804526C0 000CB8 0004+04 1/1 0/0 0/0 .sdata2 @3738 */ -SECTION_SDATA2 static f32 lit_3738[1 + 1 /* padding */] = { - -1000000000.0f, - /* padding */ - 0.0f, -}; + return p_line->ChkHit() ? true : false; +} /* 800744A0-80074578 06EDE0 00D8+00 0/0 51/51 231/231 .text GroundCross__4cBgSFP11cBgS_GndChk */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 cBgS::GroundCross(cBgS_GndChk* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/GroundCross__4cBgSFP11cBgS_GndChk.s" +f32 cBgS::GroundCross(cBgS_GndChk* p_gnd) { + p_gnd->SetNowY(-1000000000.0f); + p_gnd->ClearPi(); + p_gnd->PreCheck(); + + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady() && + !p_gnd->ChkSameActorPid(elm->m_actor_id) && elm->m_bgw_base_ptr->GroundCross(p_gnd)) { + p_gnd->SetActorInfo(i, elm->m_bgw_base_ptr, elm->m_actor_id); + } + elm++; + } + + return p_gnd->GetNowY(); } -#pragma pop + +struct cBgS_dzb_data { + // Vertex Info + /* 0x00 */ int m_v_num; + /* 0x04 */ u32 m_v_tbl; + + // Triangle Info + /* 0x08 */ int m_t_num; + /* 0x0C */ u32 m_t_tbl; + + // Spatial List Info + /* 0x10 */ int m_b_num; + /* 0x14 */ u32 m_b_tbl; + + // Face Group Data Info + /* 0x18 */ int m_tree_num; + /* 0x1C */ u32 m_tree_tbl; + + // String Group Info + /* 0x20 */ int m_g_num; + /* 0x24 */ u32 m_g_tbl; + + // Surface Property Info + /* 0x28 */ int m_ti_num; + /* 0x2C */ u32 m_ti_tbl; + + /* 0x30 */ u32 field_0x30; +}; // Size: 0x34 + +struct cBgS_dzb_strgroup { + u32 strOffset; + u8 data[0x30]; +}; /* 80074578-80074618 06EEB8 00A0+00 0/0 1/1 0/0 .text ConvDzb__4cBgSFPv */ +#ifdef NONMATCHING +void cBgS::ConvDzb(void* p_dzb) { + cBgS_dzb_data* pbgd = (cBgS_dzb_data*)p_dzb; + + if (!(pbgd->field_0x30 & 0x80000000)) { + pbgd->field_0x30 |= 0x80000000; + + if (pbgd->m_v_tbl != 0) { + pbgd->m_v_tbl += (u32)p_dzb; + } + + pbgd->m_t_tbl += (u32)p_dzb; + pbgd->m_b_tbl += (u32)p_dzb; + pbgd->m_tree_tbl += (u32)p_dzb; + pbgd->m_g_tbl += (u32)p_dzb; + pbgd->m_ti_tbl += (u32)p_dzb; + + for (int i = 0; i < pbgd->m_g_num; i++) { + ((cBgS_dzb_strgroup*)pbgd->m_g_tbl)[i].strOffset += (u32)p_dzb; + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -283,6 +332,7 @@ asm void cBgS::ConvDzb(void* param_0) { #include "asm/d/bg/d_bg_s/ConvDzb__4cBgSFPv.s" } #pragma pop +#endif /* 80074618-80074628 06EF58 0010+00 0/0 9/9 13/13 .text GetActorPointer__4cBgSCFi */ fopAc_ac_c* cBgS::GetActorPointer(int actor_index) const { @@ -312,7 +362,7 @@ bool cBgS::ChkPolySafe(cBgS_PolyInfo const& poly) { } else { if (m_chk_element[bg_index].ChkUsed()) { return poly.ChkSafe(m_chk_element[bg_index].m_bgw_base_ptr, - m_chk_element[bg_index].field_0x8); + m_chk_element[bg_index].m_actor_id); } else { return false; } @@ -331,31 +381,15 @@ s32 cBgS::GetGrpRoomId(cBgS_PolyInfo const& poly) const { /* 80074744-800747F0 06F084 00AC+00 4/4 62/62 142/142 .text * GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla */ -// something weird with virtual call -#ifdef NONMATCHING -bool cBgS::GetTriPla(cBgS_PolyInfo const& poly, cM3dGPla* param_1) const { +bool cBgS::GetTriPla(cBgS_PolyInfo const& poly, cM3dGPla* p_pla) const { int bg_index = poly.GetBgIndex(); if (bg_index < 0 || bg_index >= 0x100 || !m_chk_element[bg_index].ChkUsed()) { return false; } - cM3dGPla pla; - m_chk_element[bg_index].m_bgw_base_ptr->GetTriPla(poly); - param_1->mNormal.x = pla.mNormal.x; - param_1->mNormal.y = pla.mNormal.y; - param_1->mNormal.z = pla.mNormal.z; - param_1->mD = pla.mD; + + *p_pla = m_chk_element[bg_index].m_bgw_base_ptr->GetTriPla(poly); return true; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool cBgS::GetTriPla(cBgS_PolyInfo const& param_0, cM3dGPla* param_1) const { - nofralloc -#include "asm/d/bg/d_bg_s/GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla.s" -} -#pragma pop -#endif /* 800747F0-80074840 06F130 0050+00 0/0 1/1 0/0 .text * GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz */ @@ -364,18 +398,20 @@ bool cBgS::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* param_1, cXyz* param_2, cX if (!m_chk_element[id].ChkUsed()) { return false; } + return m_chk_element[id].m_bgw_base_ptr->GetTriPnt(poly, param_1, param_2, param_3); } /* 80074840-800748AC 06F180 006C+00 0/0 1/1 0/0 .text ShdwDraw__4cBgSFP13cBgS_ShdwDraw */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cBgS::ShdwDraw(cBgS_ShdwDraw* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/ShdwDraw__4cBgSFP13cBgS_ShdwDraw.s" +void cBgS::ShdwDraw(cBgS_ShdwDraw* p_shdw) { + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed()) { + elm->m_bgw_base_ptr->ShdwDraw(p_shdw); + } + elm++; + } } -#pragma pop /* 800748AC-800748FC 06F1EC 0050+00 1/1 0/0 0/0 .text GetGrpInf__4cBgSCFRC13cBgS_PolyInfo */ @@ -384,6 +420,7 @@ u32 cBgS::GetGrpInf(cBgS_PolyInfo const& poly) const { if (!m_chk_element[id].ChkUsed()) { return -1; } + return m_chk_element[id].m_bgw_base_ptr->GetGrpInf(poly); } @@ -407,25 +444,30 @@ void dBgS::ClrMoveFlag() { } /* 800749A8-80074A08 06F2E8 0060+00 0/0 1/1 0/0 .text Move__4dBgSFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::Move() { - nofralloc -#include "asm/d/bg/d_bg_s/Move__4dBgSFv.s" +void dBgS::Move() { + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed()) { + elm->m_bgw_base_ptr->CalcDiffShapeAngleY(elm->m_actor_ptr->mCollisionRot.y); + } + elm++; + } } -#pragma pop /* 80074A08-80074AB4 06F348 00AC+00 0/0 2/2 127/127 .text Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dBgS::Regist(dBgW_Base* param_0, fopAc_ac_c* param_1) { - nofralloc -#include "asm/d/bg/d_bg_s/Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c.s" +bool dBgS::Regist(dBgW_Base* pbgw, fopAc_ac_c* p_actor) { + if (pbgw == NULL) { + return true; + } + + if (p_actor != NULL && pbgw->ChkMoveBg()) { + pbgw->SetOldShapeAngleY(p_actor->mCollisionRot.y); + pbgw->SetRoomId(fopAcM_GetRoomNo(p_actor)); + } + + return cBgS::Regist(pbgw, fopAcM_GetID(p_actor), p_actor); } -#pragma pop /* 80074AB4-80074ABC -00001 0008+00 0/0 0/0 0/0 .text SetOldShapeAngleY__9dBgW_BaseFs */ void dBgW_Base::SetOldShapeAngleY(s16 shape_angle) { @@ -439,10 +481,12 @@ bool dBgS::ChkMoveBG(cBgS_PolyInfo const& poly) { if (base->ChkLock()) { return false; } + if (base->ChkMoveBg()) { return true; } } + return false; } @@ -452,6 +496,7 @@ bool dBgS::ChkMoveBG_NoDABg(cBgS_PolyInfo const& poly) { if (base != NULL && base->ChkMoveBg()) { return true; } + return false; } @@ -491,13 +536,13 @@ BOOL dBgS::GetHorseNoEntry(cBgS_PolyInfo const& poly) { } /* 80074CBC-80074D0C 06F5FC 0050+00 0/0 4/4 9/9 .text GetSpecialCode__4dBgSFRC13cBgS_PolyInfo */ -bool dBgS::GetSpecialCode(cBgS_PolyInfo const& poly) { +int dBgS::GetSpecialCode(cBgS_PolyInfo const& poly) { int bg_index = poly.GetBgIndex(); if (m_chk_element[bg_index].ChkUsed()) { return m_chk_element[bg_index].m_bgw_base_ptr->GetSpecialCode(poly); } - return false; + return 0; } /* 80074D0C-80074D5C 06F64C 0050+00 0/0 2/2 2/2 .text GetMagnetCode__4dBgSFRC13cBgS_PolyInfo */ @@ -512,24 +557,24 @@ int dBgS::GetMagnetCode(cBgS_PolyInfo const& poly) { /* 80074D5C-80074DAC 06F69C 0050+00 0/0 5/5 0/0 .text GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo */ -bool dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) { +int dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) { int bg_index = poly.GetBgIndex(); if (m_chk_element[bg_index].ChkUsed()) { return m_chk_element[bg_index].m_bgw_base_ptr->GetMonkeyBarsCode(poly); } - return false; + return 0; } /* 80074DAC-80074E00 06F6EC 0054+00 0/0 0/0 1/1 .text * GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo */ -bool dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& poly) { +int dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& poly) { int bg_index = poly.GetBgIndex(); if (m_chk_element[bg_index].ChkUsed()) { return m_chk_element[bg_index].m_bgw_base_ptr->GetUnderwaterRoofCode(poly.GetPolyIndex()); } - return false; + return 0; } /* 80074E00-80074E50 06F740 0050+00 0/0 13/13 5/5 .text GetWallCode__4dBgSFRC13cBgS_PolyInfo */ @@ -539,7 +584,7 @@ s32 dBgS::GetWallCode(cBgS_PolyInfo const& poly) { return m_chk_element[bg_index].m_bgw_base_ptr->GetWallCode(poly); } - return false; + return 0; } /* 80074E50-80074EA0 06F790 0050+00 0/0 29/29 28/28 .text GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo */ @@ -563,13 +608,13 @@ int dBgS::GetPolyAtt1(cBgS_PolyInfo const& poly) { } /* 80074EF0-80074F40 06F830 0050+00 0/0 7/7 8/8 .text GetGroundCode__4dBgSFRC13cBgS_PolyInfo */ -bool dBgS::GetGroundCode(cBgS_PolyInfo const& poly) { +int dBgS::GetGroundCode(cBgS_PolyInfo const& poly) { int bg_index = poly.GetBgIndex(); if (m_chk_element[bg_index].ChkUsed()) { return m_chk_element[bg_index].m_bgw_base_ptr->GetGroundCode(poly); } - return false; + return 0; } /* 80074F40-80074F90 06F880 0050+00 0/0 1/1 0/0 .text GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo */ @@ -677,60 +722,132 @@ u32 dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) { return m_chk_element[bg_index].m_bgw_base_ptr->GetPolyHSStick(poly.GetPolyIndex()); } - return false; + return 0; } /* 8007524C-80075374 06FB8C 0128+00 0/0 1/1 0/0 .text WallCorrect__4dBgSFP9dBgS_Acch */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::WallCorrect(dBgS_Acch* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/WallCorrect__4dBgSFP9dBgS_Acch.s" +void dBgS::WallCorrect(dBgS_Acch* p_acch) { + p_acch->CalcWallRR(); + p_acch->CalcMovePosWork(); + + for (int i = 0; i < 3; i++) { + cBgS_ChkElm* elm = m_chk_element; + + for (int j = 0; j < 0x100; j++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady()) { + dBgW_Base* pbgw = elm->m_bgw_base_ptr; + + if (pbgw->ChkPriority(i) && !p_acch->ChkSameActorPid(elm->m_actor_id)) { + if (!p_acch->ChkMoveBGOnly() || (pbgw->ChkMoveBg() && !pbgw->ChkLock())) { + p_acch->SetNowActorInfo(j, elm->m_bgw_base_ptr, elm->m_actor_id); + pbgw->WallCorrect(p_acch); + } + } + } + elm++; + } + } } -#pragma pop /* 80075374-8007549C 06FCB4 0128+00 0/0 1/1 0/0 .text WallCorrectSort__4dBgSFP9dBgS_Acch */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::WallCorrectSort(dBgS_Acch* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/WallCorrectSort__4dBgSFP9dBgS_Acch.s" +void dBgS::WallCorrectSort(dBgS_Acch* p_acch) { + p_acch->CalcWallRR(); + p_acch->CalcMovePosWork(); + + for (int i = 0; i < 3; i++) { + cBgS_ChkElm* elm = m_chk_element; + + for (int j = 0; j < 0x100; j++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady()) { + dBgW_Base* pbgw = elm->m_bgw_base_ptr; + + if (pbgw->ChkPriority(i) && !p_acch->ChkSameActorPid(elm->m_actor_id)) { + if (!p_acch->ChkMoveBGOnly() || (pbgw->ChkMoveBg() && !pbgw->ChkLock())) { + p_acch->SetNowActorInfo(j, elm->m_bgw_base_ptr, elm->m_actor_id); + pbgw->WallCorrectSort(p_acch); + } + } + } + elm++; + } + } } -#pragma pop /* 8007549C-80075564 06FDDC 00C8+00 0/0 17/17 1/1 .text RoofChk__4dBgSFP12dBgS_RoofChk */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 dBgS::RoofChk(dBgS_RoofChk* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/RoofChk__4dBgSFP12dBgS_RoofChk.s" +f32 dBgS::RoofChk(dBgS_RoofChk* p_roof) { + p_roof->Init(); + + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady()) { + if (!p_roof->ChkSameActorPid(elm->m_actor_id)) { + dBgW_Base* pbgw = elm->m_bgw_base_ptr; + + if (pbgw->RoofChk(p_roof)) { + p_roof->SetActorInfo(i, elm->m_bgw_base_ptr, elm->m_actor_id); + } + } + } + elm++; + } + + return p_roof->GetNowY(); } -#pragma pop /* 80075564-80075688 06FEA4 0124+00 0/0 2/2 3/3 .text SplGrpChk__4dBgSFP14dBgS_SplGrpChk */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dBgS::SplGrpChk(dBgS_SplGrpChk* param_0) { - nofralloc -#include "asm/d/bg/d_bg_s/SplGrpChk__4dBgSFP14dBgS_SplGrpChk.s" +bool dBgS::SplGrpChk(dBgS_SplGrpChk* p_grp) { + bool ret = false; + p_grp->Init(); + + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady()) { + if (!p_grp->ChkSameActorPid(elm->m_actor_id)) { + dBgW_Base* pbgw = elm->m_bgw_base_ptr; + + if (!p_grp->ChkMoveBGOnly() || (pbgw->ChkMoveBg() && !pbgw->ChkLock())) { + if (pbgw->SplGrpChk(p_grp)) { + ret = true; + p_grp->SetActorInfo(i, elm->m_bgw_base_ptr, elm->m_actor_id); + p_grp->OnFind(); + } + } + } + } + elm++; + } + + return ret; } -#pragma pop /* 80075688-80075774 06FFC8 00EC+00 0/0 1/1 1/1 .text SphChk__4dBgSFP11dBgS_SphChkPv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dBgS::SphChk(dBgS_SphChk* param_0, void* param_1) { - nofralloc -#include "asm/d/bg/d_bg_s/SphChk__4dBgSFP11dBgS_SphChkPv.s" +bool dBgS::SphChk(dBgS_SphChk* p_sph, void* param_1) { + if (p_sph->mCallback == NULL) { + return false; + } + + bool ret = false; + p_sph->ClearPi(); + + cBgS_ChkElm* elm = m_chk_element; + for (int i = 0; i < 0x100; i++) { + if (elm->ChkUsed() && !elm->m_bgw_base_ptr->ChkNotReady()) { + if (!p_sph->ChkSameActorPid(elm->m_actor_id)) { + dBgW_Base* pbgw = elm->m_bgw_base_ptr; + + if (pbgw->SphChk(p_sph, param_1)) { + p_sph->SetActorInfo(i, elm->m_bgw_base_ptr, elm->m_actor_id); + ret = true; + } + } + } + elm++; + } + + return ret; } -#pragma pop /* 80075774-80075880 0700B4 010C+00 0/0 3/3 0/0 .text * MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb */ @@ -839,8 +956,8 @@ void dBgS_MoveBGProc_Trans(dBgW* param_0, void* param_1, cBgS_PolyInfo const& pa /* 80075B84-80075BF4 0704C4 0070+00 0/0 1/1 2/2 .text * RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c */ -void dBgS::RideCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1) { - u16 bg_index = param_0.GetBgIndex(); +void dBgS::RideCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1) { + u16 bg_index = poly.GetBgIndex(); dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; if (base->ChkUsed()) { base->CallRideCallBack(m_chk_element[bg_index].m_actor_ptr, param_1); @@ -849,8 +966,8 @@ void dBgS::RideCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1) { /* 80075BF4-80075C6C 070534 0078+00 0/0 0/0 2/2 .text * ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz */ -void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_1, cXyz& param_2) { - u16 bg_index = param_0.GetBgIndex(); +void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1, cXyz& param_2) { + u16 bg_index = poly.GetBgIndex(); dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr; if (base->ChkUsed()) { base->CallArrowStickCallBack(m_chk_element[bg_index].m_actor_ptr, param_1, param_2); @@ -891,10 +1008,10 @@ asm bool dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* param_ #endif /* 80075D0C-80075D7C 07064C 0070+00 0/0 8/8 1/1 .text dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo */ -bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& param_0) { +bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& poly) { cM3dGPla pla; - if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + if (!dComIfG_Bgsp().GetTriPla(poly, &pla)) { return false; } @@ -902,10 +1019,10 @@ bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& param_0) { } /* 80075D7C-80075DEC 0706BC 0070+00 0/0 3/3 1/1 .text dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo */ -bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& param_0) { +bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& poly) { cM3dGPla pla; - if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + if (!dComIfG_Bgsp().GetTriPla(poly, &pla)) { return false; } @@ -913,10 +1030,10 @@ bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& param_0) { } /* 80075DEC-80075E5C 07072C 0070+00 0/0 0/0 1/1 .text dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo */ -bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& param_0) { +bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& poly) { cM3dGPla pla; - if (!dComIfG_Bgsp().GetTriPla(param_0, &pla)) { + if (!dComIfG_Bgsp().GetTriPla(poly, &pla)) { return false; } @@ -924,10 +1041,10 @@ bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& param_0) { } /* 80075E5C-80075EAC 07079C 0050+00 0/0 1/1 0/0 .text dBgS_GetNY__FRC13cBgS_PolyInfo */ -f32 dBgS_GetNY(cBgS_PolyInfo const& param_0) { +f32 dBgS_GetNY(cBgS_PolyInfo const& poly) { cM3dGPla pla; - dComIfG_Bgsp().GetTriPla(param_0, &pla); + dComIfG_Bgsp().GetTriPla(poly, &pla); return pla.mNormal.y; } diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 5dbf684e316..8ebaceb52e2 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -767,7 +767,7 @@ asm void cBgW::GroundCrossGrpRp(cBgS_GndChk* param_0, int param_1, int param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::GroundCross(cBgS_GndChk* param_0) { +asm bool cBgW::GroundCross(cBgS_GndChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w/GroundCross__4cBgWFP11cBgS_GndChk.s" } @@ -913,7 +913,7 @@ asm void cBgW::GetTopUnder(f32* param_0, f32* param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::GetTriPla(cBgS_PolyInfo const& param_0) const { +asm cM3dGPla cBgW::GetTriPla(cBgS_PolyInfo const& param_0) const { nofralloc #include "asm/d/bg/d_bg_w/GetTriPla__4cBgWCFRC13cBgS_PolyInfo.s" } @@ -995,7 +995,7 @@ asm BOOL dBgW::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dBgW::GetSpecialCode(cBgS_PolyInfo const& param_0) { +asm int dBgW::GetSpecialCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetSpecialCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1005,7 +1005,7 @@ asm bool dBgW::GetSpecialCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::GetSpecialCode(int param_0) { +asm int dBgW::GetSpecialCode(int param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetSpecialCode__4dBgWFi.s" } @@ -1026,7 +1026,7 @@ asm int dBgW::GetMagnetCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dBgW::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { +asm int dBgW::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetMonkeyBarsCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1126,7 +1126,7 @@ asm void dBgW::GetShdwThrough(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dBgW::GetUnderwaterRoofCode(int param_0) { +asm int dBgW::GetUnderwaterRoofCode(int param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetUnderwaterRoofCode__4dBgWFi.s" } @@ -1187,7 +1187,7 @@ asm int dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dBgW::GetGroundCode(cBgS_PolyInfo const& param_0) { +asm int dBgW::GetGroundCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetGroundCode__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1288,7 +1288,7 @@ asm void cBgW::GetTriGrp(int param_0) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void cBgW::ChkNotReady() const { +asm bool cBgW::ChkNotReady() const { nofralloc #include "asm/d/bg/d_bg_w/ChkNotReady__4cBgWCFv.s" } @@ -1483,7 +1483,7 @@ asm void dBgW::RoofChkGrpRp(dBgS_RoofChk* param_0, int param_1, int param_2) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::RoofChk(dBgS_RoofChk* param_0) { +asm bool dBgW::RoofChk(dBgS_RoofChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w/RoofChk__4dBgWFP12dBgS_RoofChk.s" } @@ -1524,7 +1524,7 @@ asm void dBgW::SplGrpChkGrpRp(dBgS_SplGrpChk* param_0, int param_1, int param_2) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::SplGrpChk(dBgS_SplGrpChk* param_0) { +asm bool dBgW::SplGrpChk(dBgS_SplGrpChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w/SplGrpChk__4dBgWFP14dBgS_SplGrpChk.s" } @@ -1607,7 +1607,7 @@ asm void dBgW::SphChkGrpRp(dBgS_SphChk* param_0, void* param_1, int param_2, int #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgW::SphChk(dBgS_SphChk* param_0, void* param_1) { +asm bool dBgW::SphChk(dBgS_SphChk* param_0, void* param_1) { nofralloc #include "asm/d/bg/d_bg_w/SphChk__4dBgWFP11dBgS_SphChkPv.s" } diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 86f8b94d12b..2075e56fbe1 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -261,7 +261,7 @@ asm void dBgWKCol::getTriNrm(KC_PrismData* param_0, Vec** param_1) const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::ChkNotReady() const { +asm bool dBgWKCol::ChkNotReady() const { nofralloc #include "asm/d/bg/d_bg_w_kcol/ChkNotReady__8dBgWKColCFv.s" } @@ -286,7 +286,7 @@ bool dBgWKCol::ChkMoveFlag() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetTriPla(cBgS_PolyInfo const& param_0) const { +asm cM3dGPla dBgWKCol::GetTriPla(cBgS_PolyInfo const& param_0) const { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetTriPla__8dBgWKColCFRC13cBgS_PolyInfo.s" } @@ -410,7 +410,7 @@ SECTION_SDATA2 static f32 lit_4191 = -0.007499999832361937f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::LineCheck(cBgS_LinChk* param_0) { +asm bool dBgWKCol::LineCheck(cBgS_LinChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/LineCheck__8dBgWKColFP11cBgS_LinChk.s" } @@ -424,7 +424,7 @@ SECTION_SDATA2 static f32 lit_4293 = 0.014000000432133675f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GroundCross(cBgS_GndChk* param_0) { +asm bool dBgWKCol::GroundCross(cBgS_GndChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GroundCross__8dBgWKColFP11cBgS_GndChk.s" } @@ -512,7 +512,7 @@ asm void dBgWKCol::WallCorrect(dBgS_Acch* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::RoofChk(dBgS_RoofChk* param_0) { +asm bool dBgWKCol::RoofChk(dBgS_RoofChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/RoofChk__8dBgWKColFP12dBgS_RoofChk.s" } @@ -522,7 +522,7 @@ asm void dBgWKCol::RoofChk(dBgS_RoofChk* param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) { +asm bool dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/SplGrpChk__8dBgWKColFP14dBgS_SplGrpChk.s" } @@ -537,7 +537,7 @@ static u8 vtx_tbl_5950[36]; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) { +asm bool dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) { nofralloc #include "asm/d/bg/d_bg_w_kcol/SphChk__8dBgWKColFP11dBgS_SphChkPv.s" } @@ -604,7 +604,7 @@ asm void dBgWKCol::GetHorseNoEntry(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetSpecialCode(cBgS_PolyInfo const& param_0) { +asm int dBgWKCol::GetSpecialCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetSpecialCode__8dBgWKColFRC13cBgS_PolyInfo.s" } @@ -614,7 +614,7 @@ asm void dBgWKCol::GetSpecialCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetSpecialCode(int param_0) { +asm int dBgWKCol::GetSpecialCode(int param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetSpecialCode__8dBgWKColFi.s" } @@ -636,7 +636,7 @@ asm int dBgWKCol::GetMagnetCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { +asm int dBgWKCol::GetMonkeyBarsCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetMonkeyBarsCode__8dBgWKColFRC13cBgS_PolyInfo.s" } @@ -727,7 +727,7 @@ asm void dBgWKCol::GetPolyBombThrough(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetUnderwaterRoofCode(int param_0) { +asm int dBgWKCol::GetUnderwaterRoofCode(int param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetUnderwaterRoofCode__8dBgWKColFi.s" } @@ -788,7 +788,7 @@ asm int dBgWKCol::GetPolyAtt1(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetGroundCode(cBgS_PolyInfo const& param_0) { +asm int dBgWKCol::GetGroundCode(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetGroundCode__8dBgWKColFRC13cBgS_PolyInfo.s" } diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/bg/d_bg_w_sv.cpp index 60cb5d055b6..b39c5048a7e 100644 --- a/src/d/bg/d_bg_w_sv.cpp +++ b/src/d/bg/d_bg_w_sv.cpp @@ -50,10 +50,10 @@ struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); /* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 8007B404 */ void GetHorseNoEntry(cBgS_PolyInfo const&); - /* 8007B430 */ void GetSpecialCode(cBgS_PolyInfo const&); - /* 8007B460 */ void GetSpecialCode(int); + /* 8007B430 */ int GetSpecialCode(cBgS_PolyInfo const&); + /* 8007B460 */ int GetSpecialCode(int); /* 8007B488 */ void GetMagnetCode(cBgS_PolyInfo const&); - /* 8007B4B4 */ void GetMonkeyBarsCode(cBgS_PolyInfo const&); + /* 8007B4B4 */ int GetMonkeyBarsCode(cBgS_PolyInfo const&); /* 8007B4E0 */ void GetPolyObjThrough(int); /* 8007B504 */ void GetPolyCamThrough(int); /* 8007B52C */ void GetPolyLinkThrough(int); @@ -63,12 +63,12 @@ struct dBgW { /* 8007B5BC */ void GetPolyRopeThrough(int); /* 8007B5E0 */ void GetPolyBombThrough(int); /* 8007B604 */ void GetShdwThrough(int); - /* 8007B630 */ void GetUnderwaterRoofCode(int); + /* 8007B630 */ int GetUnderwaterRoofCode(int); /* 8007B6AC */ void GetLinkNo(cBgS_PolyInfo const&); /* 8007B6D8 */ void GetWallCode(cBgS_PolyInfo const&); /* 8007B704 */ void GetPolyAtt0(cBgS_PolyInfo const&); /* 8007B734 */ void GetPolyAtt1(cBgS_PolyInfo const&); - /* 8007B760 */ void GetGroundCode(cBgS_PolyInfo const&); + /* 8007B760 */ int GetGroundCode(cBgS_PolyInfo const&); /* 8007B7DC */ void GetIronBallThrough(int); /* 8007B800 */ void GetAttackThrough(int); /* 8007B87C */ void GetCamMoveBG(cBgS_PolyInfo const&); @@ -78,7 +78,7 @@ struct dBgW { /* 8007C484 */ void WallCorrect(dBgS_Acch*); /* 8007C910 */ void WallCorrectSort(dBgS_Acch*); /* 8007D470 */ void RoofChk(dBgS_RoofChk*); - /* 8007D830 */ void SplGrpChk(dBgS_SplGrpChk*); + /* 8007D830 */ bool SplGrpChk(dBgS_SplGrpChk*); /* 8007DAF8 */ void CaptPoly(dBgS_CaptPoly&); /* 8007DF00 */ void SphChk(dBgS_SphChk*, void*); /* 8007DF28 */ void GetPolyGrpRoomInfId(cBgS_PolyInfo const&); @@ -104,8 +104,8 @@ struct cBgW { /* 800797BC */ void ClassifyPlane(); /* 80079EEC */ void ChkMemoryError(); /* 80079F38 */ void Set(cBgD_t*, u32, f32 (*)[3][4]); - /* 8007A658 */ void LineCheck(cBgS_LinChk*); - /* 8007AB9C */ void GroundCross(cBgS_GndChk*); + /* 8007A658 */ bool LineCheck(cBgS_LinChk*); + /* 8007AB9C */ bool GroundCross(cBgS_GndChk*); /* 8007B084 */ void ShdwDraw(cBgS_ShdwDraw*); /* 8007B0E4 */ void GetGrpRoomIndex(cBgS_PolyInfo const&) const; /* 8007B164 */ void GetBnd() const; @@ -113,7 +113,7 @@ struct cBgW { /* 8007B240 */ void GetTopUnder(f32*, f32*) const; /* 8007B270 */ void GetTriPla(cBgS_PolyInfo const&) const; /* 8007B2B0 */ void GetGrpInf(cBgS_PolyInfo const&) const; - /* 8007B948 */ void ChkNotReady() const; + /* 8007B948 */ bool ChkNotReady() const; /* 8007B958 */ void ChkLock() const; /* 8007B964 */ void ChkMoveBg() const; }; diff --git a/src/d/cc/d_cc_d_nonmatching.cpp b/src/d/cc/d_cc_d_nonmatching.cpp index 4ae98ba807d..a29adfbbb84 100644 --- a/src/d/cc/d_cc_d_nonmatching.cpp +++ b/src/d/cc/d_cc_d_nonmatching.cpp @@ -24,7 +24,7 @@ void dCcD_GAtTgCoCommonBase::ClrActorInfo() { void dCcD_GAtTgCoCommonBase::ct() { mGFlag = NULL; mRPrm = 0; - field_0x08 = 0; + mHitCallback = NULL; mEffCounter = 0; } @@ -124,7 +124,9 @@ void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) { } else { actorPid = 0xFFFFFFFF; } - this->cCcD_Stts::Init(param_0, param_1, pActor, actorPid); + + cCcD_Stts::Init(param_0, param_1, pActor, actorPid); + s32 roomNo; if (pActor != NULL) { roomNo = fopAcM_GetRoomNo(pActor); @@ -132,6 +134,7 @@ void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) { roomNo = 0; field_0x1C |= 1; } + if (roomNo != -1) { mRoomId = roomNo; } else { @@ -141,8 +144,8 @@ void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) { /* 800838F4-80083928 07E234 0034+00 1/0 0/0 0/0 .text Ct__9dCcD_SttsFv */ void dCcD_Stts::Ct() { - this->cCcD_Stts::Ct(); - this->dCcD_GStts::Ct(); + cCcD_Stts::Ct(); + dCcD_GStts::Ct(); } /* 80083928-80083934 07E268 000C+00 1/0 0/0 0/0 .text ClrAt__9dCcD_SttsFv */ @@ -152,29 +155,29 @@ void dCcD_Stts::ClrAt() { /* 80083934-80083944 07E274 0010+00 1/0 0/0 0/0 .text ClrTg__9dCcD_SttsFv */ void dCcD_Stts::ClrTg() { - this->cCcD_Stts::ClrTg(); - this->dCcD_GStts::ClrTg(); + cCcD_Stts::ClrTg(); + dCcD_GStts::ClrTg(); } /* 80083944-800839A0 07E284 005C+00 1/1 0/0 0/0 .text Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt */ void dCcD_GObjAt::Set(dCcD_SrcGObjAt const& src) { - this->dCcD_GAtTgCoCommonBase::Set(src.mBase); - this->mSe = src.mSe; - this->mMtrl = src.mMtrl; - this->mHitMark = src.mHitMark; - this->mSpl = src.mSpl; + dCcD_GAtTgCoCommonBase::Set(src.mBase); + mSe = src.mSe; + mMtrl = src.mMtrl; + mHitMark = src.mHitMark; + mSpl = src.mSpl; } /* 800839A0-80083A28 07E2E0 0088+00 1/1 0/0 0/0 .text Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg */ void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& src) { - this->dCcD_GAtTgCoCommonBase::Set(src.mBase); - this->mSe = src.mSe; - this->mMtrl = src.mMtrl; - this->mHitMark = src.mHitMark; - this->mSpl = src.mSpl; - this->mHitPos = cXyz::Zero; - this->mShieldFrontRangeYAngle = NULL; - this->mShieldRange = 0x4000; + dCcD_GAtTgCoCommonBase::Set(src.mBase); + mSe = src.mSe; + mMtrl = src.mMtrl; + mHitMark = src.mHitMark; + mSpl = src.mSpl; + mHitPos = cXyz::Zero; + mShieldFrontRangeYAngle = NULL; + mShieldRange = 0x4000; } /* 80083A28-80083B8C 07E368 0164+00 0/0 4/4 496/496 .text __ct__12dCcD_GObjInfFv */ @@ -208,7 +211,7 @@ s32 dCcD_GObjInf::ChkAtHit() { /* 80084318-80084358 07EC58 0040+00 0/0 10/10 7/7 .text ResetAtHit__12dCcD_GObjInfFv */ void dCcD_GObjInf::ResetAtHit() { - this->ClrAtHit(); + ClrAtHit(); mGObjAt.mEffCounter = 0; } @@ -223,7 +226,7 @@ cCcD_Obj* dCcD_GObjInf::GetAtHitObj() { /* 800843A8-800843DC 07ECE8 0034+00 0/0 2/2 3/3 .text GetAtHitGObj__12dCcD_GObjInfFv */ cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() { - cCcD_Obj* obj = this->GetAtHitObj(); + cCcD_Obj* obj = GetAtHitObj(); if (obj == NULL) { return NULL; } else { @@ -270,7 +273,7 @@ bool dCcD_GObjInf::ChkTgHit() { /* 800844B8-800844F8 07EDF8 0040+00 0/0 1/1 5/5 .text ResetTgHit__12dCcD_GObjInfFv */ void dCcD_GObjInf::ResetTgHit() { - this->ClrTgHit(); + ClrTgHit(); mGObjTg.mEffCounter = 0; } @@ -286,7 +289,7 @@ cCcD_Obj* dCcD_GObjInf::GetTgHitObj() { /* 80084548-8008457C 07EE88 0034+00 1/1 5/5 63/63 .text GetTgHitGObj__12dCcD_GObjInfFv */ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() { - cCcD_Obj* obj = this->GetTgHitObj(); + cCcD_Obj* obj = GetTgHitObj(); if (obj == NULL) { return NULL; } else { @@ -297,7 +300,7 @@ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() { /* 8008457C-800845B0 07EEBC 0034+00 0/0 2/2 18/18 .text GetTgHitObjSe__12dCcD_GObjInfFv */ u8 dCcD_GObjInf::GetTgHitObjSe() { - dCcD_GObjInf* objInf = this->GetTgHitGObj(); + dCcD_GObjInf* objInf = GetTgHitGObj(); if (objInf == NULL) { return NULL; } else { @@ -308,25 +311,30 @@ u8 dCcD_GObjInf::GetTgHitObjSe() { /* ############################################################################################## */ /* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata m_hitSeID__12dCcD_GObjInf */ u32 const dCcD_GObjInf::m_hitSeID[24] = { - 0x0004000F, 0x00040000, 0x00040002, 0x00040004, 0x00040009, 0x0004000B, 0x0004000C, 0x0004000D, - 0x0004000E, 0x0004000F, 0x00040001, 0x00040004, 0x00040010, 0x00040011, 0x00040012, 0x00040013, - 0x00040014, 0x00040015, 0x00040018, 0x00040016, 0x00040003, 0x00040005, 0x00040006, 0x00040007, + Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD, Z2SE_HIT_SHIELD_ATTACK, + Z2SE_HIT_WOLFKICK, Z2SE_HIT_HOOKSHOT_STICK, Z2SE_HIT_METAL_WEAPON, + Z2SE_HIT_STONE_WEAPON, Z2SE_HIT_HARD_BODY, Z2SE_HIT_SOFT_BODY, + Z2SE_HIT_DUMMY_CANCEL, Z2SE_HIT_SWORD_STAB, Z2SE_HIT_WOLFKICK, + Z2SE_HIT_SWORD_RUN, Z2SE_HIT_EN_WOOD_WEAPON, Z2SE_HIT_THOROW_OBJ, + Z2SE_HIT_SPINNER, Z2SE_HIT_COPYROD, Z2SE_HIT_STATUE_HAMMER, + Z2SE_HIT_PACHINKO, Z2SE_HIT_AL_ARROW_STICK, Z2SE_HIT_WOLFBITE, + Z2SE_HIT_WOOD_WEAPON, Z2SE_HIT_HAMMER, Z2SE_HIT_ARROW_STICK, }; /* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */ -u32 dCcD_GObjInf::getHitSeID(u8 param_0, int param_1) { - if (param_1 != 0) { - if (param_0 == 0x17) { - return 0x40017; +u32 dCcD_GObjInf::getHitSeID(u8 seIdx, int useRebound) { + if (useRebound) { + if (seIdx == 23) { + return Z2SE_HIT_AL_ARROW_REBOUND; } - if (param_0 == 7) { - return 0x40008; + if (seIdx == 7) { + return Z2SE_HIT_ARROW_REBOUND; } - if (param_0 == 8) { - return 0x4000A; + if (seIdx == 8) { + return Z2SE_HIT_HOOKSHOT_REBOUND; } } - return m_hitSeID[param_0]; + return m_hitSeID[seIdx]; } /* 8008460C-80084658 07EF4C 004C+00 5/0 0/0 0/0 .text ClrCoHit__12dCcD_GObjInfFv */ @@ -364,22 +372,22 @@ cCcD_Obj* dCcD_GObjInf::GetCoHitObj() { } /* 80084740-8008479C 07F080 005C+00 4/4 0/0 0/0 .text Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf */ -void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& param_0) { - this->cCcD_Obj::Set(param_0.mObj); - mGObjAt.Set(param_0.mGObjAt); - mGObjTg.Set(param_0.mGObjTg); - mGObjCo.Set(param_0.mGObjCo); +void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& src) { + cCcD_Obj::Set(src.mObj); + mGObjAt.Set(src.mGObjAt); + mGObjTg.Set(src.mGObjTg); + mGObjCo.Set(src.mGObjCo); } /* 8008479C-800847C8 07F0DC 002C+00 2/2 1/1 3/3 .text dCcD_GetGObjInf__FP8cCcD_Obj */ -dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* obj) { - return (dCcD_GObjInf*)obj->GetGObjInf(); +dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* p_obj) { + return (dCcD_GObjInf*)p_obj->GetGObjInf(); } /* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text Set__8dCcD_CpsFRC11dCcD_SrcCps */ -void dCcD_Cps::Set(dCcD_SrcCps const& param_0) { - this->dCcD_GObjInf::Set(param_0.mObjInf); - this->cCcD_CpsAttr::Set(param_0.mCps); +void dCcD_Cps::Set(dCcD_SrcCps const& src) { + dCcD_GObjInf::Set(src.mObjInf); + cCcD_CpsAttr::Set(src.mCps); } /* 80084814-80084824 07F154 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CpsFv */ @@ -390,18 +398,18 @@ cCcD_ShapeAttr* dCcD_Cps::GetShapeAttr() { /* 80084824-80084854 07F164 0030+00 0/0 0/0 6/6 .text CalcAtVec__8dCcD_CpsFv */ void dCcD_Cps::CalcAtVec() { cXyz& dest = mGObjAt.GetVec(); - PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest); + PSVECSubtract(&GetEndP(), &GetStartP(), &dest); } /* 80084854-80084884 07F194 0030+00 0/0 0/0 2/2 .text CalcTgVec__8dCcD_CpsFv */ void dCcD_Cps::CalcTgVec() { cXyz& dest = mGObjTg.GetVec(); - PSVECSubtract(&this->GetEndP(), &this->GetStartP(), &dest); + PSVECSubtract(&GetEndP(), &GetStartP(), &dest); } /* 80084884-800848A4 07F1C4 0020+00 0/0 0/0 5/5 .text Set__8dCcD_TriFRC11dCcD_SrcTri */ -void dCcD_Tri::Set(dCcD_SrcTri const& param_0) { - this->dCcD_GObjInf::Set(param_0.mObjInf); +void dCcD_Tri::Set(dCcD_SrcTri const& src) { + dCcD_GObjInf::Set(src.mObjInf); } /* 800848A4-800848B4 07F1E4 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_TriFv */ @@ -411,9 +419,9 @@ cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() { /* 800848B4-800848F8 07F1F4 0044+00 0/0 2/2 245/245 .text Set__8dCcD_CylFRC11dCcD_SrcCyl */ -void dCcD_Cyl::Set(dCcD_SrcCyl const& param_0) { - this->dCcD_GObjInf::Set(param_0.mObjInf); - this->cCcD_CylAttr::Set(param_0.mCyl); +void dCcD_Cyl::Set(dCcD_SrcCyl const& src) { + dCcD_GObjInf::Set(src.mObjInf); + cCcD_CylAttr::Set(src.mCyl); } /* 800848F8-80084908 07F238 0010+00 1/0 0/0 0/0 .text GetShapeAttr__8dCcD_CylFv */ @@ -422,10 +430,10 @@ cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() { } /* 80084908-80084954 07F248 004C+00 0/0 3/3 3/3 .text StartCAt__8dCcD_CylFR4cXyz */ -void dCcD_Cyl::StartCAt(cXyz& param_0) { +void dCcD_Cyl::StartCAt(cXyz& pos) { cXyz zero = cXyz::Zero; mGObjAt.SetVec(zero); - this->SetC(param_0); + SetC(pos); } inline void vecDiff(cXyz& out, const cXyz& a, const cXyz& b) { @@ -433,41 +441,41 @@ inline void vecDiff(cXyz& out, const cXyz& a, const cXyz& b) { } /* 80084954-800849C4 07F294 0070+00 0/0 3/3 4/4 .text MoveCAt__8dCcD_CylFR4cXyz */ -void dCcD_Cyl::MoveCAt(cXyz& param_0) { +void dCcD_Cyl::MoveCAt(cXyz& pos) { cXyz diff; - vecDiff(diff, param_0, this->GetCP()); + vecDiff(diff, pos, GetCP()); mGObjAt.SetVec(diff); - this->SetC(param_0); + SetC(pos); } /* 800849C4-80084A34 07F304 0070+00 0/0 0/0 1/1 .text MoveCTg__8dCcD_CylFR4cXyz */ -void dCcD_Cyl::MoveCTg(cXyz& param_0) { +void dCcD_Cyl::MoveCTg(cXyz& pos) { cXyz diff; - vecDiff(diff, param_0, this->GetCP()); + vecDiff(diff, pos, GetCP()); mGObjTg.SetVec(diff); - this->SetC(param_0); + SetC(pos); } /* 80084A34-80084A78 07F374 0044+00 0/0 2/2 196/196 .text Set__8dCcD_SphFRC11dCcD_SrcSph */ -void dCcD_Sph::Set(dCcD_SrcSph const& param_0) { - this->dCcD_GObjInf::Set(param_0.mObjInf); - this->cCcD_SphAttr::Set(param_0.mSph); +void dCcD_Sph::Set(dCcD_SrcSph const& src) { + dCcD_GObjInf::Set(src.mObjInf); + cCcD_SphAttr::Set(src.mSph); } /* 80084A78-80084AC4 07F3B8 004C+00 0/0 3/3 25/25 .text StartCAt__8dCcD_SphFR4cXyz */ -void dCcD_Sph::StartCAt(cXyz& xyz) { +void dCcD_Sph::StartCAt(cXyz& pos) { cXyz zero(cXyz::Zero); SetAtVec(zero); - this->cM3dGSph::SetC(xyz); + cM3dGSph::SetC(pos); } /* 80084AC4-80084B34 07F404 0070+00 0/0 2/2 23/23 .text MoveCAt__8dCcD_SphFR4cXyz */ -void dCcD_Sph::MoveCAt(cXyz& param_0) { +void dCcD_Sph::MoveCAt(cXyz& pos) { cXyz diff; - vecDiff(diff, param_0, GetC()); + vecDiff(diff, pos, GetC()); mGObjAt.SetVec(diff); - this->SetC(param_0); + SetC(pos); } cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index d5a9612d872..5c2841b7d60 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -9,14 +9,10 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Declarations: -// - /* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ -void dCcMassS_Obj::Set(cCcD_Obj* obj, u8 priority, dCcMassS_ObjCallback callback) { - mpObj = obj; +void dCcMassS_Obj::Set(cCcD_Obj* p_obj, u8 priority, dCcMassS_ObjCallback callback) { + mpObj = p_obj; mPriority = priority; mpCallback = callback; } @@ -40,7 +36,7 @@ void dCcMassS_HitInf::ClearPointer() { /* 80085350-80085450 07FC90 0100+00 0/0 1/1 0/0 .text __ct__12dCcMassS_MngFv */ dCcMassS_Mng::dCcMassS_Mng() { - this->Ct(); + Ct(); } /* 800855C8-800855E4 07FF08 001C+00 1/1 0/0 0/0 .text __ct__12dCcMassS_ObjFv */ @@ -52,13 +48,13 @@ void dCcMassS_Mng::Ct() { mResultCam = 0; mCamTopPos.set(0, -1000000000.0f, 0); mCamBottomPos.set(0, -1000000000.0f, 0); - this->Clear(); + Clear(); } /* 80085630-80085690 07FF70 0060+00 0/0 0/0 2/2 .text SetAttr__12dCcMassS_MngFffUcUc */ -void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) { - mCylAttr.SetR(param_0); - mCylAttr.SetH(param_1); +void dCcMassS_Mng::SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3) { + mCylAttr.SetR(radius); + mCylAttr.SetH(height); field_0x200 = param_2; field_0x201 = param_3; } @@ -67,34 +63,41 @@ void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) { void dCcMassS_Mng::Prepare() { cM3dGAab aab; aab.ClearForMinMax(); + for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) { cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); objShape->CalcAabBox(); aab.SetMinMax(objShape->GetWorkAab()); } + for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) { cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); objShape->CalcAabBox(); aab.SetMinMax(objShape->GetWorkAab()); } + if (field_0x202 & 1) { mCpsAttr.CalcAabBox(); aab.SetMinMax(mCpsAttr.GetWorkAab()); } + mDivideArea.SetArea(aab); for (dCcMassS_Obj* pObj = mMassObjs; pObj < mMassObjs + mMassObjCount; ++pObj) { cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo(); mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0); } + for (dCcMassS_Obj* pObj = mMassAreas; pObj < mMassAreas + mMassAreaCount; ++pObj) { cCcD_ShapeAttr* objShape = pObj->GetObj()->GetShapeAttr(); cCcD_DivideInfo* divideInfo = &pObj->GetDivideInfo(); mDivideArea.CalcDivideInfo(divideInfo, objShape->GetWorkAab(), 0); } + if (field_0x202 & 1) { mDivideArea.CalcDivideInfo(&mDivideInfo, mCpsAttr.GetWorkAab(), 0); } + mCamTopPos.set(0, -1000000000.0f, 0); mCamTopDist = 1000000000.0f; mCamBottomPos.set(0, -1000000000.0f, 0); @@ -103,14 +106,17 @@ void dCcMassS_Mng::Prepare() { /* 800858AC-80085CF0 0801EC 0444+00 0/0 0/0 2/2 .text * Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */ -u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { +u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf) { cCcD_DivideInfo divideInfo; u32 flagsMaybe = 0; - *pActor = NULL; - mCylAttr.SetC(*xyz); + *p_actor = NULL; + + mCylAttr.SetC(*p_xyz); mCylAttr.CalcAabBox(); + mDivideArea.CalcDivideInfoOverArea(÷Info, mCylAttr.GetWorkAab()); - hitInf->ClearPointer(); + p_hitInf->ClearPointer(); + if (field_0x200 & 8) { for (dCcMassS_Obj* massObj = mMassAreas; massObj < mMassAreas + mMassAreaCount; ++massObj) { if (massObj->GetDivideInfo().Chk(divideInfo)) { @@ -119,17 +125,19 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { f32 f; if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f)) { flagsMaybe |= 4; - *pActor = obj->GetStts()->GetAc(); - if (hitInf != NULL) { - hitInf->SetAreaHitObj(obj); + *p_actor = obj->GetStts()->GetAc(); + if (p_hitInf != NULL) { + p_hitInf->SetAreaHitObj(obj); } + if (massObj->GetCallback() != NULL) { - massObj->GetCallback()(obj->GetStts()->GetAc(), xyz, field_0x201); + massObj->GetCallback()(obj->GetStts()->GetAc(), p_xyz, field_0x201); } } } } } + for (dCcMassS_Obj* massObj = mMassObjs; massObj < mMassObjs + mMassObjCount; ++massObj) { if (massObj->GetDivideInfo().Chk(divideInfo)) { cCcD_Obj* obj = massObj->GetObj(); @@ -139,18 +147,20 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { if (obj->ChkAtSet() && !gobjInf->ChkAtNoMass() && mCylAttr.CrossAtTg(*objShape, &unusedVec) && (field_0x200 & 1)) { flagsMaybe |= 1; - *pActor = obj->GetStts()->GetAc(); - if (hitInf != NULL) { - hitInf->SetAtHitObj(obj); + *p_actor = obj->GetStts()->GetAc(); + if (p_hitInf != NULL) { + p_hitInf->SetAtHitObj(obj); } } + f32 f; if (obj->ChkCoSet() && mCylAttr.CrossCo(*objShape, &f) && (field_0x200 & 2)) { flagsMaybe |= 2; - *pActor = obj->GetStts()->GetAc(); + *p_actor = obj->GetStts()->GetAc(); + if (field_0x200 & 0x10) { Vec vec; - PSVECSubtract(&(*pActor)->mCurrent.mPosition, xyz, &vec); + PSVECSubtract(&(*p_actor)->mCurrent.mPosition, p_xyz, &vec); vec.y = 0; f32 vecMag = PSVECMag(&vec); if (cM3d_IsZero(vecMag)) { @@ -160,23 +170,27 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { } obj->GetStts()->PlusCcMove(vec.x, vec.y, vec.z); } - if (hitInf != NULL) { - hitInf->SetCoHitObj(obj); - hitInf->SetCoHitLen(f); + + if (p_hitInf != NULL) { + p_hitInf->SetCoHitObj(obj); + p_hitInf->SetCoHitLen(f); } } } } + f32 f; if ((field_0x202 & 1) && mDivideInfo.Chk(divideInfo) && mCylAttr.CrossCo(mCpsAttr, &f)) { mResultCam |= 1; mResultCam |= 1 << (field_0x201 + 1); + if ((mResultCam & 2) || (mResultCam & 8)) { cXyz tmpVec; - f32 plusH = xyz->y + mCylAttr.GetH(); - tmpVec.x = xyz->x; + f32 plusH = p_xyz->y + mCylAttr.GetH(); + tmpVec.x = p_xyz->x; tmpVec.y = plusH; - tmpVec.z = xyz->z; + tmpVec.z = p_xyz->z; + if (mCamTopPos.y < (20.0f + plusH)) { f32 newCamTopDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetStartP()); if (mCamTopDist > newCamTopDist) { @@ -184,6 +198,7 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { mCamTopPos = tmpVec; } } + if (mCamBottomPos.y < (20.0f + plusH)) { f32 newCamBottomDist = PSVECSquareDistance(&tmpVec, &mCpsAttr.GetEndP()); if (mCamBottomDist > newCamBottomDist) { @@ -193,6 +208,7 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { } } } + return flagsMaybe; } @@ -200,12 +216,15 @@ u32 dCcMassS_Mng::Chk(cXyz* xyz, fopAc_ac_c** pActor, dCcMassS_HitInf* hitInf) { void dCcMassS_Mng::Clear() { mMassObjCount = 0; mMassAreaCount = 0; + for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) { mMassObjs[i].Clear(); } + for (int i = 0; i < (s32)ARRAY_SIZE(mMassAreas); ++i) { mMassAreas[i].Clear(); } + mCylAttr.SetR(0.0f); mCylAttr.SetH(0.0f); field_0x200 = 0; @@ -213,17 +232,17 @@ void dCcMassS_Mng::Clear() { } /* 80085D98-80085E6C 0806D8 00D4+00 0/0 4/4 7/7 .text Set__12dCcMassS_MngFP8cCcD_ObjUc */ -void dCcMassS_Mng::Set(cCcD_Obj* obj, u8 priority) { +void dCcMassS_Mng::Set(cCcD_Obj* p_obj, u8 priority) { if (mMassObjCount >= (s32)ARRAY_SIZE(mMassObjs)) { for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); ++i) { int prevPrio = mMassObjs[i].GetPriority(); if (prevPrio > priority || (prevPrio == priority && cM_rndF(1.0f) < 0.5f)) { - mMassObjs[i].Set(obj, priority, NULL); + mMassObjs[i].Set(p_obj, priority, NULL); break; } } } else { - mMassObjs[mMassObjCount].Set(obj, priority, NULL); + mMassObjs[mMassObjCount].Set(p_obj, priority, NULL); mMassObjCount++; } } @@ -243,6 +262,6 @@ u8 dCcMassS_Mng::GetResultCam() const { /* 80085EB8-80085ED4 0807F8 001C+00 0/0 1/1 0/0 .text GetCamTopPos__12dCcMassS_MngFP3Vec */ -void dCcMassS_Mng::GetCamTopPos(Vec* out) { - *out = mCamTopPos; +void dCcMassS_Mng::GetCamTopPos(Vec* p_out) { + *p_out = mCamTopPos; } diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index 08bba8d9399..6bd6f9b2a05 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -52,8 +52,64 @@ BOOL daPy_py_c::checkNowWolf() { /* ############################################################################################## */ /* 803AC418-803AC500 009538 00E8+00 1/1 0/0 0/0 .data plCutLRC */ SECTION_DATA static int plCutLRC[58] = { - 0, 0, 1, 1, 2, 0, 2, 1, 0, 0, 0, 2, 1, 1, 1, 2, 2, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, + 0, // + 0, // CUT_VERTICAL + 1, // CUT_STAB + 1, // CUT_SWEEP + 2, // CUT_HORIZONTAL + 0, // CUT_HEAD + 2, // CUT_LEFT_SWEEP_FINISH + 1, // CUT_DOWN_FINISH + 0, // CUT_TURN_RIGHT + 0, // + 0, // CUT_JUMP + 2, // + 1, // + 1, // + 1, // + 2, // + 2, // CUT_AIR + 1, // + 1, // CUT_LARGE_JUMP_INIT + 0, // CUT_LARGE_JUMP + 0, // CUT_LARGE_JUMP_FINISH + 1, // CUT_RIGHT_SWEEP_FINISH + 0, // CUT_TURN_LEFT + 0, // CUT_LARGE_TURN_LEFT + 0, // CUT_LARGE_TURN_RIGHT + 0, // + 0, // CUT_FAST_MOVE + 0, // + 0, // + 0, // + 0, // CUT_TWIRL + 0, // CUT_FAST + 0, // CUT_STAB_FINISH + 2, // CUT_STAB_COMBO + 0, // + 0, // + 0, // + 2, // + 1, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 0, // + 2, // + 1, // + 0, // + 0, // + 0, // + 0, // + 0, // }; /* 800873B0-800873D4 081CF0 0024+00 0/0 0/0 3/3 .text pl_cut_LRC__Fi */ @@ -113,31 +169,31 @@ static int getMapInfo(s8 param_0) { } /* 800874F0-80087514 081E30 0024+00 2/2 0/0 0/0 .text getHitId__FP8cCcD_Obji */ -static u32 getHitId(cCcD_Obj* obj, int param_1) { - dCcD_GObjInf* dObj = static_cast(obj); - return dObj->getHitSeID(dObj->GetAtSe(), param_1); +static u32 getHitId(cCcD_Obj* p_obj, int useReboundSE) { + dCcD_GObjInf* dObj = static_cast(p_obj); + return dObj->getHitSeID(dObj->GetAtSe(), useReboundSE); } /* 80087514-80087594 081E54 0080+00 0/0 0/0 47/47 .text * def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c */ -void def_se_set(Z2Creature* sound, cCcD_Obj* collider, u32 map_info, fopAc_ac_c* actor) { - if (sound != NULL) { - int tmp; - if (actor != NULL && fopAcM_checkStatus(actor, 0x280000)) { - tmp = 0; +void def_se_set(Z2Creature* p_sound, cCcD_Obj* p_collider, u32 map_info, fopAc_ac_c* p_actor) { + if (p_sound != NULL) { + int useReboundSE; + if (p_actor != NULL && fopAcM_checkStatus(p_actor, 0x280000)) { + useReboundSE = false; } else { - tmp = 1; + useReboundSE = true; } - sound->startCollisionSE(getHitId(collider, tmp), map_info); + p_sound->startCollisionSE(getHitId(p_collider, useReboundSE), map_info); } } /* 80087594-80087A58 081ED4 04C4+00 1/1 0/0 0/0 .text at_power_get__FP11dCcU_AtInfo */ -static u8 at_power_get(dCcU_AtInfo* info) { - u8 power = info->mpCollider->GetAtAtp(); +static u8 at_power_get(dCcU_AtInfo* p_info) { + u8 power = p_info->mpCollider->GetAtAtp(); - if (info->mPowerType == 0) { - if (info->mpCollider->ChkAtType(0x10000000)) { + if (p_info->mPowerType == 0) { + if (p_info->mpCollider->ChkAtType(0x10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -150,8 +206,8 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 200; } - } else if (info->mPowerType == 6) { - if (info->mpCollider->ChkAtType(0x10000000)) { + } else if (p_info->mPowerType == 6) { + if (p_info->mpCollider->ChkAtType(0x10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -162,10 +218,10 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 3) { power *= 10; } - } else if (info->mPowerType == 4) { - if (info->mpCollider->ChkAtType(0x400000)) { + } else if (p_info->mPowerType == 4) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { power = 200; - } else if (info->mpCollider->ChkAtType(0x10000000)) { + } else if (p_info->mpCollider->ChkAtType(0x10000000)) { power = 0; } else if (power == 1) { power = 1; @@ -178,8 +234,8 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 200; } - } else if (info->mPowerType == 5) { - if (info->mpCollider->ChkAtType(0x2000)) { + } else if (p_info->mPowerType == 5) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_ARROW)) { power = 0; } else if (power == 1) { power = 1; @@ -188,8 +244,8 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 3) { power = 4; } - } else if (info->mPowerType == 2) { - if (info->mpCollider->ChkAtType(0x400000)) { + } else if (p_info->mPowerType == 2) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { power = 200; } else if (power == 1) { power = 1; @@ -202,14 +258,14 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 200; } - } else if (info->mPowerType == 1) { - if (info->mpCollider->ChkAtType(0x400000) || power >= 4) { + } else if (p_info->mPowerType == 1) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL) || power >= 4) { power = 200; } else { power *= 10; } - } else if (info->mPowerType == 3) { - if (info->mpCollider->ChkAtType(0x400000) || power >= 4) { + } else if (p_info->mPowerType == 3) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL) || power >= 4) { power = 200; } else if (power == 1) { power = 10; @@ -218,10 +274,10 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 3) { power = 40; } - } else if (info->mPowerType == 7) { - if (info->mpCollider->ChkAtType(0x420008)) { + } else if (p_info->mPowerType == 7) { + if (p_info->mpCollider->ChkAtType(0x420008)) { power = 50; - } else if (info->mpCollider->ChkAtType(0x2000)) { + } else if (p_info->mpCollider->ChkAtType(AT_TYPE_ARROW)) { power = 27; } else if (power == 1) { power = 1; @@ -234,7 +290,7 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 200; } - } else if (info->mPowerType == 8) { + } else if (p_info->mPowerType == 8) { if (power == 1) { power = 3; } else if (power == 2) { @@ -244,11 +300,11 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 3) { power *= 10; } - } else if (info->mPowerType == 9 || info->mPowerType == 10) { - if (info->mpCollider->ChkAtType(0x4000)) { + } else if (p_info->mPowerType == 9 || p_info->mPowerType == 10) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { power = 0; } - if (info->mpCollider->ChkAtType(0x400000)) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { power = 19; } @@ -263,8 +319,8 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 200; } - } else if (info->mPowerType == 11) { - if (info->mpCollider->ChkAtType(0x4000)) { + } else if (p_info->mPowerType == 11) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { power = 0; } @@ -277,7 +333,7 @@ static u8 at_power_get(dCcU_AtInfo* info) { } else if (power >= 4) { power = 100; } - } else if (info->mPowerType == 12) { + } else if (p_info->mPowerType == 12) { if (power == 1) { power = 10; } else if (power == 2) { @@ -294,57 +350,59 @@ static u8 at_power_get(dCcU_AtInfo* info) { /* 80087A58-80087C04 082398 01AC+00 1/1 0/0 38/38 .text at_power_check__FP11dCcU_AtInfo */ -fopAc_ac_c* at_power_check(dCcU_AtInfo* info) { - if (info->mpCollider == NULL) { +fopAc_ac_c* at_power_check(dCcU_AtInfo* p_info) { + if (p_info->mpCollider == NULL) { return NULL; } - info->mpActor = info->mpCollider->GetAc(); - info->mHitType = 12; - info->mAttackPower = 0; - info->mHitBit = 0; + p_info->mpActor = p_info->mpCollider->GetAc(); + p_info->mHitType = 12; + p_info->mAttackPower = 0; + p_info->mHitBit = 0; - if (info->mpActor != NULL) { - info->mAttackPower = at_power_get(info); + if (p_info->mpActor != NULL) { + p_info->mAttackPower = at_power_get(p_info); - s16 ac_name = fopAcM_GetName(info->mpActor); + s16 ac_name = fopAcM_GetName(p_info->mpActor); if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { - if (info->mpCollider->ChkAtType(0x8000) || info->mpCollider->ChkAtType(0x400000)) { - info->mHitType = 9; + if (p_info->mpCollider->ChkAtType(0x8000) || + p_info->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { + p_info->mHitType = HIT_TYPE_LINK_HEAVY_ATTACK; } else { - info->mHitType = 1; - info->mHitBit = cc_pl_cut_bit_get(); + p_info->mHitType = HIT_TYPE_LINK_NORMAL_ATTACK; + p_info->mHitBit = cc_pl_cut_bit_get(); } } else if (ac_name == PROC_NBOMB) { - info->mHitType = 2; - info->mHitBit = 0x10000000; + p_info->mHitType = HIT_TYPE_BOMB; + p_info->mHitBit = 0x10000000; } else if (ac_name == PROC_BOOMERANG) { - info->mHitType = 10; - info->mHitBit = 0x40000000; + p_info->mHitType = HIT_TYPE_BOOMERANG; + p_info->mHitBit = 0x40000000; } else if (ac_name == PROC_ARROW) { - info->mHitType = 15; - info->mHitBit = 0x80000000; + p_info->mHitType = HIT_TYPE_ARROW; + p_info->mHitBit = 0x80000000; } } - info->mHitStatus = 0; - if (info->mpCollider->ChkAtType(0x40) || info->mpCollider->ChkAtType(0x10000) || - info->mpCollider->ChkAtType(0x80) || info->mpCollider->ChkAtType(0x10)) { - info->mHitType = 0x10; - } else if (info->mpCollider->ChkAtType(0x4000)) { - info->mHitBit = 0x1000; + p_info->mHitStatus = 0; + if (p_info->mpCollider->ChkAtType(0x40) || p_info->mpCollider->ChkAtType(AT_TYPE_BOOMERANG) || + p_info->mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || + p_info->mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { + p_info->mHitType = HIT_TYPE_STUN; + } else if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { + p_info->mHitBit = 0x1000; } else { - s16 ac_name = fopAcM_GetName(info->mpActor); + s16 ac_name = fopAcM_GetName(p_info->mpActor); if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { - if (dCcD_GetGObjInf(info->mpCollider)->GetAtSpl() == 1) { - info->mHitStatus = 1; + if (dCcD_GetGObjInf(p_info->mpCollider)->GetAtSpl() == 1) { + p_info->mHitStatus = 1; } - } else if (info->mAttackPower >= 3) { - info->mHitStatus = 1; + } else if (p_info->mAttackPower >= 3) { + p_info->mHitStatus = 1; } } - return info->mpActor; + return p_info->mpActor; } /* ############################################################################################## */ @@ -381,113 +439,115 @@ SECTION_SDATA2 static f32 lit_4218[1 + 1 /* padding */] = { /* 80087C04-80088134 082544 0530+00 0/0 0/0 84/84 .text cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo */ -// reg issues +// just float reg issues #ifdef NONMATCHING -fopAc_ac_c* cc_at_check(fopAc_ac_c* enemy, dCcU_AtInfo* info) { +fopAc_ac_c* cc_at_check(fopAc_ac_c* p_enemy, dCcU_AtInfo* p_info) { daPy_py_c* link = (daPy_py_c*)dComIfGp_getPlayer(0); - info->mpActor = at_power_check(info); + p_info->mpActor = at_power_check(p_info); - if (info->mpActor != NULL) { - cXyz tmp = info->mpActor->mSpeed; + if (p_info->mpActor != NULL) { + cXyz tmp = p_info->mpActor->mSpeed; tmp.y = 0.0f; if (tmp.abs() > 100.0f) { - f32 x = info->mpActor->mSpeed.x; - f32 z = info->mpActor->mSpeed.z; - info->mHitDirection = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f); + f32 x = p_info->mpActor->mSpeed.x; + f32 z = p_info->mpActor->mSpeed.z; + p_info->mHitDirection = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f); } else { - if (fopAcM_GetName(info->mpActor) == PROC_BOOMERANG) { - f32 x_diff = enemy->mCurrent.mPosition.x - link->mCurrent.mPosition.x; - f32 z_diff = enemy->mCurrent.mPosition.z - link->mCurrent.mPosition.z; - info->mHitDirection = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f); + if (fopAcM_GetName(p_info->mpActor) == PROC_BOOMERANG) { + f32 x_diff = p_enemy->mCurrent.mPosition.x - link->mCurrent.mPosition.x; + f32 z_diff = p_enemy->mCurrent.mPosition.z - link->mCurrent.mPosition.z; + p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f); } else { - f32 x_diff = enemy->mCurrent.mPosition.x - info->mpActor->mCurrent.mPosition.x; - f32 z_diff = enemy->mCurrent.mPosition.z - info->mpActor->mCurrent.mPosition.z; - info->mHitDirection = cM_atan2s(-x_diff, -z_diff); + f32 x_diff = p_enemy->mCurrent.mPosition.x - p_info->mpActor->mCurrent.mPosition.x; + f32 z_diff = p_enemy->mCurrent.mPosition.z - p_info->mpActor->mCurrent.mPosition.z; + p_info->mHitDirection = cM_atan2s(-x_diff, -z_diff); } } - if (info->mHitType == 1 && link->getCutType() == daPy_py_c::TYPE_CUT_HEAD) { - info->mHitDirection = link->mCollisionRot.y; + if (p_info->mHitType == HIT_TYPE_LINK_NORMAL_ATTACK && + link->getCutType() == daPy_py_c::TYPE_CUT_HEAD) { + p_info->mHitDirection = link->mCollisionRot.y; } - if (info->mpCollider->ChkAtType(0x4000) && fopAcM_checkStatus(enemy, 0x380000)) { - info->mAttackPower = 0; + if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && + fopAcM_checkStatus(p_enemy, 0x380000)) { + p_info->mAttackPower = 0; } - if (static_cast(info->mpCollider)->GetAtMtrl() == 4) { - if (fopAcM_GetName(enemy) == PROC_B_GND) { - info->mAttackPower = 0; - } else if (fopAcM_GetName(enemy) != PROC_B_ZANT) { - info->mAttackPower = 100; + if (static_cast(p_info->mpCollider)->GetAtMtrl() == 4) { + if (fopAcM_GetName(p_enemy) == PROC_B_GND) { + p_info->mAttackPower = 0; + } else if (fopAcM_GetName(p_enemy) != PROC_B_ZANT) { + p_info->mAttackPower = 100; } } - if (info->mHitType == 1) { + if (p_info->mHitType == HIT_TYPE_LINK_NORMAL_ATTACK) { if (!daPy_py_c::checkNowWolf()) { if (link->checkMasterSwordEquip()) { - info->mAttackPower *= 2; + p_info->mAttackPower *= 2; } if (daPy_py_c::checkWoodSwordEquip()) { - // probably supposed to be some sort of division - info->mAttackPower = info->mAttackPower >> 1; + p_info->mAttackPower /= 2; } } if (link->getSwordAtUpTime()) { - info->mAttackPower *= 2; - info->mHitStatus = 1; + p_info->mAttackPower *= 2; + p_info->mHitStatus = 1; } } - if (info->mAttackPower != 0) { - enemy->field_0x562 -= info->mAttackPower; + if (p_info->mAttackPower != 0) { + p_enemy->field_0x562 -= p_info->mAttackPower; } s8 pause_time = 0; - if (info->mAttackPower != 0 && enemy->field_0x562 <= 0) { - info->mHitStatus = 2; - enemy->field_0x562 = 0; + if (p_info->mAttackPower != 0 && p_enemy->field_0x562 <= 0) { + p_info->mHitStatus = 2; + p_enemy->field_0x562 = 0; } int uvar8; - if (info->mpCollider->ChkAtType(0x4000) && !fopAcM_checkStatus(enemy, 0x280000)) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && + !fopAcM_checkStatus(p_enemy, 0x280000)) { uvar8 = 1; } else { uvar8 = 0; } - if (info->mpSound != NULL) { - if (info->field_0x18 != 0) { - info->mpSound->startCollisionSE(getHitId(info->mpCollider, uvar8), - info->field_0x18); + if (p_info->mpSound != NULL) { + if (p_info->field_0x18 != 0) { + p_info->mpSound->startCollisionSE(getHitId(p_info->mpCollider, uvar8), + p_info->field_0x18); } else { - info->mpSound->startCollisionSE(getHitId(info->mpCollider, uvar8), - getMapInfo(info->mHitStatus)); + p_info->mpSound->startCollisionSE(getHitId(p_info->mpCollider, uvar8), + getMapInfo(p_info->mHitStatus)); } } - if (info->mHitStatus != 0) { + if (p_info->mHitStatus != 0) { pause_time = 5; } else { - if (info->mAttackPower > 1) { + if (p_info->mAttackPower > 1) { pause_time = 2; } } - if (info->mpCollider->ChkAtType(0x8000000) || + if (p_info->mpCollider->ChkAtType(AT_TYPE_MIDNA_LOCK) || ((daPy_py_c*)dComIfGp_getPlayer(0))->checkHorseRide()) { // actor is Bulblin or Horseback Ganon - // add bulblin class later - if ((fopAcM_GetName(enemy) == PROC_E_RD && *(char*)((char*)&enemy + 0x1292) != 0) || - fopAcM_GetName(enemy) == PROC_B_GND) { + if ((fopAcM_GetName(p_enemy) == PROC_E_RD && + static_cast(p_enemy)->field_0x129a != 0) || + fopAcM_GetName(p_enemy) == PROC_B_GND) { pause_time = 3; } else { pause_time = 0; } } - s16 ac_name = fopAcM_GetName(enemy); + s16 ac_name = fopAcM_GetName(p_enemy); // actor is Stalkin, Chu, Keese, Shadow Keese, Shadow Vermin, Baby Gohma, or Rat if (ac_name == PROC_E_BS || ac_name == PROC_E_SM2 || ac_name == PROC_E_BA || ac_name == PROC_E_YK || ac_name == PROC_E_YG || ac_name == PROC_E_GM || @@ -495,15 +555,17 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* enemy, dCcU_AtInfo* info) { pause_time = 0; } - if (info->mHitType == 1 || info->mpCollider->ChkAtType(0x8)) { - if (!link->checkCutJumpCancelTurn() && info->mpCollider->ChkAtType(0x8)) { + if ((p_info->mHitType == HIT_TYPE_LINK_NORMAL_ATTACK || + p_info->mpCollider->ChkAtType(AT_TYPE_THROW_OBJ)) && + !link->checkCutJumpCancelTurn()) { + if (p_info->mpCollider->ChkAtType(AT_TYPE_THROW_OBJ)) { pause_time = 4; } dScnPly_c::setPauseTimer(pause_time); } } - return info->mpActor; + return p_info->mpActor; } #else #pragma push diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index c158f9dfa5e..06b1721b414 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -16,9 +16,14 @@ struct mDoCPd_c { static u8 m_cpadInfo[256]; }; -struct dAttDrawParam_c { +class dAttDrawParam_c { +public: /* 80070158 */ dAttDrawParam_c(); - /* 80073FC4 */ ~dAttDrawParam_c(); + /* 80073FC4 */ virtual ~dAttDrawParam_c(); + + /* 0x4 */ s8 field_0x4; + /* 0x8 */ f32 mCursorDistance; + /* 0xC */ f32 field_0xc; }; // @@ -347,11 +352,8 @@ SECTION_DEAD static char const* const stringBase_8037A778 = "Always"; SECTION_DEAD static char const* const pad_8037A77F = ""; #pragma pop -/* 80424B00-80424B0C 051820 000C+00 1/1 0/0 0/0 .bss @4093 */ -static u8 lit_4093[12]; - /* 80424B0C-80424B20 05182C 0010+04 3/3 0/0 0/0 .bss g_AttDwHIO */ -static u8 g_AttDwHIO[16 + 4 /* padding */]; +static dAttDrawParam_c g_AttDwHIO; /* 80070198-80070774 06AAD8 05DC+00 0/0 1/1 0/0 .text __ct__12dAttention_cFP10fopAc_ac_cUl */ #pragma push @@ -1093,27 +1095,13 @@ asm void dAttLook_c::request(fopAc_ac_c* param_0, f32 param_1, f32 param_2, f32 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dAttDrawParam_c::~dAttDrawParam_c() { +// asm dAttDrawParam_c::~dAttDrawParam_c() { +extern "C" asm void __dt__15dAttDrawParam_cFv() { nofralloc #include "asm/d/d_attention/__dt__15dAttDrawParam_cFv.s" } #pragma pop -/* 8007400C-80074048 06E94C 003C+00 0/0 1/0 0/0 .text __sinit_d_attention_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_attention_cpp() { - nofralloc -#include "asm/d/d_attention/__sinit_d_attention_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x8007400C, __sinit_d_attention_cpp); -#pragma pop - /* ############################################################################################## */ /* 8045067A-8045067E -00001 0004+00 0/0 0/0 0/0 .sdata None */ #pragma push diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 11400f2804b..ee205a18c86 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -4,284 +4,11 @@ // #include "d/d_demo.h" -#include "JSystem/JGadget/binary.h" -#include "JSystem/JStudio/JStudio/fvb.h" -#include "JSystem/JStudio/JStudio/stb.h" +#include "d/com/d_com_inf_game.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct _GXColor {}; - -struct mDoGph_gInf_c { - /* 80007FD8 */ void fadeOut(f32, _GXColor&); -}; - -struct Vec {}; - -struct J3DAnmTransform {}; - -struct mDoExt_McaMorf { - /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); - /* 800105C8 */ void play(Vec*, u32, s8); -}; - -struct jmessage_tControl { - /* 80039B0C */ ~jmessage_tControl(); - /* 802299EC */ jmessage_tControl(); -}; - -struct fopAc_ac_c {}; - -struct daMP_c { - /* 80031AD0 */ void daMP_c_THPPlayerPlay(); -}; - -struct dStage_roomControl_c { - static u8 mDemoArcName[10 + 2 /* padding */]; -}; - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C37C */ void getRes(char const*, char const*, dRes_info_c*, int); - /* 8003C400 */ void getIDRes(char const*, u16, dRes_info_c*, int); -}; - -struct dPa_levelEcallBack {}; - -struct dKy_tevstr_c {}; - -struct csXyz {}; - -struct cXyz { - /* 80009184 */ ~cXyz(); -}; - -struct dPa_control_c { - /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, - u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, - cXyz const*, f32); - - static u8 mEmitterMng[4]; -}; - -struct dMsgObject_c { - /* 80237AB0 */ void setDemoMessage(u32); -}; - -struct _GXSpotFn {}; - -struct _GXDistAttnFn {}; - -struct JStage { - struct TELight {}; - - struct TObject { - /* 80280E1C */ bool JSGGetName() const; - /* 80280E24 */ void JSGUpdate(); - /* 80280E28 */ bool JSGGetFlag() const; - /* 80280E30 */ void JSGSetFlag(u32); - /* 80280E34 */ bool JSGGetData(u32, void*, u32) const; - /* 80280E3C */ void JSGSetData(u32, void const*, u32); - /* 80280E40 */ void JSGGetParent(JStage::TObject**, u32*) const; - /* 80280E44 */ void JSGSetParent(JStage::TObject*, u32); - /* 80280E48 */ void JSGSetRelation(bool, JStage::TObject*, u32); - /* 80280E4C */ s32 JSGFindNodeID(char const*) const; - /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; - }; - - struct TEObject {}; - - struct TActor { - /* 80280A48 */ ~TActor(); - /* 80280AA8 */ s32 JSGFGetType() const; - /* 80280AC8 */ s32 JSGGetShape() const; - /* 80280AD4 */ s32 JSGGetAnimation() const; - /* 80280AE0 */ void JSGGetAnimationFrame() const; - /* 80280AF4 */ void JSGGetAnimationTransition() const; - /* 80280B00 */ s32 JSGGetTextureAnimation() const; - /* 80280B0C */ void JSGGetTextureAnimationFrame() const; - }; - - struct TAmbientLight { - /* 80280B20 */ ~TAmbientLight(); - /* 80280B80 */ s32 JSGFGetType() const; - /* 80280B88 */ void JSGGetColor() const; - }; - - struct TECameraProjection {}; - - struct TECameraView {}; - - struct TCamera { - /* 80280BA0 */ ~TCamera(); - /* 80280C00 */ s32 JSGFGetType() const; - /* 80280C08 */ bool JSGGetProjectionType() const; - /* 80280C10 */ void JSGSetProjectionType(JStage::TECameraProjection); - /* 80280C48 */ void JSGGetProjectionField(f32*) const; - /* 80280C4C */ void JSGSetProjectionField(f32 const*); - /* 80280C50 */ bool JSGGetViewType() const; - /* 80280C58 */ void JSGSetViewType(JStage::TECameraView); - }; - - struct TFog { - /* 80280C80 */ ~TFog(); - /* 80280CE0 */ s32 JSGFGetType() const; - /* 80280CE8 */ bool JSGGetFogFunction() const; - /* 80280CF4 */ void JSGGetStartZ() const; - /* 80280D00 */ void JSGGetEndZ() const; - /* 80280D10 */ void JSGGetColor() const; - }; - - struct TLight { - /* 80280D28 */ ~TLight(); - /* 80280D88 */ s32 JSGFGetType() const; - /* 80280D90 */ bool JSGGetLightType() const; - /* 80280D9C */ void JSGGetColor() const; - /* 80280DB4 */ void JSGGetDistanceAttenuation(f32*, f32*, _GXDistAttnFn*) const; - /* 80280DBC */ void JSGGetAngleAttenuation(f32*, _GXSpotFn*) const; - /* 80280DC4 */ void JSGGetPosition(Vec*) const; - /* 80280DCC */ void JSGGetDirection(Vec*) const; - }; - - struct TSystem { - /* 80280E90 */ ~TSystem(); - /* 80280EF0 */ bool JSGFGetType() const; - /* 80280F00 */ bool JSGCreateObject(char const*, JStage::TEObject, u32); - /* 80280F08 */ void JSGDestroyObject(JStage::TObject*); - /* 80280F0C */ bool JSGGetSystemData(u32); - /* 80280F14 */ void JSGSetSystemData(u32, u32); - }; -}; - -struct dDemo_system_c { - /* 80039528 */ void JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const; - /* 80039AAC */ ~dDemo_system_c(); -}; - -struct dDemo_particle_c { - /* 80039F1C */ void emitter_create(u32); - /* 80039F9C */ ~dDemo_particle_c(); -}; - -struct dDemo_light_c { - /* 80038E20 */ void JSGSetLightType(JStage::TELight); - /* 80038E34 */ void JSGSetPosition(Vec const&); - /* 80038E5C */ void JSGSetColor(_GXColor); - /* 80038E8C */ void JSGSetDistanceAttenuation(f32, f32, _GXDistAttnFn); - /* 80038EA8 */ void JSGSetAngleAttenuation(f32, _GXSpotFn); - /* 80038EC0 */ void JSGSetDirection(Vec const&); - /* 80039468 */ ~dDemo_light_c(); -}; - -struct _GXFogType {}; - -struct dDemo_fog_c { - /* 80038EE8 */ void JSGSetFogFunction(_GXFogType); - /* 80038EFC */ void JSGSetStartZ(f32); - /* 80038F10 */ void JSGSetEndZ(f32); - /* 80038F24 */ void JSGSetColor(_GXColor); - /* 80039408 */ ~dDemo_fog_c(); -}; - -struct dDemo_camera_c { - /* 80038AC4 */ void JSGGetProjectionNear() const; - /* 80038AF8 */ void JSGSetProjectionNear(f32); - /* 80038B0C */ void JSGGetProjectionFar() const; - /* 80038B40 */ void JSGSetProjectionFar(f32); - /* 80038B54 */ void JSGGetProjectionFovy() const; - /* 80038B88 */ void JSGSetProjectionFovy(f32); - /* 80038B9C */ void JSGGetProjectionAspect() const; - /* 80038BD0 */ void JSGSetProjectionAspect(f32); - /* 80038BE4 */ void JSGGetViewPosition(Vec*) const; - /* 80038C44 */ void JSGSetViewPosition(Vec const&); - /* 80038C6C */ void JSGGetViewUpVector(Vec*) const; - /* 80038CD0 */ void JSGSetViewUpVector(Vec const&); - /* 80038CF8 */ void JSGGetViewTargetPosition(Vec*) const; - /* 80038D5C */ void JSGSetViewTargetPosition(Vec const&); - /* 80038D84 */ void JSGGetViewRoll() const; - /* 80038DDC */ void JSGSetViewRoll(f32); - /* 80039FFC */ ~dDemo_camera_c(); -}; - -struct dDemo_ambient_c { - /* 80038DF0 */ void JSGSetColor(_GXColor); - /* 800394C8 */ ~dDemo_ambient_c(); -}; - -struct JUTNameTab { - /* 802DEA58 */ void getIndex(char const*) const; -}; - -namespace JStudio { -namespace ctb { -struct TControl { - /* 8028112C */ void destroyObject_all(); -}; - -}; // namespace ctb - -struct TCreateObject { - /* 80285488 */ ~TCreateObject(); -}; - -struct TFactory { - /* 80285560 */ void appendCreateObject(JStudio::TCreateObject*); -}; - -struct TControl { - /* 80285114 */ TControl(); - /* 80285228 */ void setFactory(JStudio::TFactory*); - /* 80285250 */ void transformOnSet_setOrigin_TxyzRy(Vec const&, f32); - /* 802852D0 */ void transformOnGet_setOrigin_TxyzRy(Vec const&, f32); -}; - -struct TParse { - /* 8028566C */ TParse(JStudio::TControl*); - /* 802856A8 */ ~TParse(); -}; - -struct TAdaptor { - /* 80286018 */ void adaptor_do_prepare(); - /* 8028601C */ void adaptor_do_begin(); - /* 80286020 */ void adaptor_do_end(); - /* 80286024 */ void adaptor_do_update(u32); - /* 80286028 */ void adaptor_do_data(void const*, u32, void const*, u32); -}; - -struct TAdaptor_message { - /* 802875E0 */ ~TAdaptor_message(); -}; - -struct TObject_message { - /* 80287640 */ TObject_message(JStudio::stb::data::TParse_TBlock_object const&, - JStudio::TAdaptor_message*); -}; - -struct TObject {}; - -}; // namespace JStudio - -struct JPABaseEmitter {}; - -struct JStudio_JParticle { - struct TCreateObject { - /* 8028E3A0 */ ~TCreateObject(); - /* 8028E400 */ void create(JStudio::TObject**, - JStudio::stb::data::TParse_TBlock_object const&); - /* 8028E4E4 */ void emitter_destroy(JPABaseEmitter*); - }; -}; - -struct JMessage { - struct TControl { - /* 802A758C */ ~TControl(); - }; -}; +#include "rel/d/a/d_a_movie_player/d_a_movie_player.h" +#include "d/msg/d_msg_object.h" // // Forward References: @@ -398,7 +125,6 @@ extern "C" u8 m_branchData__7dDemo_c[4]; // External References: // -extern "C" void OSReport_Error(); extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void __dt__4cXyzFv(); extern "C" void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(); @@ -498,7 +224,6 @@ extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(); extern "C" void getIndex__10JUTNameTabCFPCc(); -extern "C" void PSMTXCopy(); extern "C" void __register_global_object(); extern "C" void _savegpr_21(); extern "C" void _savegpr_27(); @@ -508,9 +233,6 @@ extern "C" void _restgpr_21(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void strncmp(); -extern "C" void strcmp(); -extern "C" void strlen(); extern "C" extern void* __vt__Q26JStage6TActor[35 + 1 /* padding */]; extern "C" extern void* __vt__Q26JStage13TAmbientLight[17 + 1 /* padding */]; extern "C" extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */]; @@ -527,12 +249,7 @@ extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4]; extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4]; extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mEmitterMng__13dPa_control_c[4]; // @@ -786,6 +503,55 @@ SECTION_DATA extern void* data_803A7BF4[9] = { (void*)func_80037E44, }; +namespace { +/* 80037DE4-80037E44 032724 0060+00 1/0 0/0 0/0 .text + * __dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jstudio_tAdaptor_message::~jstudio_tAdaptor_message() { + nofralloc +#include "asm/d/d_demo/func_80037DE4.s" +} +#pragma pop + +/* 80037E44-80037E74 032784 0030+00 1/0 0/0 0/0 .text + * adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData param_0, const void* param_1, u32 param_2) { + nofralloc +#include "asm/d/d_demo/func_80037E44.s" +} +#pragma pop + +/* 80037E74-80037ED4 0327B4 0060+00 1/0 0/0 0/0 .text + * __dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm jstudio_tCreateObject_message::~jstudio_tCreateObject_message() { + nofralloc +#include "asm/d/d_demo/func_80037E74.s" +} +#pragma pop + +/* 80037ED4-80038020 032814 014C+00 1/0 0/0 0/0 .text + * create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object + */ +#pragma push +#pragma optimization_level 0 +#pragma optimizewithasm off +asm void jstudio_tCreateObject_message::create(JStudio::TObject** param_0, const JStudio::stb::data::TParse_TBlock_object& param_1) { + nofralloc +#include "asm/d/d_demo/func_80037ED4.s" +} +#pragma pop + +}; // namespace + /* 80037DE4-80037E44 032724 0060+00 1/0 0/0 0/0 .text * __dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv */ #pragma push @@ -858,7 +624,8 @@ asm dDemo_actor_c::dDemo_actor_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_actor_c::~dDemo_actor_c() { +// asm dDemo_actor_c::~dDemo_actor_c() { +extern "C" asm void __dt__13dDemo_actor_cFv() { nofralloc #include "asm/d/d_demo/__dt__13dDemo_actor_cFv.s" } @@ -903,40 +670,40 @@ asm void dDemo_actor_c::getPrm_Morf() { static u8 dummy[20]; /* 80450E00-80450E04 000300 0004+00 2/2 0/0 0/0 .sbss m_system__7dDemo_c */ -u8 dDemo_c::m_system[4]; +dDemo_system_c* dDemo_c::m_system; /* 80450E04-80450E08 000304 0004+00 6/6 3/3 0/0 .sbss m_control__7dDemo_c */ -JStudio::stb::TControl* dDemo_c::m_control; +JStudio::TControl* dDemo_c::m_control; /* 80450E08-80450E0C 000308 0004+00 2/2 0/0 0/0 .sbss m_stage__7dDemo_c */ -u8 dDemo_c::m_stage[4]; +JStudio_JStage::TCreateObject* dDemo_c::m_stage; /* 80450E0C-80450E10 00030C 0004+00 2/2 0/0 0/0 .sbss m_audio__7dDemo_c */ -u8 dDemo_c::m_audio[4]; +JStudio_JAudio2::TCreateObject* dDemo_c::m_audio; /* 80450E10-80450E14 000310 0004+00 2/2 0/0 0/0 .sbss m_particle__7dDemo_c */ -u8 dDemo_c::m_particle[4]; +dDemo_particle_c* dDemo_c::m_particle; /* 80450E14-80450E18 000314 0004+00 2/2 0/0 0/0 .sbss m_message__7dDemo_c */ -u8 dDemo_c::m_message[4]; +jstudio_tCreateObject_message* dDemo_c::m_message; /* 80450E18-80450E1C 000318 0004+00 2/2 0/0 0/0 .sbss m_factory__7dDemo_c */ -u8 dDemo_c::m_factory[4]; +JStudio::TFactory* dDemo_c::m_factory; /* 80450E1C-80450E20 00031C 0004+00 2/2 1/1 0/0 .sbss m_mesgControl__7dDemo_c */ -u8 dDemo_c::m_mesgControl[4]; +jmessage_tControl* dDemo_c::m_mesgControl; /* 80450E20-80450E24 000320 0004+00 5/5 9/9 7/7 .sbss m_object__7dDemo_c */ dDemo_object_c* dDemo_c::m_object; /* 80450E24-80450E28 000324 0004+00 4/4 0/0 0/0 .sbss m_data__7dDemo_c */ -u8 dDemo_c::m_data[4]; +const u8* dDemo_c::m_data; /* 80450E28-80450E2C 000328 0004+00 2/2 0/0 1/1 .sbss m_frame__7dDemo_c */ -u8 dDemo_c::m_frame[4]; +int dDemo_c::m_frame; /* 80450E2C-80450E30 00032C 0004+00 2/2 0/0 0/0 .sbss m_translation__7dDemo_c */ -u8 dDemo_c::m_translation[4]; +cXyz* dDemo_c::m_translation; /* 80450E30-80450E34 000330 0004+00 2/2 0/0 0/0 .sbss m_rotationY__7dDemo_c */ f32 dDemo_c::m_rotationY; @@ -948,13 +715,13 @@ u32 dDemo_c::m_frameNoMsg; s32 dDemo_c::m_mode; /* 80450E3C-80450E40 00033C 0004+00 2/2 1/1 0/0 .sbss m_status__7dDemo_c */ -u8 dDemo_c::m_status[4]; +u32 dDemo_c::m_status; /* 80450E40-80450E44 000340 0002+02 2/2 0/0 0/0 .sbss m_branchType__7dDemo_c */ -u8 dDemo_c::m_branchType[2 + 2 /* padding */]; +u16 dDemo_c::m_branchType; /* 80450E44-80450E48 000344 0004+00 5/5 0/0 0/0 .sbss m_branchData__7dDemo_c */ -u8 dDemo_c::m_branchData[4]; +const u8* dDemo_c::m_branchData; /* 80450E48-80450E4C -00001 0004+00 1/1 0/0 0/0 .sbss None */ /* 80450E48 0001+00 data_80450E48 None */ @@ -1004,14 +771,9 @@ asm void dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* para #pragma pop /* 800387A8-800387EC 0330E8 0044+00 1/1 0/0 0/0 .text branchFile__FPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void branchFile(char const* param_0) { - nofralloc -#include "asm/d/d_demo/branchFile__FPCc.s" +static void branchFile(char const* resName) { + dDemo_c::setBranchData((u8*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName)); } -#pragma pop /* ############################################################################################## */ /* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -1021,13 +783,7 @@ SECTION_DEAD static char const* const stringBase_803797F8 = "-"; #pragma pop /* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata m_branchId__7dDemo_c */ -SECTION_SDATA u16 dDemo_c::m_branchId[1 + 3 /* padding */] = { - 0xFFFF, - /* padding */ - 0x0000, - 0x0000, - 0x0000, -}; +SECTION_SDATA s16 dDemo_c::m_branchId = -1; /* 800387EC-80038920 03312C 0134+00 1/0 0/0 0/0 .text JSGSetData__13dDemo_actor_cFUlPCvUl */ @@ -1159,7 +915,7 @@ static asm void getView() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_camera_c::JSGGetProjectionNear() const { +asm f32 dDemo_camera_c::JSGGetProjectionNear() const { nofralloc #include "asm/d/d_demo/JSGGetProjectionNear__14dDemo_camera_cCFv.s" } @@ -1179,7 +935,7 @@ asm void dDemo_camera_c::JSGSetProjectionNear(f32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_camera_c::JSGGetProjectionFar() const { +asm f32 dDemo_camera_c::JSGGetProjectionFar() const { nofralloc #include "asm/d/d_demo/JSGGetProjectionFar__14dDemo_camera_cCFv.s" } @@ -1203,7 +959,7 @@ SECTION_SDATA2 static f32 lit_4642 = 60.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_camera_c::JSGGetProjectionFovy() const { +asm f32 dDemo_camera_c::JSGGetProjectionFovy() const { nofralloc #include "asm/d/d_demo/JSGGetProjectionFovy__14dDemo_camera_cCFv.s" } @@ -1228,7 +984,7 @@ SECTION_SDATA2 static f32 lit_4655 = 19.0f / 14.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_camera_c::JSGGetProjectionAspect() const { +asm f32 dDemo_camera_c::JSGGetProjectionAspect() const { nofralloc #include "asm/d/d_demo/JSGGetProjectionAspect__14dDemo_camera_cCFv.s" } @@ -1324,7 +1080,7 @@ SECTION_SDATA2 static f32 lit_4710[1 + 1 /* padding */] = { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_camera_c::JSGGetViewRoll() const { +asm f32 dDemo_camera_c::JSGGetViewRoll() const { nofralloc #include "asm/d/d_demo/JSGGetViewRoll__14dDemo_camera_cCFv.s" } @@ -1456,113 +1212,150 @@ asm void dDemo_fog_c::JSGSetColor(_GXColor param_0) { #pragma pop /* 80038F54-80038F70 033894 001C+00 1/1 0/0 0/0 .text __ct__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDemo_object_c::dDemo_object_c() { - nofralloc -#include "asm/d/d_demo/__ct__14dDemo_object_cFv.s" +dDemo_object_c::dDemo_object_c() { + mActorNum = 0; + mLightNum = 0; + mpCamera = NULL; + mpAmbient = NULL; + mpFog = NULL; } -#pragma pop /* 80038F70-80038FC0 0338B0 0050+00 1/1 0/0 0/0 .text __dt__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDemo_object_c::~dDemo_object_c() { - nofralloc -#include "asm/d/d_demo/__dt__14dDemo_object_cFv.s" +dDemo_object_c::~dDemo_object_c() { + remove(); } -#pragma pop /* 80038FC0-80039088 033900 00C8+00 1/1 0/0 0/0 .text appendActor__14dDemo_object_cFP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::appendActor(fopAc_ac_c* param_0) { - nofralloc -#include "asm/d/d_demo/appendActor__14dDemo_object_cFP10fopAc_ac_c.s" +JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) { + dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->mDemoActorId); + + if (demoActor != NULL) { + return demoActor; + } + + if (mActorNum >= 32) { + return NULL; + } + + demoActor = new dDemo_actor_c(); + if (demoActor == NULL) { + return NULL; + } + + u8 curActorNum = mActorNum; + mActorNum++; + mpActors[curActorNum] = demoActor; + demoActor->setActor(p_actor); + p_actor->mDemoActorId = mActorNum; + + if (p_actor->field_0x524 != NULL) { + demoActor->setModel((J3DModel*)p_actor->field_0x524); + } + + return demoActor; } -#pragma pop /* 80039088-800390AC 0339C8 0024+00 2/2 6/6 7/7 .text getActor__14dDemo_object_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDemo_actor_c* dDemo_object_c::getActor(u8 param_0) { - nofralloc -#include "asm/d/d_demo/getActor__14dDemo_object_cFUc.s" +dDemo_actor_c* dDemo_object_c::getActor(u8 actorId) { + if (actorId == 0 || actorId > 32) { + return NULL; + } + + return mpActors[actorId - 1]; } -#pragma pop /* 800390AC-80039128 0339EC 007C+00 1/1 0/0 0/0 .text createCamera__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::createCamera() { - nofralloc -#include "asm/d/d_demo/createCamera__14dDemo_object_cFv.s" +JStage::TObject* dDemo_object_c::createCamera() { + if (mpCamera != NULL) { + return mpCamera; + } + + mpCamera = new dDemo_camera_c(); + return mpCamera; } -#pragma pop /* 80039128-8003913C 033A68 0014+00 0/0 3/3 0/0 .text getActiveCamera__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::getActiveCamera() { - nofralloc -#include "asm/d/d_demo/getActiveCamera__14dDemo_object_cFv.s" +JStage::TObject* dDemo_object_c::getActiveCamera() { + if (mpCamera != NULL) { + return mpCamera; + } + + return NULL; } -#pragma pop /* 8003913C-800391B8 033A7C 007C+00 1/1 0/0 0/0 .text createAmbient__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::createAmbient() { - nofralloc -#include "asm/d/d_demo/createAmbient__14dDemo_object_cFv.s" +JStage::TObject* dDemo_object_c::createAmbient() { + if (mpAmbient != NULL) { + return mpAmbient; + } + + mpAmbient = new dDemo_ambient_c(); + return mpAmbient; } -#pragma pop /* 800391B8-80039258 033AF8 00A0+00 1/1 0/0 0/0 .text appendLight__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::appendLight() { - nofralloc -#include "asm/d/d_demo/appendLight__14dDemo_object_cFv.s" +JStage::TObject* dDemo_object_c::appendLight() { + if (mLightNum >= 8) { + return NULL; + } + + dDemo_light_c* demoLight = new dDemo_light_c(); + if (demoLight == NULL) { + return NULL; + } + + u8 curLightNum = mLightNum; + mLightNum++; + mpLights[curLightNum] = demoLight; + + return demoLight; } -#pragma pop /* 80039258-800392D4 033B98 007C+00 1/1 0/0 0/0 .text createFog__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::createFog() { - nofralloc -#include "asm/d/d_demo/createFog__14dDemo_object_cFv.s" +JStage::TObject* dDemo_object_c::createFog() { + if (mpFog != NULL) { + return mpFog; + } + + mpFog = new dDemo_fog_c(); + return mpFog; } -#pragma pop /* 800392D4-80039408 033C14 0134+00 2/2 0/0 0/0 .text remove__14dDemo_object_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_object_c::remove() { - nofralloc -#include "asm/d/d_demo/remove__14dDemo_object_cFv.s" +void dDemo_object_c::remove() { + while (mActorNum != 0) { + delete mpActors[--mActorNum]; + } + + if (mpCamera != NULL) { + delete mpCamera; + mpCamera = NULL; + } + + if (mpAmbient != NULL) { + delete mpAmbient; + mpAmbient = NULL; + } + + while (mLightNum != 0) { + delete mpLights[--mLightNum]; + } + + if (mpFog != NULL) { + delete mpFog; + mpFog = NULL; + } } -#pragma pop /* 80039408-80039468 033D48 0060+00 1/0 0/0 0/0 .text __dt__11dDemo_fog_cFv */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_fog_c::~dDemo_fog_c() { +// asm dDemo_fog_c::~dDemo_fog_c() { +extern "C" asm void __dt__11dDemo_fog_cFv() { nofralloc #include "asm/d/d_demo/__dt__11dDemo_fog_cFv.s" } @@ -1572,7 +1365,8 @@ asm dDemo_fog_c::~dDemo_fog_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_light_c::~dDemo_light_c() { +// asm dDemo_light_c::~dDemo_light_c() { +extern "C" asm void __dt__13dDemo_light_cFv() { nofralloc #include "asm/d/d_demo/__dt__13dDemo_light_cFv.s" } @@ -1582,36 +1376,80 @@ asm dDemo_light_c::~dDemo_light_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_ambient_c::~dDemo_ambient_c() { +// asm dDemo_ambient_c::~dDemo_ambient_c() { +extern "C" asm void __dt__15dDemo_ambient_cFv() { nofralloc #include "asm/d/d_demo/__dt__15dDemo_ambient_cFv.s" } #pragma pop -/* ############################################################################################## */ -/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803797FA = "d_act"; -#pragma pop - /* 80039528-80039678 033E68 0150+00 1/0 0/0 0/0 .text * JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_system_c::JSGFindObject(JStage::TObject** param_0, char const* param_1, - JStage::TEObject param_2) const { - nofralloc -#include "asm/d/d_demo/JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject.s" +bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorName, + JStage::TEObject objType) const { + if (mpObject == NULL) { + return true; + } + + if (objType == JStage::TOBJ_ACTOR || objType == JStage::TOBJ_ACTOR_UNK) { + fopAc_ac_c* actor = fopAcM_searchFromName(actorName, 0, 0); + + if (actor == NULL) { + if (objType == JStage::TOBJ_ACTOR && !strncmp(actorName, "d_act", 5)) { + actor = (fopAc_ac_c*)fopAcM_fastCreate(actorName, 0, NULL, -1, NULL, NULL, NULL, NULL); + if (actor == NULL) { + return true; + } + fopAcM_setStageLayer(actor); + } else { + return true; + } + } + + *p_TObj = mpObject->appendActor(actor); + } else if (objType == JStage::TOBJ_CAMERA) { + *p_TObj = mpObject->createCamera(); + } else if (objType == JStage::TOBJ_AMBIENT) { + *p_TObj = mpObject->createAmbient(); + } else if (objType == JStage::TOBJ_LIGHT) { + *p_TObj = mpObject->appendLight(); + } else if (objType == JStage::TOBJ_FOG) { + *p_TObj = mpObject->createFog(); + } + + return *p_TObj == NULL; } -#pragma pop /* ############################################################################################## */ /* 80451DE0-80451DE8 0003E0 0008+00 1/1 0/0 0/0 .sdata2 @5123 */ -SECTION_SDATA2 static f64 lit_5123 = 0.03333333507180214; +SECTION_SDATA2 static f64 lit_5123 = 1.0 / 29.999998435378155; /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ +#ifdef NONMATCHING +void dDemo_c::create() { + m_system = new dDemo_system_c(); + m_control = new JStudio::TControl(); + m_mesgControl = new jmessage_tControl(); + m_stage = new JStudio_JStage::TCreateObject(m_system); + m_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system); + m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system); + m_message = new jstudio_tCreateObject_message(); + m_factory = new JStudio::TFactory(); + m_object = new dDemo_object_c(); + + m_control->setSecondPerFrame(1.0 / 29.999998435378155); + m_control->setFactory(m_factory); + m_control->appendCreateObject(m_stage); + m_control->appendCreateObject(m_audio); + m_control->appendCreateObject(m_particle); + m_control->appendCreateObject(m_message); + + m_system->setObject(m_object); + m_data = NULL; + m_mode = 0; + reset(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1620,6 +1458,7 @@ asm void dDemo_c::create() { #include "asm/d/d_demo/create__7dDemo_cFv.s" } #pragma pop +#endif /* 80039910-80039AAC 034250 019C+00 0/0 1/1 0/0 .text remove__7dDemo_cFv */ #pragma push @@ -1635,7 +1474,8 @@ asm void dDemo_c::remove() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_system_c::~dDemo_system_c() { +// asm dDemo_system_c::~dDemo_system_c() { +extern "C" asm void __dt__14dDemo_system_cFv() { nofralloc #include "asm/d/d_demo/__dt__14dDemo_system_cFv.s" } @@ -1645,105 +1485,136 @@ asm dDemo_system_c::~dDemo_system_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm jmessage_tControl::~jmessage_tControl() { +// asm jmessage_tControl::~jmessage_tControl() { +extern "C" asm void __dt__17jmessage_tControlFv() { nofralloc #include "asm/d/d_demo/__dt__17jmessage_tControlFv.s" } #pragma pop -/* ############################################################################################## */ -/* 803797F8-803797F8 005E58 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379800 = "デモデータ読み込みエラー！！\n"; -#pragma pop - -/* 8042465C-80424668 05137C 000C+00 1/1 0/0 0/0 .bss @5233 */ -static u8 lit_5233[12]; - -/* 80424668-80424678 051388 000C+04 1/1 0/0 0/0 .bss l_translation$5232 */ -static f32 l_translation[3 + 1 /* padding */]; - -/* 80450E50-80450E58 000350 0008+00 1/1 0/0 0/0 .sbss None */ -static u8 data_80450E50[8]; - /* 80039B6C-80039CF8 0344AC 018C+00 1/1 1/1 0/0 .text start__7dDemo_cFPCUcP4cXyzf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::start(u8 const* param_0, cXyz* param_1, f32 param_2) { - nofralloc -#include "asm/d/d_demo/start__7dDemo_cFPCUcP4cXyzf.s" +int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) { + m_control->reset(); + JStudio::TParse parser(m_control); + + if (!parser.parse(p_data, 0)) { + // "Demo data read error!!\n" + OSReport_Error("デモデータ読み込みエラー！！\n"); + return 0; + } + + if (m_data == NULL) { + m_control->setSuspend(0); + } + + m_control->forward(0); + m_translation = p_translation; + + if (p_translation != NULL) { + static cXyz l_translation; + l_translation = *m_translation; + m_translation = &l_translation; + m_rotationY = rotationY; + + m_control->transform_enable(true); + m_control->transform_setOrigin(*m_translation, m_rotationY); + } + + m_mode = 1; + reset(); + + m_data = NULL; + m_branchData = (u8*)p_data; + return 1; } -#pragma pop /* 80039CF8-80039D4C 034638 0054+00 1/1 2/2 0/0 .text end__7dDemo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::end() { - nofralloc -#include "asm/d/d_demo/end__7dDemo_cFv.s" +void dDemo_c::end() { + m_control->destroyObject_all(); + m_object->remove(); + m_data = NULL; + m_mode = 0; } -#pragma pop /* 80039D4C-80039DA4 03468C 0058+00 1/1 0/0 0/0 .text branch__7dDemo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::branch() { - nofralloc -#include "asm/d/d_demo/branch__7dDemo_cFv.s" -} -#pragma pop +void dDemo_c::branch() { + m_control->destroyObject_all(); + const u8* branchData = m_branchData; + m_branchData = NULL; -/* ############################################################################################## */ -/* 80451DE8-80451DF0 0003E8 0004+04 1/1 0/0 0/0 .sdata2 @5322 */ -SECTION_SDATA2 static f32 lit_5322[1 + 1 /* padding */] = { - 1.0f / 10.0f, - /* padding */ - 0.0f, -}; + start(branchData, m_translation, m_rotationY); +} /* 80039DA4-80039EDC 0346E4 0138+00 0/0 1/1 0/0 .text update__7dDemo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::update() { - nofralloc -#include "asm/d/d_demo/update__7dDemo_cFv.s" +int dDemo_c::update() { + if (m_data == NULL) { + if (m_branchData == NULL) { + return 0; + } else { + m_data = m_branchData; + m_branchData = NULL; + return 1; + } + } else if (isStatus(1)) { + daMP_c::daMP_c_THPPlayerPlay(); + if (isStatus(1)) { + return 1; + } + } + + if (m_control->forward(1) != 0) { + m_frame++; + + if (m_control->getSuspend() <= 0) { + m_frameNoMsg++; + } + } else { + m_mode = 2; + } + + if (m_branchData != NULL) { + branch(); + } + + if (dComIfGs_staffroll_next_go_check() != 0) { + dScnKy_env_light_c* env_light = &g_env_light; + + if (dComIfGs_staffroll_next_go_check() > 10) { + env_light->field_0x130c = 0; + m_mode = 2; + } else { + if (dComIfGs_staffroll_next_go_check() == 1) { + mDoGph_gInf_c::fadeOut(0.1f, g_blackColor); + } + env_light->field_0x130c++; + } + } + + return 1; } -#pragma pop /* 80039EDC-80039EEC 03481C 0010+00 1/1 0/0 0/0 .text setBranchType__7dDemo_cFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::setBranchType(u16 param_0) { - nofralloc -#include "asm/d/d_demo/setBranchType__7dDemo_cFUs.s" +void dDemo_c::setBranchType(u16 type) { + m_branchType = type; + m_branchId = -1; } -#pragma pop /* 80039EEC-80039F04 03482C 0018+00 0/0 2/2 0/0 .text setBranchId__7dDemo_cFUss */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::setBranchId(u16 param_0, s16 param_1) { - nofralloc -#include "asm/d/d_demo/setBranchId__7dDemo_cFUss.s" +void dDemo_c::setBranchId(u16 param_0, s16 branchId) { + if (param_0 != m_branchType) { + return; + } + + m_branchId = branchId; } -#pragma pop /* 80039F04-80039F1C 034844 0018+00 2/2 0/0 0/0 .text reset__7dDemo_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDemo_c::reset() { - nofralloc -#include "asm/d/d_demo/reset__7dDemo_cFv.s" +void dDemo_c::reset() { + m_frame = 0; + m_frameNoMsg = 0; + m_status = 0; + m_branchData = NULL; } -#pragma pop /* 80039F1C-80039F9C 03485C 0080+00 1/0 0/0 0/0 .text emitter_create__16dDemo_particle_cFUl */ #pragma push @@ -1759,7 +1630,8 @@ asm void dDemo_particle_c::emitter_create(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_particle_c::~dDemo_particle_c() { +// asm dDemo_particle_c::~dDemo_particle_c() { +extern "C" asm void __dt__16dDemo_particle_cFv() { nofralloc #include "asm/d/d_demo/__dt__16dDemo_particle_cFv.s" } @@ -1769,7 +1641,8 @@ asm dDemo_particle_c::~dDemo_particle_c() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDemo_camera_c::~dDemo_camera_c() { +// asm dDemo_camera_c::~dDemo_camera_c() { +extern "C" asm void __dt__14dDemo_camera_cFv() { nofralloc #include "asm/d/d_demo/__dt__14dDemo_camera_cFv.s" } @@ -1802,7 +1675,7 @@ asm void dDemo_actor_c::JSGGetNodeTransformation(u32 param_0, f32 (*param_1)[4]) #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_actor_c::JSGGetAnimationFrameMax() const { +asm f32 dDemo_actor_c::JSGGetAnimationFrameMax() const { nofralloc #include "asm/d/d_demo/JSGGetAnimationFrameMax__13dDemo_actor_cCFv.s" } @@ -1813,7 +1686,7 @@ asm void dDemo_actor_c::JSGGetAnimationFrameMax() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDemo_actor_c::JSGGetTextureAnimationFrameMax() const { +asm f32 dDemo_actor_c::JSGGetTextureAnimationFrameMax() const { nofralloc #include "asm/d/d_demo/JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv.s" } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 936ab7279bc..0513dd6d3d2 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -10,27 +10,14 @@ #include "dolphin/mtx/mtx44.h" #include "dolphin/mtx/mtxvec.h" #include "dolphin/types.h" +#include "m_Do/m_Do_mtx.h" +#include "m_Do/m_Do_lib.h" +#include "m_Do/m_Do_graphic.h" // // Types: // -struct mDoMtx_stack_c { - /* 8000CE38 */ void scaleM(f32, f32, f32); - - static u8 now[48]; -}; - -struct mDoLib_clipper { - static u8 mClipper[92]; - static f32 mSystemFar; - static f32 mFovyRate; -}; - -struct mDoGph_gInf_c { - static u8 mBackColor[4]; -}; - struct dDlst_effectLine_c { /* 80053E9C */ void draw(); /* 800541F4 */ void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32); @@ -52,12 +39,6 @@ struct dDlst_2DT_c { /* 80051F98 */ void draw(); }; -struct dDlst_2DT2_c { - /* 80052354 */ void draw(); - /* 80052B00 */ dDlst_2DT2_c(); - /* 80052B4C */ void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32); -}; - struct dDlst_2DQuad_c { /* 80051CF0 */ void draw(); }; @@ -88,11 +69,6 @@ struct ShdwDrawPoly_c { /* 80054A6C */ ~ShdwDrawPoly_c(); }; -struct J3DUClipper { - /* 8027378C */ void calcViewFrustum(); - /* 80273A44 */ void clip(f32 const (*)[4], Vec*, Vec*) const; -}; - // // Forward References: // @@ -230,7 +206,6 @@ extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); extern "C" void draw__13J3DDrawBufferCFv(); extern "C" void GXClearVtxDesc(); extern "C" void GXPixModeSync(); -extern "C" void GXPeekZ(); extern "C" void GXGetTexObjWidth(); extern "C" void GXGetTexObjHeight(); extern "C" void GXGetTexObjWrapS(); @@ -256,7 +231,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__9J3DPacket[5]; @@ -279,23 +253,23 @@ extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // /* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */ -void dDlst_window_c::setViewPort(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, - f32 param_5) { - mViewport = param_0; - field_0x04 = param_1; - field_0x08 = param_2; - field_0x0C = param_3; - field_0x10 = param_4; - field_0x14 = param_5; +void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, + f32 farZ) { + mXOrig = xOrig; + mYOrig = yOrig; + mWidth = width; + mHeight = height; + mNearZ = nearZ; + mFarZ = farZ; } /* 80051ADC-80051AF0 04C41C 0014+00 0/0 4/4 0/0 .text setScissor__14dDlst_window_cFffff */ -void dDlst_window_c::setScissor(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { - mScissor = param_0; - field_0x1c = param_1; - field_0x20 = param_2; - field_0x24 = param_3; +void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) { + mScissorXOrig = xOrig; + mScissorYOrig = yOrig; + mScissorWidth = width; + mScissorHeight = height; } /* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text draw__13dDlst_2DTri_cFv */ @@ -374,7 +348,8 @@ SECTION_SDATA2 static f32 lit_4270 = 1.0f; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_2DT2_c::draw() { +// asm void dDlst_2DT2_c::draw() { +extern "C" asm void draw__12dDlst_2DT2_cFv() { nofralloc #include "asm/d/d_drawlist/draw__12dDlst_2DT2_cFv.s" } @@ -1944,7 +1919,7 @@ SECTION_DATA static u8 l_matDL[123 + 1 /* padding */] = { }; /* 803A8D7C-803A8D8C 005E9C 0010+00 1/1 0/0 0/0 .data l_imageDrawColor$5405 */ -SECTION_DATA static _GXColor l_imageDrawColor[4] = {{0xFF, 0x00, 0x00, 0x00}, +SECTION_DATA static GXColor l_imageDrawColor[4] = {{0xFF, 0x00, 0x00, 0x00}, {0x00, 0xFF, 0x00, 0x00}, {0x00, 0x00, 0xFF, 0x00}, {0x00, 0x00, 0x00, 0xFF}}; @@ -2050,18 +2025,10 @@ SECTION_DATA extern void* __vt__12dDlst_2DT2_c[3] = { (void*)draw__12dDlst_2DT2_cFv, }; -/* 80456B68-80456B70 000008 0004+04 1/1 0/0 0/0 .sbss2 @4275 */ -SECTION_SBSS2 static u8 lit_4275[4 + 4 /* padding */]; - /* 80052B00-80052B4C 04D440 004C+00 1/1 0/0 0/0 .text __ct__12dDlst_2DT2_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dDlst_2DT2_c::dDlst_2DT2_c() { - nofralloc -#include "asm/d/d_drawlist/__ct__12dDlst_2DT2_cFv.s" +dDlst_2DT2_c::dDlst_2DT2_c() { + field_0x40 = (GXColor){0, 0, 0, 0}; } -#pragma pop /* ############################################################################################## */ /* 8045202C-80452030 00062C 0004+00 1/1 0/0 0/0 .sdata2 @4284 */ @@ -2693,35 +2660,43 @@ asm void dDlst_shadowControl_c::setSimpleTex(ResTIMG const* param_0) { #pragma pop /* 80056018-80056080 050958 0068+00 0/0 3/3 9/9 .text newData__13dDlst_peekZ_cFssPUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_peekZ_c::newData(s16 param_0, s16 param_1, u32* param_2) { - nofralloc -#include "asm/d/d_drawlist/newData__13dDlst_peekZ_cFssPUl.s" +int dDlst_peekZ_c::newData(s16 x, s16 y, u32* dst) { + if (mCount >= 0x40 || x < 0 || x > 607 || y < 0 || y > 447) { + return 0; + } + + dDlst_peekZ_entry* entry = &mEntries[mCount]; + entry->x = x; + entry->y = y; + entry->dst = dst; + mCount++; + return 1; } -#pragma pop /* 80056080-800560F0 0509C0 0070+00 0/0 1/1 0/0 .text peekData__13dDlst_peekZ_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDlst_peekZ_c::peekData() { - nofralloc -#include "asm/d/d_drawlist/peekData__13dDlst_peekZ_cFv.s" +void dDlst_peekZ_c::peekData() { + dDlst_peekZ_entry* entry = mEntries; + + for (int i = 0; i < mCount; i++) { + GXPeekZ(entry->x, entry->y, entry->dst); + entry++; + } + + mCount = 0; } -#pragma pop /* 800560F0-800561C8 050A30 00D8+00 0/0 1/1 0/0 .text __ct__12dDlst_list_cFv */ #ifdef NONMATCHING dDlst_list_c::dDlst_list_c() { - field_0x68 = &field_0x64; - field_0xb0 = &field_0xac; - field_0x1b8 = &field_0x1b4; - field_0x240 = &field_0x23c; - J3DDrawBuffer** tmp = &mOpaListSky; - for (int i = 0; i < 0x15; i++) { - *(tmp + i) = NULL; + mpCopy2DSet[1] = mpCopy2DSet[0]; + mp2DOpaTopSet[1] = mp2DOpaTopSet[0]; + mp2DOpaSet[1] = mp2DOpaSet[0]; + mp2DXluSet[1] = mp2DXluSet[0]; + + J3DDrawBuffer** buffer = mDrawBuffers; + for (int i = 0; i < 21; i++) { + *buffer = NULL; + buffer++; } } #else @@ -2749,7 +2724,8 @@ asm mDoExt_3DlineMatSortPacket::mDoExt_3DlineMatSortPacket() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dDlst_shadowReal_c::~dDlst_shadowReal_c() { +// asm dDlst_shadowReal_c::~dDlst_shadowReal_c() { +extern "C" asm void __dt__18dDlst_shadowReal_cFv() { nofralloc #include "asm/d/d_drawlist/__dt__18dDlst_shadowReal_cFv.s" } @@ -2792,57 +2768,33 @@ dDlst_shadowSimple_c::dDlst_shadowSimple_c() { /* ############################################################################################## */ /* 8037A178-8037A1A4 0067D8 002A+02 1/1 0/0 0/0 .rodata l_drawlistSize$5656 */ -SECTION_RODATA static u8 const l_drawlistSize[42 + 2 /* padding */] = { - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x80, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x01, - 0x00, - 0x80, - 0x01, - 0x00, - 0x00, - 0x01, - 0x01, - 0x00, - 0x00, - 0x01, - 0x00, - 0x20, - 0x00, - 0x10, - 0x00, - 0x10, - 0x00, - 0x20, - 0x00, - 0x20, - 0x01, - 0x00, - 0x00, - 0x01, - 0x00, - 0x04, - 0x00, - 0x04, - /* padding */ - 0x00, - 0x00, +SECTION_RODATA static u16 const l_drawlistSize[21] = { + 0x0001, + 0x0001, + 0x0001, + 0x0080, + 0x0001, + 0x0001, + 0x0001, + 0x0080, + 0x0100, + 0x0001, + 0x0100, + 0x0001, + 0x0020, + 0x0010, + 0x0010, + 0x0020, + 0x0020, + 0x0100, + 0x0001, + 0x0004, + 0x0004, }; COMPILER_STRIP_GATE(0x8037A178, &l_drawlistSize); /* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata l_nonSortId$5662 */ -SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = { +SECTION_RODATA static u8 const l_nonSortId[9] = { 0x00, 0x01, 0x02, @@ -2852,27 +2804,55 @@ SECTION_RODATA static u8 const l_nonSortId[9 + 3 /* padding */] = { 0x09, 0x12, 0x0D, - /* padding */ - 0x00, - 0x00, - 0x00, }; COMPILER_STRIP_GATE(0x8037A1A4, &l_nonSortId); /* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2 l_zSortId$5668 */ -SECTION_SDATA2 static u8 l_zSortId[6 + 2 /* padding */] = { +SECTION_SDATA2 static u8 l_zSortId[6] = { 0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x11, - /* padding */ - 0x00, - 0x00, }; /* 80056390-8005648C 050CD0 00FC+00 0/0 1/1 0/0 .text init__12dDlst_list_cFv */ +#ifdef NONMATCHING +void dDlst_list_c::init() { + J3DDrawBuffer** buffer = mDrawBuffers; + const u16* size = l_drawlistSize; + + for (int i = 0; i < 21; i++) { + u32 bufSize = *size; + size++; + + *buffer = J3DDrawBuffer__create(bufSize); + buffer++; + } + + const u8* nonsortID = l_nonSortId; + for (int i = 0; i < 9; i++) { + mDrawBuffers[*nonsortID]->setNonSort(); + nonsortID++; + } + + u8* zsortID = l_zSortId; + for (int i = 0; i < 6; i++) { + mDrawBuffers[*zsortID]->setZSort(); + zsortID++; + } + + setOpaList(); + setXluList(); + mpCopy2DSet[0] = mpCopy2DDraw[0]; + mp2DOpaTopSet[0] = mp2DOpaTopDraw[0]; + mp2DOpaSet[0] = mp2DOpaDraw[0]; + mp2DXluSet[0] = mp2DXluDraw[0]; + + mShadowControl.init(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2881,6 +2861,7 @@ asm void dDlst_list_c::init() { #include "asm/d/d_drawlist/init__12dDlst_list_cFv.s" } #pragma pop +#endif /* 8005648C-80056538 050DCC 00AC+00 0/0 1/1 0/0 .text __dt__12dDlst_list_cFv */ #pragma push @@ -2937,43 +2918,32 @@ void dDlst_list_c::drawXluDrawList(J3DDrawBuffer* pDrawBuf) { /* 8005674C-80056770 05108C 0024+00 0/0 1/1 0/0 .text drawOpaListItem3d__12dDlst_list_cFv */ void dDlst_list_c::drawOpaListItem3d() { - drawOpaDrawList(mOpaListItem3d); + drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_ITEM3D]); } /* 80056770-80056794 0510B0 0024+00 0/0 1/1 0/0 .text drawXluListItem3d__12dDlst_list_cFv */ void dDlst_list_c::drawXluListItem3d() { - drawXluDrawList(mXluListItem3d); + drawXluDrawList(mDrawBuffers[DB_XLU_LIST_ITEM3D]); } /* 80056794-800567C4 0510D4 0030+00 2/2 35/35 6/6 .text * set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c */ -#ifdef NONMATCHING -int dDlst_list_c::set(dDlst_base_c**& param_0, dDlst_base_c**& param_1, dDlst_base_c* param_2) { - if (*param_0 >= *param_1) { +int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base_c* p_newDlst) { + if (p_start >= p_end) { return 0; } - *param_0 = param_2; - *param_0++; + *p_start = p_newDlst; + *p_start++; return 1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dDlst_list_c::set(dDlst_base_c**& param_0, dDlst_base_c**& param_1, dDlst_base_c* param_2) { - nofralloc -#include "asm/d/d_drawlist/set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c.s" -} -#pragma pop -#endif /* 800567C4-8005681C 051104 0058+00 0/0 1/1 0/0 .text * draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c */ -void dDlst_list_c::draw(dDlst_base_c** pStart, dDlst_base_c** pEnd) { - for (; pStart < pEnd; pStart++) { - dDlst_base_c* base = *pStart; - base->draw(); +void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) { + for (; p_start < p_end; p_start++) { + dDlst_base_c* dlst = *p_start; + dlst->draw(); } } @@ -2987,18 +2957,13 @@ SECTION_DEAD static char const* const pad_8037A1BC = "\0\0\0"; #pragma pop /* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss mWipeDlst__12dDlst_list_c */ -u8 dDlst_list_c::mWipeDlst[72]; +dDlst_2DT2_c dDlst_list_c::mWipeDlst; /* 8045065C-80450660 0000DC 0004+00 1/1 0/0 0/0 .sdata mWipeColor__12dDlst_list_c */ -SECTION_SDATA u8 dDlst_list_c::mWipeColor[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_SDATA GXColor dDlst_list_c::mWipeColor = {0, 0, 0, 0}; /* 80450ED0-80450ED4 0003D0 0004+00 2/2 1/1 0/0 .sbss None */ -u8 data_80450ED0; +u8 dDlst_list_c::mWipe; /* 80450ED4-80450ED8 0003D4 0004+00 2/2 1/1 0/0 .sbss mWipeRate__12dDlst_list_c */ f32 dDlst_list_c::mWipeRate; @@ -3055,7 +3020,8 @@ asm void dDlst_list_c::calcWipe() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDlst_shadowRealPoly_c::getTri() { +// asm void dDlst_shadowRealPoly_c::getTri() { +extern "C" asm void getTri__22dDlst_shadowRealPoly_cFv() { nofralloc #include "asm/d/d_drawlist/getTri__22dDlst_shadowRealPoly_cFv.s" } @@ -3073,21 +3039,6 @@ extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen() { /* empty function */ } -/* 800569B4-800569DC 0512F4 0028+00 0/0 1/0 0/0 .text __sinit_d_drawlist_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_drawlist_cpp() { - nofralloc -#include "asm/d/d_drawlist/__sinit_d_drawlist_cpp.s" -} -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x800569B4, __sinit_d_drawlist_cpp); -#pragma pop - /* ############################################################################################## */ /* 803A8E68-803A8E74 005F88 000C+00 0/0 0/0 0/0 .data __vt__11dDlst_2DT_c */ SECTION_DATA extern void* __vt__11dDlst_2DT_c[3] = { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index e3f7aba547a..6385a1aa39b 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -77,10 +77,18 @@ struct dMenu_save_c { /* 801F69FC */ void _draw2(); }; -struct dGov_HIO_c { +class dGov_HIO_c { +public: /* 8019AFE0 */ dGov_HIO_c(); - /* 8019C06C */ ~dGov_HIO_c(); -}; + /* 8019C06C */ virtual ~dGov_HIO_c(); + + /* 0x04 */ s8 field_0x4; + /* 0x08 */ f32 mScale; + /* 0x0C */ f32 mAlpha; + /* 0x10 */ f32 mAnimSpeed; + /* 0x14 */ GXColor mBlack; + /* 0x18 */ GXColor mWhite; +}; // Size: 0x1C struct dDlst_base_c {}; @@ -919,7 +927,8 @@ asm void d_GameOver_Delete(unsigned int& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm dGov_HIO_c::~dGov_HIO_c() { +// asm dGov_HIO_c::~dGov_HIO_c() { +extern "C" asm void __dt__10dGov_HIO_cFv() { nofralloc #include "asm/d/d_gameover/__dt__10dGov_HIO_cFv.s" } diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index 5f02f5166d2..c916527623f 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -6,40 +6,7 @@ #include "d/d_kantera_icon_meter.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__15dKantera_icon_cFv(); -extern "C" void __dt__15dKantera_icon_cFv(); -extern "C" void initiate__15dKantera_icon_cFv(); -extern "C" void setAlphaRate__15dKantera_icon_cFf(); -extern "C" void setPos__15dKantera_icon_cFff(); -extern "C" void setScale__15dKantera_icon_cFff(); -extern "C" void setNowGauge__15dKantera_icon_cFUsUs(); -extern "C" void draw__19dDlst_KanteraIcon_cFv(); -extern "C" void __dt__19dDlst_KanteraIcon_cFv(); -extern "C" extern char const* const d_d_kantera_icon_meter__stringBase0; - -// -// External References: -// - -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void __ct__9J2DScreenFv(); -extern "C" void setPriority__9J2DScreenFPCcUlP10JKRArchive(); -extern "C" void draw__9J2DScreenFffPC14J2DGrafContext(); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_drawHIO[3880]; - -// -// Declarations: -// +#include "d/meter/d_meter_HIO.h" /* 801AE938-801AE974 1A9278 003C+00 0/0 3/3 0/0 .text __ct__15dKantera_icon_cFv */ dKantera_icon_c::dKantera_icon_c() { @@ -80,38 +47,14 @@ void dKantera_icon_c::setAlphaRate(f32 alphaRate) { } /* 801AEBA0-801AEBF4 1A94E0 0054+00 0/0 3/3 0/0 .text setPos__15dKantera_icon_cFff */ -// need g_drawHIO global setup -#ifdef NONMATCHING void dKantera_icon_c::setPos(f32 x, f32 y) { - mpParent->translate(x + g_drawHIO.mLanternIconMeterPosX, y + g_drawHIO.mLanternIconMeterPosY) + mpParent->translate(x + g_drawHIO.mLanternIconMeterPosX, y + g_drawHIO.mLanternIconMeterPosY); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKantera_icon_c::setPos(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_kantera_icon_meter/setPos__15dKantera_icon_cFff.s" -} -#pragma pop -#endif /* 801AEBF4-801AEC44 1A9534 0050+00 0/0 4/4 0/0 .text setScale__15dKantera_icon_cFff */ -// need g_drawHIO global setup -#ifdef NONMATCHING void dKantera_icon_c::setScale(f32 h, f32 v) { - mpParent->scale(h * g_drawHIO.mLanternIconMeterSize, v * g_drawHIO.mLanternIconMeterSize) + mpParent->scale(h * g_drawHIO.mLanternIconMeterSize, v * g_drawHIO.mLanternIconMeterSize); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKantera_icon_c::setScale(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/d_kantera_icon_meter/setScale__15dKantera_icon_cFff.s" -} -#pragma pop -#endif /* 801AEC44-801AECB8 1A9584 0074+00 0/0 4/4 0/0 .text setNowGauge__15dKantera_icon_cFUsUs */ diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index e2bd290dcb6..0b6e98cbfbc 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -21,8 +21,6 @@ // Forward References: // -extern "C" static bool func_80041480(); -extern "C" static void func_80041488(); extern "C" void __ct__14dEvt_control_cFv(); extern "C" void __ct__12dEvt_order_cFv(); extern "C" void orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv(); @@ -149,13 +147,14 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* 80041480-80041488 03BDC0 0008+00 1/1 0/0 0/0 .text event_debug_evnt__21@unnamed@d_event_cpp@Fv */ -static bool func_80041480() { +namespace { +static bool event_debug_evnt() { return false; } /* 80041488-80041580 03BDC8 00F8+00 1/1 0/0 0/0 .text * clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv */ -static void func_80041488() { +static void clear_tmpflag_for_message() { dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11]); dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[12]); dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[13]); @@ -167,32 +166,31 @@ static void func_80041488() { dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[54]); dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[55]); } +}; // namespace dEvt_control_c::dEvt_control_c() { remove(); } -dEvt_order_c::dEvt_order_c() { - /* empty function */ -} +dEvt_order_c::dEvt_order_c() {} /* 800415D8-80041668 03BF18 0090+00 1/1 0/0 0/0 .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */ -s32 dEvt_control_c::orderOld(u16 param_0, u16 param_1, u16 param_2, u16 param_3, void* param_4, - void* param_5, void const* param_6) { - int eventIdx = i_dComIfGp_getEventManager().getEventIdx((char*)param_6, -1, -1); - return order(param_0, param_1, param_2, param_3, param_4, param_5, eventIdx, -1); +s32 dEvt_control_c::orderOld(u16 eventType, u16 priority, u16 flag, u16 hind, void* param_4, + void* param_5, void const* eventName) { + int eventIdx = i_dComIfGp_getEventManager().getEventIdx((char*)eventName, -1, -1); + return order(eventType, priority, flag, hind, param_4, param_5, eventIdx, -1); } /* 80041668-80041804 03BFA8 019C+00 3/3 13/13 0/0 .text order__14dEvt_control_cFUsUsUsUsPvPvsUc */ -s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, void* param_4, +s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 hind, void* param_4, void* param_5, s16 eventID, u8 infoIdx) { if (!(flag & 0x400) && infoIdx != 0xFF) { int roomNo = dComIfGp_roomControl_getStayNo(); dStage_MapEvent_dt_c* data = searchMapEventData(infoIdx, roomNo); - if (data != NULL && data->field_0x1B != 0xFF) { - if (dComIfGs_isSwitch(data->field_0x1B, roomNo)) { + if (data != NULL && data->mSwitch != 0xFF) { + if (dComIfGs_isSwitch(data->mSwitch, roomNo)) { return 0; } } @@ -209,7 +207,7 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, vo order->mActor1 = (fopAc_ac_c*)param_4; order->mActor2 = (fopAc_ac_c*)param_5; order->mEventId = eventID; - order->field_0x04 = param_3; + order->mHindFlag = hind; order->mEventInfoIdx = infoIdx; if (order->mPriority == 0) { @@ -217,27 +215,27 @@ s32 dEvt_control_c::order(u16 eventType, u16 priority, u16 flag, u16 param_3, vo } if (mNum == 0) { - field_0xe3 = 0; + mOrderIdx = 0; order->mNextOrderIdx = -1; } else { - dEvt_order_c* order2; - int tmp_e3 = field_0xe3; - order2 = &mOrder[tmp_e3]; + dEvt_order_c* curOrder; + int curOrderIdx = mOrderIdx; + curOrder = &mOrder[curOrderIdx]; - if (order->mPriority < order2->mPriority) { - field_0xe3 = mNum; - order->mNextOrderIdx = tmp_e3; + if (order->mPriority < curOrder->mPriority) { + mOrderIdx = mNum; + order->mNextOrderIdx = curOrderIdx; } else { - while (order2->mNextOrderIdx >= 0) { - if (order->mPriority < mOrder[order2->mNextOrderIdx].mPriority) { + while (curOrder->mNextOrderIdx >= 0) { + if (order->mPriority < mOrder[curOrder->mNextOrderIdx].mPriority) { break; } - int nextOrderIdx = order2->mNextOrderIdx; - order2 = &mOrder[nextOrderIdx]; + int nextOrderIdx = curOrder->mNextOrderIdx; + curOrder = &mOrder[nextOrderIdx]; } - order->mNextOrderIdx = order2->mNextOrderIdx; - order2->mNextOrderIdx = mNum; + order->mNextOrderIdx = curOrder->mNextOrderIdx; + curOrder->mNextOrderIdx = mNum; } } mNum++; @@ -252,7 +250,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) { setPt2(p_order->mActor2); mSpecifiedEvent = p_order->mEventId; - mHindFlag = p_order->field_0x04; + mHindFlag = p_order->mHindFlag; if (dComIfGp_getPlayer(0) != p_order->mActor1) { setPtT(p_order->mActor1); @@ -273,8 +271,8 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) { if (data != NULL) { field_0xea = data->field_0x16; - if (data->field_0x1B != 0xFF) { - dComIfGs_onSwitch(data->field_0x1B, roomNo); + if (data->mSwitch != 0xFF) { + dComIfGs_onSwitch(data->mSwitch, roomNo); } if (p_order->mFlag & 0x300) { @@ -283,7 +281,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) { } if (!(p_order->mFlag & 0x200)) { - field_0xe0 = p_order->mEventId; + mEventID = p_order->mEventId; } mCullRate = 1.0f; @@ -319,14 +317,14 @@ void dEvt_control_c::afterFlagProc(dEvt_order_c* p_order) { /* 800419A8-80041A20 03C2E8 0078+00 4/4 0/0 0/0 .text * commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs */ -int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 param_1, u16 param_2) { +int dEvt_control_c::commonCheck(dEvt_order_c* p_order, u16 condition, u16 command) { fopAc_ac_c* actor1 = p_order->mActor1; fopAc_ac_c* actor2 = p_order->mActor2; - if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(param_1)) && - (actor2 != NULL && actor2->mEvtInfo.chkCondition(param_1))) { - actor1->mEvtInfo.setCommand(param_2); - actor2->mEvtInfo.setCommand(param_2); + if ((actor1 != NULL && actor1->mEvtInfo.chkCondition(condition)) && + (actor2 != NULL && actor2->mEvtInfo.chkCondition(condition))) { + actor1->mEvtInfo.setCommand(command); + actor2->mEvtInfo.setCommand(command); setParam(p_order); return 1; } @@ -357,13 +355,14 @@ int dEvt_control_c::talkCheck(dEvt_order_c* p_order) { event = "MHINT_TALK"; } } + if (commonCheck(p_order, 1, 1)) { - mMode = 1; + mMode = EVT_MODE_TALK; if (mSpecifiedEvent == -1) { if (actor != NULL && actor->mEvtInfo.getEventName() != NULL) { mSpecifiedEvent = actor->mEvtInfo.getEventId(); } else { - mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, UINT32_MAX); + mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); } } i_dComIfGp_getEventManager().order(mSpecifiedEvent); @@ -395,30 +394,34 @@ SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY"; int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) { const char* event = "DEFAULT_TALK_XY"; fopAc_ac_c* pActor2 = p_order->mActor2; - int iVar5; + + int itemIndex; switch (p_order->mEventType) { - case 6: - iVar5 = 0; + case EVT_TYPE_SHOWITEM_X: + itemIndex = SELECT_ITEM_X; field_0xed = 1; break; - case 7: + case EVT_TYPE_SHOWITEM_Y: field_0xed = 2; - iVar5 = 1; + itemIndex = SELECT_ITEM_Y; break; default: field_0xed = 0; return 0; } - if (dComIfGp_getSelectItem(iVar5) == 0xFF) { + + if (dComIfGp_getSelectItem(itemIndex) == NO_ITEM) { return 0; } + if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(0x20)) { return 0; } + if (commonCheck(p_order, 1, 1)) { - mMode = 1; - mPreItemNo = dComIfGp_getSelectItem(iVar5); - mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, UINT32_MAX); + mMode = EVT_MODE_TALK; + mPreItemNo = dComIfGp_getSelectItem(itemIndex); + mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, 0xFF, -1); i_dComIfGp_getEventManager().order(mSpecifiedEvent); return 1; } else { @@ -435,13 +438,16 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) { if (actor1 == NULL || (actor2 != NULL && !actor2->mEvtInfo.chkCondition(0x40))) { return 0; } + actor1->mEvtInfo.setCommand(6); if (actor2 != NULL) { actor2->mEvtInfo.setCommand(6); } + setParam(p_order); mPreItemNo = dComIfGp_att_getCatchChgItem(); - mMode = 2; + mMode = EVT_MODE_DEMO; + if (mSpecifiedEvent != -1) { i_dComIfGp_getEventManager().order(mSpecifiedEvent); } @@ -454,14 +460,17 @@ int dEvt_control_c::talkEnd() { if (actor != NULL) { actor->mEvtInfo.setCommand(0); } + actor = (fopAc_ac_c*)getPt2(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } + if (mSpecifiedEvent != -1) { i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); mSpecifiedEvent = -1; } + daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(NULL); if (item != NULL && fopAcM_GetName(item) == PROC_ITEM) { item->dead(); @@ -475,33 +484,42 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) { fopAc_ac_c* actor1 = p_order->mActor1; fopAc_ac_c* actor2 = p_order->mActor2; int eventId = p_order->mEventId; + if (actor2 == NULL) { return 0; } + if (!(p_order->mFlag & 0x10)) { if (actor1 != NULL && !actor1->mEvtInfo.chkCondition(2)) { return 0; } + if (actor2 != NULL && !actor2->mEvtInfo.chkCondition(2)) { return 0; } } + if (!beforeFlagProc(p_order)) { return 0; } + if (actor1 != NULL) { i_dComIfGp_getEventManager().setObjectArchive(actor1->mEvtInfo.getArchiveName()); } + if (!i_dComIfGp_getEventManager().order(eventId)) { return 0; } + if (actor1 != NULL) { actor1->mEvtInfo.setCommand(2); } + if (actor2 != NULL) { actor2->mEvtInfo.setCommand(2); } - mMode = 2; + + mMode = EVT_MODE_DEMO; setParam(p_order); afterFlagProc(p_order); return 1; @@ -513,10 +531,12 @@ int dEvt_control_c::demoEnd() { if (actor != NULL) { actor->mEvtInfo.setCommand(0); } + actor = (fopAc_ac_c*)getPt2(); if (actor != NULL) { actor->mEvtInfo.setCommand(0); } + if (mSpecifiedEvent != -1) { i_dComIfGp_getEventManager().endProc(mSpecifiedEvent, 1); mSpecifiedEvent = -1; @@ -531,7 +551,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) { return 0; } else { actor->mEvtInfo.setCommand(2); - mMode = 2; + mMode = EVT_MODE_DEMO; setParam(p_order); afterFlagProc(p_order); return 1; @@ -542,14 +562,17 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) { */ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { if (commonCheck(p_order, 4, 3)) { - mMode = 2; + mMode = EVT_MODE_DEMO; + fopAc_ac_c* actor2 = (fopAc_ac_c*)getPt2(); if (actor2 != NULL) { i_dComIfGp_getEventManager().setObjectArchive(actor2->mEvtInfo.getArchiveName()); } + if (mSpecifiedEvent == -1 && actor2 != NULL && actor2->mEvtInfo.getEventId() != -1) { mSpecifiedEvent = actor2->mEvtInfo.getEventId(); } + if (mSpecifiedEvent != -1 && i_dComIfGp_getEventManager().getEventData(mSpecifiedEvent) != NULL) { i_dComIfGp_getEventManager().order(mSpecifiedEvent); @@ -557,11 +580,13 @@ int dEvt_control_c::doorCheck(dEvt_order_c* p_order) { mSpecifiedEvent = -1; reset(); } - if (p_order->mEventType == 0xB) { + + if (p_order->mEventType == EVT_TYPE_TREASURE) { onEventFlag(4); } else { onEventFlag(0x40); } + return 1; } else { return 0; @@ -574,7 +599,7 @@ int dEvt_control_c::itemCheck(dEvt_order_c* p_order) { const char* event = "DEFAULT_GETITEM"; if (commonCheck(p_order, 8, 4)) { - mMode = 2; + mMode = EVT_MODE_DEMO; mSpecifiedEvent = i_dComIfGp_getEventManager().getEventIdx(event, -1, -1); i_dComIfGp_getEventManager().order(mSpecifiedEvent); return 1; @@ -584,27 +609,26 @@ int dEvt_control_c::itemCheck(dEvt_order_c* p_order) { } /* 800421C0-80042254 03CB00 0094+00 1/1 0/0 0/0 .text endProc__14dEvt_control_cFv */ -// missing extra branch int dEvt_control_c::endProc() { switch (mMode) { - case 1: + case EVT_MODE_TALK: talkEnd(); break; - case 2: + case EVT_MODE_DEMO: demoEnd(); break; case 3: break; } - mMode = 0; + mMode = EVT_MODE_NONE; field_0xea = 255; mMapToolId = 255; mStageEventDt = NULL; field_0xec = 255; field_0xed = 0; - field_0xe0 = 255; - mPreItemNo = 255; + mEventID = 255; + mPreItemNo = NO_ITEM; i_dComIfGp_getEventManager().setStartDemo(-2); return 1; } @@ -612,22 +636,22 @@ int dEvt_control_c::endProc() { /* 80042254-800422C0 03CB94 006C+00 1/1 0/0 0/0 .text change__14dEvt_control_cFv */ int dEvt_control_c::change() { dEvt_order_c* order; - s8 var_r7; + s8 curOrderIdx; if (mNum != 0) { - var_r7 = field_0xe3; + curOrderIdx = mOrderIdx; do { - order = &mOrder[var_r7]; + order = &mOrder[curOrderIdx]; if (order->mFlag & 0xE00 && order->mActor1 == mChangeOK) { - field_0xe3 = var_r7; + mOrderIdx = curOrderIdx; mNum = 1; order->mNextOrderIdx = -1; - return var_r7; + return curOrderIdx; } - var_r7 = order->mNextOrderIdx; - } while (var_r7 >= 0); + curOrderIdx = order->mNextOrderIdx; + } while (curOrderIdx >= 0); } return -1; @@ -636,7 +660,7 @@ int dEvt_control_c::change() { /* 800422C0-80042468 03CC00 01A8+00 2/1 0/0 0/0 .text entry__14dEvt_control_cFv */ int dEvt_control_c::entry() { if (mNum != 0) { - s8 orderIdx = field_0xe3; + s8 orderIdx = mOrderIdx; mNum = 0; do { @@ -644,43 +668,43 @@ int dEvt_control_c::entry() { orderIdx = order->mNextOrderIdx; switch (order->mEventType) { - case 0: + case EVT_TYPE_TALK: if (i_dComIfGs_getLife() != 0 && talkCheck(order) != 0) { return 1; } break; - case 2: + case EVT_TYPE_OTHER: if (i_dComIfGs_getLife() != 0 && demoCheck(order) != 0) { return 1; } break; - case 1: - case 11: + case EVT_TYPE_DOOR: + case EVT_TYPE_TREASURE: if (i_dComIfGs_getLife() != 0 && doorCheck(order) != 0) { return 1; } break; - case 3: + case EVT_TYPE_COMPULSORY: mMode = 3; setParam(order); return 1; - case 4: + case EVT_TYPE_POTENTIAL: if (i_dComIfGs_getLife() != 0 && potentialCheck(order) != 0) { return 1; } break; - case 5: + case EVT_TYPE_ITEM: if (i_dComIfGs_getLife() != 0 && itemCheck(order) != 0) { return 1; } break; - case 6: - case 7: + case EVT_TYPE_SHOWITEM_X: + case EVT_TYPE_SHOWITEM_Y: if (i_dComIfGs_getLife() != 0 && talkXyCheck(order) != 0) { return 1; } break; - case 10: + case EVT_TYPE_CATCH: if (i_dComIfGs_getLife() != 0 && catchCheck(order) != 0) { return 1; } @@ -701,7 +725,7 @@ void dEvt_control_c::reset() { s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx(NULL, field_0xec, -1); void* pt2 = getPt2(); - order(2, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec); + order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, pt1, pt2, eventIdx, field_0xec); mChangeOK = pt1; } @@ -713,7 +737,7 @@ void dEvt_control_c::reset(void* param_0) { if (field_0xec != 0xFF) { s16 eventIdx = i_dComIfGp_getEventManager().getEventIdx((fopAc_ac_c*)param_0, field_0xec); void* pt2 = getPt2(); - order(2, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec); + order(EVT_TYPE_OTHER, 3, 0x201, mHindFlag, param_0, pt2, eventIdx, field_0xec); } mChangeOK = param_0; @@ -985,7 +1009,7 @@ int dEvt_control_c::Step() { mDoGph_gInf_c::fadeOut(-0.05f); } offFlag2(2); - func_80041488(); + clear_tmpflag_for_message(); } endProc(); @@ -995,7 +1019,7 @@ int dEvt_control_c::Step() { } mEventStatus = 2; } else if (mEventStatus == 5 && (chkFlag2(2) || mSkipTimer < 0)) { - func_80041488(); + clear_tmpflag_for_message(); } if (change() != -1) { @@ -1013,7 +1037,7 @@ int dEvt_control_c::Step() { int roomNo = dComIfGp_roomControl_getStayNo(); if (mRoomNo != roomNo) { - field_0x129 = 0; + mRoomInfoSet = 0; mRoomNo = roomNo; } @@ -1044,7 +1068,7 @@ int dEvt_control_c::Step() { evtMng->Experts(); return 1; } else { - if (!field_0x129) { + if (!mRoomInfoSet) { char lastStageName[7]; strncpy(lastStageName, dComIfGp_getStartStageName(), 7); lastStageName[7] = 0; @@ -1052,7 +1076,7 @@ int dEvt_control_c::Step() { dComIfGp_setLastPlayStageName(lastStageName); dComIfGs_onVisitedRoom(mRoomNo); } - field_0x129 = 1; + mRoomInfoSet = true; } return 0; @@ -1065,19 +1089,22 @@ int dEvt_control_c::moveApproval(void* param_0) { if (fopAcM_checkStatus(actor, 0x20000)) { return 2; } + if (!runCheck()) { return 1; } + switch (mMode) { - case 1: + case EVT_MODE_TALK: if (getPt1() == actor || getPt2() == actor) { return 2; } break; - case 2: + case EVT_MODE_DEMO: if (getPt1() == actor || getPt2() == actor) { return 2; } + if (actor->mDemoActorId != 0) { return 2; } @@ -1088,36 +1115,45 @@ int dEvt_control_c::moveApproval(void* param_0) { } break; } + if (fopAcM_checkStatus(actor, 0x8000)) { return 2; } + if (fopAcM_checkStatus(actor, 0x800)) { return 1; } + if (i_dComIfGp_checkPlayerStatus0(0, 0x20000000) || i_dComIfGp_checkPlayerStatus1(0, 0x4002000)) { return 0; } - if (mMode == 1 && fopAcM_checkStatus(actor, 0x40)) { + + if (mMode == EVT_MODE_TALK && fopAcM_checkStatus(actor, 0x40)) { return 1; } + if (dDemo_c::getMode() == 1) { return 1; } - if ((getMode() == 3 || getMode() == 1) && fopAcM_checkStatus(actor, 0x4000000)) { + + if ((getMode() == 3 || getMode() == EVT_MODE_TALK) && fopAcM_checkStatus(actor, 0x4000000)) { return 0; } + if (fopAcM_checkStatus(actor, 0x4000)) { return 1; } + if (fopAcM_checkStatus(actor, 0x2000)) { return 1; } + return 0; } /* 8004316C-800431E8 03DAAC 007C+00 0/0 28/28 0/0 .text compulsory__14dEvt_control_cFPvPCcUs */ -BOOL dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) { +BOOL dEvt_control_c::compulsory(void* param_0, char const* eventName, u16 hind) { bool check = (mEventStatus == 0 || mEventStatus == 2); if (!check || mCompulsory) { @@ -1125,11 +1161,11 @@ BOOL dEvt_control_c::compulsory(void* param_0, char const* param_1, u16 param_2) } mCompulsory = 1; - return orderOld(3, 2, 0, param_2, param_0, NULL, param_1); + return orderOld(EVT_TYPE_COMPULSORY, 2, 0, hind, param_0, NULL, eventName); } void dEvt_control_c::remove() { - mMode = 0; + mMode = EVT_MODE_NONE; mEventStatus = 0; mNum = 0; mDebugStb = 0; @@ -1140,15 +1176,15 @@ void dEvt_control_c::remove() { mMapToolId = -1; field_0xec = -1; mStageEventDt = NULL; - field_0xe0 = 255; + mEventID = 255; field_0xed = 0; - mPreItemNo = -1; + mPreItemNo = NO_ITEM; mEventFlag = 0; mFlag2 = 0; mChangeOK = NULL; clearSkipSystem(); mCompulsory = 0; - field_0x129 = 0; + mRoomInfoSet = false; mRoomNo = -1; } @@ -1159,7 +1195,7 @@ dStage_MapEvent_dt_c* dEvt_control_c::getStageEventDt() { } void dEvt_control_c::sceneChange(int exitId) { - dStage_changeScene4Event(exitId, mRoomNo, -1, field_0x129, 0.0f, 0, 0, -1); + dStage_changeScene4Event(exitId, mRoomNo, -1, mRoomInfoSet, 0.0f, 0, 0, -1); } u32 dEvt_control_c::getPId(void* actor) { @@ -1171,33 +1207,34 @@ u32 dEvt_control_c::getPId(void* actor) { } /* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text convPId__14dEvt_control_cFUi */ -void* dEvt_control_c::convPId(unsigned int param_0) { - return fopAcIt_Judge(fpcSch_JudgeByID, (void*)¶m_0); +void* dEvt_control_c::convPId(unsigned int id) { + return fopAcIt_Judge(fpcSch_JudgeByID, &id); } /* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text getStbDemoData__14dEvt_control_cFPc */ -void* dEvt_control_c::getStbDemoData(char* param_0) { +void* dEvt_control_c::getStbDemoData(char* resName) { char* demoArcName = dStage_roomControl_c::getDemoArcName(); if (*demoArcName != 0) { - void* res = dComIfG_getObjectRes(demoArcName, param_0); + void* res = dComIfG_getObjectRes(demoArcName, resName); if (res != NULL) { - func_80041480(); + event_debug_evnt(); return res; } - func_80041480(); + event_debug_evnt(); } else { - func_80041480(); + event_debug_evnt(); } + char* roomArcName = dComIfG_getRoomArcName(dComIfGp_roomControl_getStayNo()); - void* res2 = dComIfG_getStageRes(roomArcName, param_0); + void* res2 = dComIfG_getStageRes(roomArcName, resName); if (res2 != NULL) { - func_80041480(); + event_debug_evnt(); return res2; } else { - res2 = dComIfG_getStageRes(param_0); + res2 = dComIfG_getStageRes(resName); if (res2 != NULL) { - func_80041480(); + event_debug_evnt(); return res2; } else { return NULL; @@ -1226,11 +1263,11 @@ void dEvt_info_c::setEventName(char* name) { /* 80043480-800434CC 03DDC0 004C+00 1/1 0/0 0/0 .text getEventName__11dEvt_info_cFv */ char* dEvt_info_c::getEventName() { if (mEventId == -1) { - return 0; + return NULL; } else { dEvDtEvent_c* data = i_dComIfGp_getEventManager().getEventData(mEventId); if (data == NULL) { - return 0; + return NULL; } else { return data->getName(); } @@ -1277,8 +1314,8 @@ dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID, s32 roomN return NULL; } -s16 dEvt_control_c::runningEventID(s16 param_0) { - return param_0 == field_0xe0 ? mSpecifiedEvent : param_0; +s16 dEvt_control_c::runningEventID(s16 eventID) { + return eventID == mEventID ? mSpecifiedEvent : eventID; } void dEvt_control_c::setPt1(void* ptr) { diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 40b714c8ef6..23524eb3692 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -190,9 +190,11 @@ static u16 getTelopNo() { static u16 getStartTelopNo() { const char* startStageName = dComIfGp_getStartStageName(); const char* lastPlayStateName = dComIfGp_getLastPlayStageName(); + if (strcmp(startStageName, lastPlayStateName) == 0) { return 0xFFFF; } + TelopDataStruct* telopData = NULL; s32 val = ((startStageName[3] == 'B' ? 'd' : startStageName[0]) << 0x18 | startStageName[4] << 0x10 | startStageName[5] << 8 | startStageName[6]); @@ -202,6 +204,7 @@ static u16 getStartTelopNo() { break; } } + if (telopData == NULL || telopData->_8 == 0) { return 0xFFFF; } else if (telopData->_8 == 2 && telopData->_6 != 0xFFFF && @@ -214,12 +217,14 @@ static u16 getStartTelopNo() { TelopDataStruct* lastTelopData = NULL; val = ((lastPlayStateName[3] == 'B' ? 'd' : lastPlayStateName[0]) << 0x18 | lastPlayStateName[4] << 0x10 | lastPlayStateName[5] << 8 | lastPlayStateName[6]); + for (s32 i = 0; i < numTelopData; i++) { if (val == TelopData[i].mName) { lastTelopData = &TelopData[i]; break; } } + if (lastTelopData != NULL && telopData->mTelopNo == lastTelopData->mTelopNo) { return 0xFFFF; } else { @@ -285,6 +290,7 @@ static int dEvDt_Next_Stage(int index, int wipe_type) { int id = *p_id; s8 room_no = dComIfGp_roomControl_getStayNo(); stage_scls_info_dummy_class* info; + if (room_no == -1) { info = dComIfGp_getStageSclsInfo(); } else { @@ -379,11 +385,11 @@ static asm int dEvDt_Next_Stage(int param_0, int param_1) { #endif /* 80043D60-80043DC8 03E6A0 0068+00 3/3 0/0 0/0 .text flagCheck__11dEvDtFlag_cFi */ -BOOL dEvDtFlag_c::flagCheck(int param_0) { - if (flagMaxCheck(param_0)) { +BOOL dEvDtFlag_c::flagCheck(int flag) { + if (flagMaxCheck(flag)) { return FALSE; } else { - if (mFlags[(u32)param_0 / 0x20] & (1 << (param_0 & 0x1F))) { + if (mFlags[(u32)flag / 0x20] & (1 << (flag & 0x1F))) { return TRUE; } else { return FALSE; @@ -392,21 +398,21 @@ BOOL dEvDtFlag_c::flagCheck(int param_0) { } /* 80043DC8-80043E30 03E708 0068+00 2/2 1/1 0/0 .text flagSet__11dEvDtFlag_cFi */ -BOOL dEvDtFlag_c::flagSet(int param_0) { - if (flagMaxCheck(param_0)) { +BOOL dEvDtFlag_c::flagSet(int flag) { + if (flagMaxCheck(flag)) { return FALSE; } else { - mFlags[(u32)param_0 / 0x20] |= (1 << (param_0 & 0x1F)); + mFlags[(u32)flag / 0x20] |= (1 << (flag & 0x1F)); return TRUE; } } -BOOL dEvDtFlag_c::flagMaxCheck(int flag_id) { - if (flag_id == -1) { +BOOL dEvDtFlag_c::flagMaxCheck(int flag) { + if (flag == -1) { return TRUE; } - if (FlagMax <= flag_id) { + if (FlagMax <= flag) { return TRUE; } else { return FALSE; @@ -426,6 +432,7 @@ int dEvDtEvent_c::finishCheck() { if (tmp == -1) { return 1; } + if (!i_dComIfGp_getEventManager().flagCheck(tmp)) { return 0; } @@ -436,33 +443,27 @@ int dEvDtEvent_c::finishCheck() { /* 80043EFC-80043F70 03E83C 0074+00 0/0 1/1 0/0 .text forceFinish__12dEvDtEvent_cFv */ int dEvDtEvent_c::forceFinish() { for (int i = 0; i < 3; i++) { - int tmp = field_0x88[i]; - if (tmp == -1) { + int flag = field_0x88[i]; + if (flag == -1) { return 1; } - i_dComIfGp_getEventManager().setFlag(tmp); + + i_dComIfGp_getEventManager().setFlag(flag); } return 1; } /* 80043F70-80043FD8 03E8B0 0068+00 0/0 1/1 0/0 .text * specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c */ -void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* param_0) { +void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* p_staff) { for (int i = 0; i < mNStaff; i++) { - param_0[mStaff[i]].specialProc(); + p_staff[mStaff[i]].specialProc(); } } -/* ############################################################################################## */ -/* 80379DD0-80379DD0 006430 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379E0D = "Timer"; -#pragma pop - /* 80043FD8-8004403C 03E918 0064+00 4/4 0/0 0/0 .text specialProc_WaitStart__12dEvDtStaff_cFi */ -void dEvDtStaff_c::specialProc_WaitStart(int param_0) { - int* timer = dComIfGp_evmng_getMyIntegerP(param_0, "Timer"); +void dEvDtStaff_c::specialProc_WaitStart(int index) { + int* timer = dComIfGp_evmng_getMyIntegerP(index, "Timer"); if (timer == NULL) { mWaitTimer = 0; } else { @@ -558,14 +559,17 @@ void dEvDtStaff_c::specialProcLight() { int staffId = i_dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0); if (staffId != -1) { char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); + if (dComIfGp_evmng_getIsAddvance(staffId)) { f32* hourP; + switch (*(int*)nowCutName) { case 'CHAN': hourP = dComIfGp_evmng_getMyFloatP(staffId, "Hour"); if (hourP != NULL) { dKy_instant_timechg(*hourP * 15.0f); } + int* weatherP = dComIfGp_evmng_getMyIntegerP(staffId, "Weather"); if (weatherP != NULL) { switch (*weatherP) { @@ -609,6 +613,7 @@ void dEvDtStaff_c::specialProcMessage() { if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { @@ -651,6 +656,7 @@ void dEvDtStaff_c::specialProcMessage() { break; case 'TELO': int* forStartP = dComIfGp_evmng_getMyIntegerP(staffId, "ForStart"); + if (forStartP != NULL && *forStartP != 0) { work->mMsgNo = getStartTelopNo(); } else { @@ -664,12 +670,14 @@ void dEvDtStaff_c::specialProcMessage() { work->mMsgNo = getTelopNo(); } } + data->unk = 0; if (work->mMsgNo != 0xFFFF) { work->_0 = fopMsgM_messageSetDemo(work->mMsgNo); } } } + switch (*(int*)nowCutName) { case 'WAIT': specialProc_WaitProc(staffId); @@ -715,6 +723,7 @@ void dEvDtStaff_c::specialProcMessage() { if (work->mLMsg == NULL) { break; } + switch (work->mLMsg->field_0xf8) { case 0xE: work->mLMsg->field_0xf8 = 0x10; @@ -800,6 +809,7 @@ void dEvDtStaff_c::specialProcSound() { if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { @@ -827,6 +837,7 @@ void dEvDtStaff_c::specialProcSound() { } } } + switch (*(int*)nowCutName) { case 'WAIT': specialProc_WaitProc(staffId); @@ -874,10 +885,12 @@ void dEvDtStaff_c::specialProcCreate() { csXyz angle; cXyz scale; dStage_objectNameInf* objNameInf; + int staffId = i_dComIfGp_evmng_getMyStaffId("CREATER", NULL, 0); if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { @@ -886,30 +899,35 @@ void dEvDtStaff_c::specialProcCreate() { case 'CREA': name = dComIfGp_evmng_getMyStringP(staffId, "MAKECAST"); objNameInf = dStage_searchName(name); + int* argP = dComIfGp_evmng_getMyIntegerP(staffId, "ARG"); if (argP == NULL) { arg = UINT32_MAX; } else { arg = *argP; } + cXyz* posP = dComIfGp_evmng_getMyXyzP(staffId, "POS"); if (posP == NULL) { pos = ((fopAc_ac_c*)dComIfGp_getPlayer(0))->getPosition(); } else { pos = *posP; } + int* angleP = dComIfGp_evmng_getMyIntegerP(staffId, "ANGLE"); if (angleP == NULL) { angle.setall(0); } else { angle.set(angleP[0], angleP[1], angleP[2]); } + cXyz* scaleP = dComIfGp_evmng_getMyXyzP(staffId, "SCALE"); if (scaleP == NULL) { scale.setAll(1.0f); } else { scale = *scaleP; } + fopAcM_create(objNameInf->mProcName, arg, &pos, dComIfGp_roomControl_getStayNo(), &angle, &scale, objNameInf->mSubtype); break; @@ -958,20 +976,24 @@ void dEvDtStaff_c::specialProcDirector() { DirectorData* data = (DirectorData*)mData; daPy_py_c* player = dComIfGp_getLinkPlayer(); dEvt_control_c& evtControl = i_dComIfGp_getEvent(); + int staffId = i_dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { int* eventFlagP = dComIfGp_evmng_getMyIntegerP(staffId, "EventFlag"); if (eventFlagP != NULL) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[*eventFlagP]); } + int* eventFlagOffP = dComIfGp_evmng_getMyIntegerP(staffId, "EventFlagOff"); if (eventFlagOffP != NULL) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[*eventFlagOffP]); } + int* switchTableP = dComIfGp_evmng_getMyIntegerP(staffId, "SwitchTable"); int switchTable; if (switchTableP != NULL) { @@ -979,22 +1001,27 @@ void dEvDtStaff_c::specialProcDirector() { } else { switchTable = i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()); } + int* switchBitP = dComIfGp_evmng_getMyIntegerP(staffId, "SwitchBit"); if (switchBitP != NULL) { dComIfGs_onStageSwitch(switchTable, *switchBitP); } + int* switchOffP = dComIfGp_evmng_getMyIntegerP(staffId, "SwitchOff"); if (switchOffP != NULL) { dComIfGs_offStageSwitch(switchTable, *switchOffP); } + int* tmpBitP = dComIfGp_evmng_getMyIntegerP(staffId, "TmpBit"); if (tmpBitP != NULL) { dComIfGs_onTmpBit(dSv_event_tmp_flag_c::tempBitLabels[*tmpBitP]); } + int* tmpOffP = dComIfGp_evmng_getMyIntegerP(staffId, "TmpBitOff"); if (tmpOffP != NULL) { dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[*tmpOffP]); } + switch (*(int*)nowCutName) { case 'WAIT': specialProc_WaitStart(staffId); @@ -1016,6 +1043,7 @@ void dEvDtStaff_c::specialProcDirector() { if (NULL == pt) { pt = evtControl.getPt2(); } + if (zev != NULL) { evtControl.setSkipZev(pt, zev); } else { @@ -1025,6 +1053,7 @@ void dEvDtStaff_c::specialProcDirector() { case 'FADE': f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); int* colorP = dComIfGp_evmng_getMyIntegerP(staffId, "Color"); + if (*rateP > 0) { mDoGph_gInf_c::setFadeRate(0); } @@ -1053,6 +1082,7 @@ void dEvDtStaff_c::specialProcDirector() { } else { data->unk = 1; } + int* soundP = dComIfGp_evmng_getMyIntegerP(staffId, "SOUND"); if (soundP != NULL) { switch (*soundP) { @@ -1083,6 +1113,7 @@ void dEvDtStaff_c::specialProcDirector() { evtControl.setPt2(pt2); } } + char* ptTName = dComIfGp_evmng_getMyStringP(staffId, "PtT"); if (ptTName != NULL) { fopAc_ac_c* ptT = fopAcM_searchFromName4Event(ptTName, -1); @@ -1090,6 +1121,7 @@ void dEvDtStaff_c::specialProcDirector() { evtControl.setPtT(ptT); } } + char* ptIName = dComIfGp_evmng_getMyStringP(staffId, "PtI"); if (ptIName != NULL) { fopAc_ac_c* ptI = fopAcM_searchFromName4Event(ptIName, -1); @@ -1097,6 +1129,7 @@ void dEvDtStaff_c::specialProcDirector() { evtControl.setPtI(ptI); } } + char* ptDName = dComIfGp_evmng_getMyStringP(staffId, "PtD"); if (ptDName != NULL) { fopAc_ac_c* ptD = fopAcM_searchFromName4Event(ptDName, -1); @@ -1113,6 +1146,7 @@ void dEvDtStaff_c::specialProcDirector() { if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[506])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[566]); } + if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[507])) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[567]); } @@ -1121,6 +1155,7 @@ void dEvDtStaff_c::specialProcDirector() { break; } } + switch (*(int*)nowCutName) { case 'WAIT': specialProc_WaitProc(staffId); @@ -1130,6 +1165,7 @@ void dEvDtStaff_c::specialProcDirector() { dComIfGp_evmng_cutEnd(staffId); break; } + if (mDoGph_gInf_c::getFadeRate() >= 1) { f32* rateP = dComIfGp_evmng_getMyFloatP(staffId, "Rate"); if (*rateP > 0) { @@ -1202,10 +1238,12 @@ void dEvDtStaff_c::specialProcPackage() { if (!!msgObj) { dMsgObject_demoMessageGroup(); } + int staffId = i_dComIfGp_evmng_getMyStaffId("PACKAGE", NULL, 0); if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { @@ -1222,10 +1260,12 @@ void dEvDtStaff_c::specialProcPackage() { } else { offsetAngY = 0.0f; } + // should not save event from g_dComIfG_gameInfo to register u8* demoData = (u8*)i_dComIfGp_getEvent().getStbDemoData(fileName); dDemo_c::start(demoData, offsetPos, offsetAngY); dComIfGp_event_setCullRate(10.0f); + int* eventFlagP = dComIfGp_evmng_getMyIntegerP(staffId, "EventFlag"); if (eventFlagP != NULL) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[*eventFlagP]); @@ -1248,6 +1288,7 @@ void dEvDtStaff_c::specialProcPackage() { dDemo_c::end(); } } + if (dDemo_c::getMode() == 0) { dComIfGp_evmng_cutEnd(staffId); } @@ -1282,6 +1323,7 @@ void dEvDtStaff_c::specialProcTimekeeper() { if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { switch (*(int*)nowCutName) { @@ -1292,6 +1334,7 @@ void dEvDtStaff_c::specialProcTimekeeper() { break; } } + switch (*(int*)nowCutName) { case 'COUN': if (dataP->timer > 0) { @@ -1332,6 +1375,7 @@ void dEvDtStaff_c::specialProcEffect() { if (staffId == -1) { return; } + char* nowCutName = i_dComIfGp_getEventManager().getMyNowCutName(staffId); if (dComIfGp_evmng_getIsAddvance(staffId)) { data->unk = 0; @@ -1354,6 +1398,7 @@ void dEvDtStaff_c::specialProcEffect() { } else { power = 5; } + int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); int type; if (typeP != NULL) { @@ -1369,12 +1414,14 @@ void dEvDtStaff_c::specialProcEffect() { int timer; int random; u8* pattern; + int* timerP = dComIfGp_evmng_getMyIntegerP(staffId, "Timer"); if (timerP != NULL) { timer = *timerP; } else { timer = 30; } + data->unk = timer; int* powerP = dComIfGp_evmng_getMyIntegerP(staffId, "Power"); if (powerP != NULL) { @@ -1382,12 +1429,14 @@ void dEvDtStaff_c::specialProcEffect() { } else { power = 5; } + int* typeP = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); if (typeP != NULL) { type = *typeP; } else { type = 0xF; } + pattern = (u8*)dComIfGp_evmng_getMyStringP(staffId, "Pattern"); if (pattern != NULL) { int* randomP = dComIfGp_evmng_getMyIntegerP(staffId, "Random"); @@ -1410,6 +1459,7 @@ void dEvDtStaff_c::specialProcEffect() { timer = 30; } int timer2 = data->unk = timer; + f32* alphaP = dComIfGp_evmng_getMyFloatP(staffId, "Alpha"); f32 alpha; if (alphaP != NULL) { @@ -1417,6 +1467,7 @@ void dEvDtStaff_c::specialProcEffect() { } else { alpha = 0.8f; } + f32* scaleP = dComIfGp_evmng_getMyFloatP(staffId, "Scale"); f32 scale; if (scaleP != NULL) { @@ -1475,6 +1526,7 @@ int dEvDtCut_c::startCheck() { return 1; } } + if (!dEvDtFlagCheck(flag)) { return 0; } @@ -1546,20 +1598,20 @@ void dEvDtBase_c::advanceCut(dEvDtEvent_c* p_event) { /* 800462FC-800463DC 040C3C 00E0+00 1/1 0/0 0/0 .text * advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c */ -BOOL dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* param_0) { - dEvDtCut_c* cut = &mCutP[param_0->getCurrentCut()]; +BOOL dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* p_staff) { + dEvDtCut_c* cut = &mCutP[p_staff->getCurrentCut()]; if (dEvDtFlagCheck(cut->getFlagId()) && cut->getNext() != -1) { switch (mCutP[cut->getNext()].startCheck()) { case -1: - param_0->advanceCut(cut->getNext()); + p_staff->advanceCut(cut->getNext()); return TRUE; case 1: dEvDtFlagSet(cut->getFlagId()); - param_0->advanceCut(cut->getNext()); + p_staff->advanceCut(cut->getNext()); return TRUE; } } - param_0->field_0x40 = false; + p_staff->field_0x40 = false; return FALSE; } diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index 048b04f195b..591bcad391f 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -148,17 +148,17 @@ void dEvent_exception_c::init() { } /* 800463F0-80046480 040D30 0090+00 0/0 2/2 0/0 .text setStartDemo__18dEvent_exception_cFi */ -s32 dEvent_exception_c::setStartDemo(int index) { +s32 dEvent_exception_c::setStartDemo(int mapToolID) { int roomNo = dComIfGp_roomControl_getStayNo(); - dStage_MapEvent_dt_c* eventData = dEvt_control_c::searchMapEventData(index, roomNo); + dStage_MapEvent_dt_c* eventData = dEvt_control_c::searchMapEventData(mapToolID, roomNo); - if (eventData != NULL && eventData->field_0x1B != 0xFF && - dComIfGs_isSwitch(eventData->field_0x1B, roomNo)) { + if (eventData != NULL && eventData->mSwitch != 0xFF && + dComIfGs_isSwitch(eventData->mSwitch, roomNo)) { return 0xFF; - } else if (mEventInfoIdx != index) { - mEventInfoIdx = index; + } else if (mEventInfoIdx != mapToolID) { + mEventInfoIdx = mapToolID; } - return index; + return mapToolID; } /* 80046480-800465E8 040DC0 0168+00 1/1 0/0 0/0 .text getEventName__18dEvent_exception_cFv */ @@ -177,16 +177,16 @@ const char* dEvent_exception_c::getEventName() { return "(!NO REGIST!)"; } - if (0xC8 < mEventInfoIdx && mEventInfoIdx < 0xD7) { - if (mEventInfoIdx == 0xCB) { + if (200 < mEventInfoIdx && mEventInfoIdx < 215) { + if (mEventInfoIdx == 203) { dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()); - } else if (mEventInfoIdx == 0xD5) { + } else if (mEventInfoIdx == 213) { switch (dComIfGp_SelectWarpPt_get()) { case 3: - mEventInfoIdx = 0xD6; + mEventInfoIdx = 214; } } - return soecial_names[mEventInfoIdx - 0xC9]; + return soecial_names[mEventInfoIdx - 201]; } else { if (eventInfo == NULL) { return "(!NO INFO!)"; @@ -236,7 +236,9 @@ dEvent_manager_c::dEvent_manager_c() { /* ############################################################################################## */ /* 80379F50-80379F60 0065B0 000F+01 6/6 0/0 0/0 .rodata * DataFileName__29@unnamed@d_event_manager_cpp@ */ +namespace { static char const DataFileName[] = "event_list.dat"; +}; /* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text create__16dEvent_manager_cFv */ int dEvent_manager_c::create() { @@ -315,9 +317,9 @@ void dEvent_manager_c::roomInit(int roomNo) { mRoomNo = roomNo; } -void dEvent_manager_c::roomFinish(int param_0) { +void dEvent_manager_c::roomFinish(int roomNo) { for (int i = 4; i <= 9; i++) { - if (mEventList[i].getHeaderP() != NULL && param_0 == mEventList[i].roomNo()) { + if (mEventList[i].getHeaderP() != NULL && roomNo == mEventList[i].roomNo()) { mEventList[i].init(); } } @@ -331,21 +333,21 @@ int dEvent_manager_c::orderStartDemo() { } s16 eventIdx; - if (0xC8 < mEventException.mEventInfoIdx && mEventException.mEventInfoIdx < 0xD7) { - eventIdx = this->getEventIdx(mEventException.getEventName(), -1, -1); + if (200 < mEventException.mEventInfoIdx && mEventException.mEventInfoIdx < 215) { + eventIdx = getEventIdx(mEventException.getEventName(), -1, -1); success = fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); } else if (mEventException.mEventInfoIdx != -1 && mEventException.mEventInfoIdx != 0xFF) { u8 eventInfoIdx = mEventException.mEventInfoIdx; - eventIdx = this->getEventIdx(NULL, eventInfoIdx, -1); + eventIdx = getEventIdx(NULL, eventInfoIdx, -1); success = fopAcM_orderMapToolAutoNextEvent(NULL, eventInfoIdx, eventIdx, 0xFFFF, 1, 5); } else if (dComIfGp_getStartStagePoint() == -2 || dComIfGp_getStartStagePoint() == -3) { - eventIdx = this->getEventIdx( + eventIdx = getEventIdx( daPy_py_c::checkNowWolf() ? "WOLF_WORLD_CHANGE_OUT" : "WORLD_CHANGE_OUT", 0xFF, -1); success = fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); } if (success == FALSE) { - eventIdx = this->getEventIdx("DEFAULT_START", 0xFF, -1); + eventIdx = getEventIdx("DEFAULT_START", 0xFF, -1); fopAcM_orderOtherEventId(NULL, eventIdx, 0xFF, 0xFFFF, 5, 1); } @@ -384,11 +386,13 @@ static int allOffObjectCallBack(fopAc_ac_c* pActor, void* param_1) { void dEvent_manager_c::startProc(dEvDtEvent_c* p_evnt) { for (int i = 0; i < p_evnt->getNStaff(); i++) { dEvDtStaff_c* staff = getBase().getStaffP(p_evnt->getStaff(i)); + if (staff->getType() == dEvDtStaff_c::TYPE_DEFAULT) { fopAc_ac_c* ac = specialCast(staff->getName(), 1); if (ac == NULL) { ac = fopAcM_searchFromName4Event(staff->getName(), -1); } + if (ac != NULL) { fopAcM_OnStatus(ac, 0x8000); } @@ -411,11 +415,11 @@ void dEvent_manager_c::closeProc(dEvDtEvent_c* p_evnt) { } /* 80046DAC-80046E64 0416EC 00B8+00 0/0 2/2 0/0 .text endProc__16dEvent_manager_cFsi */ -void dEvent_manager_c::endProc(s16 param_0, int param_1) { - dEvDtEvent_c* event = this->getEventData(param_0); +void dEvent_manager_c::endProc(s16 eventID, int close) { + dEvDtEvent_c* event = getEventData(eventID); if (event != NULL) { - if (param_1 != 0) { - this->closeProc(event); + if (close != 0) { + closeProc(event); } if (event->mEventState == 2) { @@ -434,8 +438,9 @@ void dEvent_manager_c::endProc(s16 param_0, int param_1) { /* 80046E64-800473FC 0417A4 0598+00 0/0 1/1 0/0 .text Sequencer__16dEvent_manager_cFv */ void dEvent_manager_c::Sequencer() { dEvt_control_c& evtControl = i_dComIfGp_getEvent(); - dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + dEvDtEvent_c* event = getEventData(mCurrentEventCompositId); dStage_MapEvent_dt_c* mapEvent = evtControl.getStageEventDt(); + if (event != NULL) { if (evtControl.chkEventFlag(0x100)) { char* name = NULL; @@ -454,13 +459,16 @@ void dEvent_manager_c::Sequencer() { if (dStage_MapEvent_dt_c_getEventSCutType(mapEvent) == 2) { evtControl.onSkipFade(); } + void* actor = evtControl.getPt1(); if (actor == NULL) { actor = evtControl.getPt2(); } + if (actor == NULL) { actor = dComIfGp_getPlayer(0); } + if (actor != NULL) { switch (mapEvent->mType) { case 2: @@ -479,7 +487,7 @@ void dEvent_manager_c::Sequencer() { Z2GetAudioMgr()->mStatusMgr.setDemoName(name); } - if (event->finishCheck() != 0) { + if (event->finishCheck()) { bool bVar1 = false; if (evtControl.chkFlag2(1)) { bVar1 = true; @@ -523,12 +531,12 @@ void dEvent_manager_c::Sequencer() { switch (mapEvent->mType) { case 0: - switch (mapEvent->field_0x18) { - case 1: - mDoAud_seStart(0xC, NULL, 0, 0); + switch (mapEvent->mSeType) { + case EVT_SE_RIDDLE_A: + mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0); break; - case 2: - mDoAud_seStart(0xD, NULL, 0, 0); + case EVT_SE_RIDDLE_B: + mDoAud_seStart(Z2SE_READ_RIDDLE_B, NULL, 0, 0); break; } @@ -590,9 +598,9 @@ void dEvent_manager_c::Sequencer() { /* 800473FC-80047454 041D3C 0058+00 0/0 1/1 0/0 .text Experts__16dEvent_manager_cFv */ void dEvent_manager_c::Experts() { - dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + dEvDtEvent_c* event = getEventData(mCurrentEventCompositId); if (event != NULL && event->mEventState == 1) { - event->specialStaffProc(this->getBase().getStaffP(0)); + event->specialStaffProc(getBase().getStaffP(0)); } } @@ -619,11 +627,12 @@ dEvDtEvent_c* dEvent_manager_c::getEventData(s16 param_0, int idx) { */ #ifdef NONMATCHING dEvDtEvent_c* dEvent_manager_c::getEventData(s16 eventCompositId) { - if (param_0 == -1) { + if (eventCompositId == -1) { return NULL; } else { // extsh instead of mr here - return this->getEventData(getIndexCompositId(param_0), getTypeCompositId(param_0)); + return getEventData(getIndexCompositId(eventCompositId), + getTypeCompositId(eventCompositId)); } } #else @@ -638,13 +647,13 @@ asm dEvDtEvent_c* dEvent_manager_c::getEventData(s16 eventCompositId) { #endif /* 80047514-80047698 041E54 0184+00 3/3 8/8 3/3 .text getEventIdx__16dEvent_manager_cFPCcUcl */ -s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 param_1, s32 roomNo) { +s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 mapToolID, s32 roomNo) { if (roomNo == -1) { roomNo = dComIfGp_roomControl_getStayNo(); } - if (param_1 != 0xFF) { - dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_1, roomNo); + if (mapToolID != 0xFF) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, roomNo); if (data != NULL) { switch (data->mType) { case 1: @@ -652,7 +661,7 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 param_1, s32 roomNo) return getEventIdx(data->mName, 0xFF, roomNo); case 0: static char map_tool_name[17]; - sprintf(map_tool_name, "MapToolCamera%d", param_1); + sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(map_tool_name, 0xFF, roomNo); } } @@ -682,8 +691,8 @@ s16 dEvent_manager_c::getEventIdx(char const* eventName, u8 param_1, s32 roomNo) /* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc */ -s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 param_1) { - dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_1, pActor->getRoomNo()); +s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 mapToolID) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, pActor->getRoomNo()); if (data != NULL) { switch (data->mType) { case 1: @@ -691,7 +700,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 param_1) { return getEventIdx(pActor, data->mName, 0xFF); case 0: static char map_tool_name[17]; - sprintf(map_tool_name, "MapToolCamera%d", param_1); + sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(pActor, map_tool_name, 0xFF); } } @@ -700,11 +709,11 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, u8 param_1) { /* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc */ -s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 param_2) { +s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 mapToolID) { s8 actorRoomNo = pActor->getRoomNo(); - if (param_2 != 0xFF) { - dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_2, actorRoomNo); + if (mapToolID != 0xFF) { + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, actorRoomNo); if (data != NULL) { switch (data->mType) { case 1: @@ -712,7 +721,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 return getEventIdx(pActor, data->mName, 0xFF); case 0: static char map_tool_name[17]; - sprintf(map_tool_name, "MapToolCamera%d", param_2); + sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(pActor, map_tool_name, 0xFF); } } @@ -748,12 +757,12 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* pActor, char const* eventName, u8 } /* 80047930-80047984 042270 0054+00 0/0 0/0 1/1 .text isMapToolCamera__16dEvent_manager_cFUcl */ -int dEvent_manager_c::isMapToolCamera(u8 param_0, s32 roomNo) { +int dEvent_manager_c::isMapToolCamera(u8 mapToolID, s32 roomNo) { if (roomNo == -1) { roomNo = dComIfGp_roomControl_getStayNo(); } - dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(param_0, roomNo); + dStage_MapEvent_dt_c* data = dEvt_control_c::searchMapEventData(mapToolID, roomNo); if (data != NULL) { return data->mType == 0; } else { @@ -763,20 +772,20 @@ int dEvent_manager_c::isMapToolCamera(u8 param_0, s32 roomNo) { /* 80047984-800479F8 0422C4 0074+00 0/0 6/6 0/0 .text order__16dEvent_manager_cFs */ int dEvent_manager_c::order(s16 eventCompositId) { - dEvDtEvent_c* event = this->getEventData(eventCompositId); + dEvDtEvent_c* event = getEventData(eventCompositId); if (event == NULL) { return 0; } else { mCurrentEventType = getTypeCompositId(eventCompositId); mCurrentEventCompositId = eventCompositId; - this->startProc(event); + startProc(event); return 1; } } /* 800479F8-80047A38 042338 0040+00 1/1 0/0 9/9 .text startCheck__16dEvent_manager_cFs */ int dEvent_manager_c::startCheck(s16 eventCompositId) { - dEvDtEvent_c* event = this->getEventData(eventCompositId); + dEvDtEvent_c* event = getEventData(eventCompositId); if (event == NULL) { return 0; } else { @@ -789,14 +798,14 @@ int dEvent_manager_c::startCheck(s16 eventCompositId) { } /* 80047A38-80047A78 042378 0040+00 0/0 2/2 0/0 .text startCheckOld__16dEvent_manager_cFPCc */ -int dEvent_manager_c::startCheckOld(char const* pName) { - return this->startCheck(this->getEventIdx(pName, 0xFF, -1)); +int dEvent_manager_c::startCheckOld(char const* name) { + return startCheck(getEventIdx(name, 0xFF, -1)); } /* 80047A78-80047ADC 0423B8 0064+00 1/1 2/2 122/122 .text endCheck__16dEvent_manager_cFs */ -int dEvent_manager_c::endCheck(s16 param_0) { - dEvDtEvent_c* event = this->getEventData(i_dComIfGp_getEvent().runningEventID(param_0)); +int dEvent_manager_c::endCheck(s16 eventID) { + dEvDtEvent_c* event = getEventData(i_dComIfGp_getEvent().runningEventID(eventID)); if (event == NULL) { return 0; } else { @@ -809,17 +818,17 @@ int dEvent_manager_c::endCheck(s16 param_0) { } /* 80047ADC-80047B1C 04241C 0040+00 0/0 2/2 10/10 .text endCheckOld__16dEvent_manager_cFPCc */ -int dEvent_manager_c::endCheckOld(char const* pName) { - return this->endCheck(this->getEventIdx(pName, 0xFF, -1)); +int dEvent_manager_c::endCheckOld(char const* name) { + return endCheck(getEventIdx(name, 0xFF, -1)); } /* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text * getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci */ -int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, int tagId) { +int dEvent_manager_c::getMyStaffId(char const* staffName, fopAc_ac_c* pActor, int tagId) { int staffNum; int i; int evtIdx = -1; - if (i_dComIfGp_getEvent().getMode() == 0) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return -1; } else { if (pActor != NULL) { @@ -828,12 +837,12 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i if (mCurrentEventCompositId == -1) { return -1; } else { - dEvDtEvent_c* event = this->getEventData(mCurrentEventCompositId); + dEvDtEvent_c* event = getEventData(mCurrentEventCompositId); if (event != NULL && (event->mEventState == 1 || event->mEventState == 2)) { int staffCount = event->getNStaff(); bool hasDp = false; - if (strchr(pStaffName, ':') != NULL) { + if (strchr(staffName, ':') != NULL) { hasDp = true; } @@ -853,7 +862,7 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i } } - if (strcmp(pStaffName, buf) == 0 && (tagId < 0 || tagId == staff->mTagID)) { + if (strcmp(staffName, buf) == 0 && (tagId < 0 || tagId == staff->mTagID)) { s16 num = 0; if (ptr != NULL) { char c; @@ -873,7 +882,7 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i } } - if (strcmp(pStaffName, "Alink") == 0 && strcmp("Link", buf) == 0 && + if (strcmp(staffName, "Alink") == 0 && strcmp("Link", buf) == 0 && tagId == staff->mTagID) { return staffNum; } @@ -886,51 +895,51 @@ int dEvent_manager_c::getMyStaffId(char const* pStaffName, fopAc_ac_c* pActor, i } /* 80047D4C-80047DAC 04268C 0060+00 0/0 9/9 417/417 .text getIsAddvance__16dEvent_manager_cFi */ -int dEvent_manager_c::getIsAddvance(int param_0) { - if (i_dComIfGp_getEvent().getMode() == 0) { +int dEvent_manager_c::getIsAddvance(int staffIdx) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return 0; - } else if (param_0 == -1) { + } else if (staffIdx == -1) { return 0; } else if (mCurrentEventCompositId == -1) { return 0; } else { - return this->getBase().getStaffP(param_0)->field_0x40; + return getBase().getStaffP(staffIdx)->field_0x40; } } /* 80047DAC-80047E10 0426EC 0064+00 1/1 0/0 0/0 .text dEvmng_strcmp__FPCcPc */ -static int dEvmng_strcmp(char const* param_0, char* param_1) { +static int dEvmng_strcmp(char const* strA, char* strB) { u32 len = 0; - while (*param_0 != '\0') { - if (*param_1 == '\0') { + while (*strA != '\0') { + if (*strB == '\0') { return 1; } if (len >= 100) { return -1; } - if (*param_0 != *param_1) { + if (*strA != *strB) { return 1; } len++; - param_0++; - param_1++; + strA++; + strB++; } return 0; } /* 80047E10-80047F5C 042750 014C+00 1/1 1/1 118/118 .text * getMyActIdx__16dEvent_manager_cFiPCPCciii */ -int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int param_2, int param_3, - int param_4) { - if (i_dComIfGp_getEvent().getMode() == 0) { +int dEvent_manager_c::getMyActIdx(int staffIdx, char const* const* param_1, int param_2, + int param_3, int param_4) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return 0; - } else if (param_0 == -1) { + } else if (staffIdx == -1) { return -1; } else if (mCurrentEventCompositId == -1) { return -1; } - dEvDtStaff_c* staff = getBase().getStaffP(param_0); + dEvDtStaff_c* staff = getBase().getStaffP(staffIdx); if (staff) { if (staff->field_0x41 != false && param_3 == 0) { return staff->field_0x3c; @@ -940,7 +949,7 @@ int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int p } int i; - char* nowCutName = this->getMyNowCutName(param_0); + char* nowCutName = getMyNowCutName(staffIdx); if (nowCutName == NULL) { staff->field_0x3c = -1; return -1; @@ -965,21 +974,21 @@ int dEvent_manager_c::getMyActIdx(int param_0, char const* const* param_1, int p } /* 80047F5C-80047FC8 04289C 006C+00 1/1 9/9 62/62 .text getMyNowCutName__16dEvent_manager_cFi */ -char* dEvent_manager_c::getMyNowCutName(int index) { - if (i_dComIfGp_getEvent().getMode() == 0) { +char* dEvent_manager_c::getMyNowCutName(int cutIndex) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return NULL; - } else if (index == -1) { + } else if (cutIndex == -1) { return NULL; } else if (mCurrentEventCompositId == -1) { return NULL; } else { - return getBase().getCutStaffCurrentCutP(index)->getName(); + return getBase().getCutStaffCurrentCutP(cutIndex)->getName(); } } /* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */ dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) { - if (i_dComIfGp_getEvent().getMode() == 0) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return NULL; } else if (index == -1) { return NULL; @@ -1030,16 +1039,16 @@ int dEvent_manager_c::getMySubstanceNum(int index, char const* name) { /* 8004817C-800481F4 042ABC 0078+00 1/1 78/78 182/182 .text cutEnd__16dEvent_manager_cFi */ #ifdef NONMATCHING -void dEvent_manager_c::cutEnd(int index) { - if (i_dComIfGp_getEvent().getMode() == 0) { +void dEvent_manager_c::cutEnd(int cutIndex) { + if (i_dComIfGp_getEvent().getMode() == EVT_MODE_NONE) { return; - } else if (index == -1) { + } else if (cutIndex == -1) { return; } else if (field_0x1aa == -1) { return; } else { // instruction swap - mFlags.flagSet(getBase().getCutStaffCurrentCutP(index)->getFlagId()); + mFlags.flagSet(getBase().getCutStaffCurrentCutP(cutIndex)->getFlagId()); } } #else @@ -1078,31 +1087,31 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* pActor, s16 eventCompositId) { /* 800482CC-80048348 042C0C 007C+00 1/1 1/1 0/0 .text issueStaff__16dEvent_manager_cFPCc */ -void dEvent_manager_c::issueStaff(char const* pName) { - if (!strcmp(pName, "ALL")) { +void dEvent_manager_c::issueStaff(char const* name) { + if (!strcmp(name, "ALL")) { fopAcM_Search((fopAcIt_JudgeFunc)extraOnObjectCallBack, NULL); } else { char nameBuf[0x20]; - strcpy(nameBuf, pName); + strcpy(nameBuf, name); fopAcM_OnStatus(fopAcM_searchFromName4Event(nameBuf, -1), 0x800); } } /* 80048348-800483C4 042C88 007C+00 0/0 1/1 0/0 .text cancelStaff__16dEvent_manager_cFPCc */ -void dEvent_manager_c::cancelStaff(char const* pName) { - if (!strcmp(pName, "ALL")) { +void dEvent_manager_c::cancelStaff(char const* name) { + if (!strcmp(name, "ALL")) { fopAcM_Search((fopAcIt_JudgeFunc)extraOffObjectCallBack, NULL); } else { char nameBuf[0x20]; - strcpy(nameBuf, pName); + strcpy(nameBuf, name); fopAcM_OffStatus(fopAcM_searchFromName4Event(nameBuf, -1), 0x800); } } /* 800483C4-800483E0 042D04 001C+00 1/1 2/2 38/38 .text setGoal__16dEvent_manager_cFP4cXyz */ -void dEvent_manager_c::setGoal(cXyz* pGoal) { - mGoal = *pGoal; +void dEvent_manager_c::setGoal(cXyz* p_goal) { + mGoal = *p_goal; } /* 800483E0-800483E8 042D20 0008+00 0/0 1/1 1/1 .text getGoal__16dEvent_manager_cFv */ @@ -1161,7 +1170,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { s16 angle = prms.mActor->mOrig.mAngle.y + 0x8000; goal.x += cM_ssin(angle) * 100; goal.z += cM_scos(angle) * 100; - this->setGoal(&goal); + setGoal(&goal); i_dComIfGp_getEvent().setPt2(shutterActor); i_dComIfGp_getEvent().setPtD(shutterActor); } @@ -1169,13 +1178,13 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 bsTypeId, int param_1) { } /* 80048618-80048748 042F58 0130+00 1/1 0/0 0/0 .text specialCast__16dEvent_manager_cFPCci */ -fopAc_ac_c* dEvent_manager_c::specialCast(char const* pName, int param_1) { +fopAc_ac_c* dEvent_manager_c::specialCast(char const* name, int param_1) { fopAc_ac_c* shutterActor = NULL; - if (pName == NULL) { + if (name == NULL) { return NULL; } - if (!strcmp(pName, "SHUTTER_DOOR")) { + if (!strcmp(name, "SHUTTER_DOOR")) { shutterActor = specialCast_Shutter(0x226, param_1); if (shutterActor == NULL) { shutterActor = specialCast_Shutter(0x228, param_1); @@ -1217,7 +1226,7 @@ static int dEv_talkman_get_action(int param_0) { "TALK1", }; int actIdx = i_dComIfGp_getEventManager().getMyActIdx(staffId, action_table, - ARRAY_SIZE(action_table), 0, 0); + ARRAY_SIZE(action_table), 0, 0); if (actIdx == param_0) { i_dComIfGp_getEventManager().cutEnd(staffId); } diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index 334ad8eecbe..b1713ea6ba1 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -323,7 +323,7 @@ asm void dFile_warning_c::setFontColor(JUtility::TColor param_0, JUtility::TColo #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { +asm bool J2DTextBox::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { nofralloc #include "asm/d/file/d_file_sel_warning/setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor.s" } diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index 779a93cd3ec..b6ef5f15cf9 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -6,34 +6,8 @@ #include "d/map/d_map_path.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct dRes_info_c {}; - -struct dRes_control_c { - /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); -}; - -struct dMpath_n { - struct dTexObjAggregate_c { - /* 8003C85C */ void create(); - /* 8003C8F4 */ void remove(); - /* 8003D740 */ ~dTexObjAggregate_c() { remove(); }; - inline dTexObjAggregate_c() { - for (int i = 0; i < 7; i++) { - mTexObjs[i] = NULL; - } - } - GXTexObj* mTexObjs[7]; - }; - - static dTexObjAggregate_c m_texObjAgg; -}; - -STATIC_ASSERT(sizeof(dMpath_n::dTexObjAggregate_c) == 28); +#include "d/com/d_com_inf_game.h" +#include "m_Do/m_Do_lib.h" // // Forward References: @@ -87,158 +61,206 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" extern Mtx g_mDoMtx_identity; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern GXColor g_clearColor; // // Declarations: // -/* ############################################################################################## */ -/* 80379C30-80379C4C 006290 001C+00 1/1 0/0 0/0 .rodata data$3644 */ -SECTION_RODATA static u8 const data[28] = { - 0x00, 0x00, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x4D, 0x00, 0x00, - 0x00, 0x4E, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x52, -}; -COMPILER_STRIP_GATE(0x80379C30, &data); - -/* 80379C4C-80379C4C 0062AC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80379C4C = "Always"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_80379C53 = "\0\0\0\0"; -#pragma pop - /* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_n::dTexObjAggregate_c::create() { - nofralloc -#include "asm/d/map/d_map_path/create__Q28dMpath_n18dTexObjAggregate_cFv.s" +void dMpath_n::dTexObjAggregate_c::create() { + static int const data[7] = { + 79, 80, 77, 78, 76, 81, 82, + }; + + for (int i = 0; i < 7; i++) { + mp_texObj[i] = new GXTexObj(); + + ResTIMG* image = (ResTIMG*)dComIfG_getObjectRes("Always", data[i]); + mDoLib_setResTimgObj(image, mp_texObj[i], 0, NULL); + } } -#pragma pop /* 8003C8F4-8003C94C 037234 0058+00 1/1 1/1 0/0 .text remove__Q28dMpath_n18dTexObjAggregate_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMpath_n::dTexObjAggregate_c::remove() { - nofralloc -#include "asm/d/map/d_map_path/remove__Q28dMpath_n18dTexObjAggregate_cFv.s" +void dMpath_n::dTexObjAggregate_c::remove() { + for (int i = 0; i < 7; i++) { + delete mp_texObj[i]; + mp_texObj[i] = NULL; + } } -#pragma pop /* 8003C94C-8003CA40 03728C 00F4+00 2/0 9/2 0/0 .text * rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::rendering(dDrawPath_c::line_class const* param_0) { - nofralloc -#include "asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class.s" +void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) { + if (isDrawType(p_line->unk0)) { + int width = getLineWidth(p_line->unk1); + + if (width > 0 && p_line->unk2 >= 2) { + GXSetLineWidth(width, GX_TO_ZERO); + GXSetTevColor(GX_TEVREG0, *getLineColor(p_line->unk0 & 0x3F, p_line->unk1)); + GXBegin(GX_LINESTRIP, GX_VTXFMT0, p_line->unk2); + + u16* tmp = p_line->unk4; + for (int i = 0; i < p_line->unk2; i++) { + GXPosition1x16(*tmp); + tmp++; + } + i_GXEnd(); + } + } } -#pragma pop /* 8003CA40-8003CB00 037380 00C0+00 2/0 9/1 0/0 .text * rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::rendering(dDrawPath_c::poly_class const* param_0) { - nofralloc -#include "asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class.s" +void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) { + if (isDrawType(p_poly->field_0x0)) { + GXSetTevColor(GX_TEVREG0, *getColor(p_poly->field_0x0 & 0x3F)); + + if (p_poly->field_0x1 >= 3) { + GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, p_poly->field_0x1); + + u16* tmp = p_poly->field_0x4; + for (int i = 0; i < p_poly->field_0x1; i++) { + GXPosition1x16(*tmp); + tmp++; + } + i_GXEnd(); + } + } } -#pragma pop /* 8003CB00-8003CBBC 037440 00BC+00 1/1 0/0 0/0 .text * rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::rendering(dDrawPath_c::group_class const* param_0) { - nofralloc -#include "asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class.s" +void dDrawPath_c::rendering(dDrawPath_c::group_class const* p_group) { + if (isSwitch(p_group)) { + poly_class* poly = p_group->mpPoly; + for (int i = 0; i < p_group->field_0x4; i++) { + rendering(poly); + poly++; + } + + line_class* line = p_group->mpLine; + for (int i = 0; i < p_group->field_0x2; i++) { + rendering(line); + line++; + } + } } -#pragma pop /* 8003CBBC-8003CC24 0374FC 0068+00 1/1 0/0 0/0 .text * rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::rendering(dDrawPath_c::floor_class const* param_0) { - nofralloc -#include "asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class.s" +void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) { + if (p_floor->mpGroup != NULL) { + group_class* group = p_floor->mpGroup; + + for (int i = 0; i < p_floor->field_0x1; i++) { + rendering(group); + group++; + } + } } -#pragma pop /* 8003CC24-8003CCC4 037564 00A0+00 2/0 9/1 0/0 .text * rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::rendering(dDrawPath_c::room_class const* param_0) { - nofralloc -#include "asm/d/map/d_map_path/rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class.s" +void dDrawPath_c::rendering(dDrawPath_c::room_class const* p_room) { + if (p_room != NULL) { + GXSetArray(GX_VA_POS, p_room->field_0x8, 8); + floor_class* floor = p_room->mpFloor; + + if (floor != NULL) { + for (int i = 0; i < p_room->field_0x0; i++) { + if (isRenderingFloor(floor->field_0x0)) { + rendering(floor); + } + floor++; + } + } + } } -#pragma pop /* 8003CCC4-8003CD38 037604 0074+00 2/0 9/1 0/0 .text drawPath__11dDrawPath_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dDrawPath_c::drawPath() { - nofralloc -#include "asm/d/map/d_map_path/drawPath__11dDrawPath_cFv.s" +void dDrawPath_c::drawPath() { + room_class* room = getFirstRoomPointer(); + while (room != NULL) { + rendering(room); + room = getNextRoomPointer(); + } } -#pragma pop /* 8003CD38-8003CDAC 037678 0074+00 0/0 3/3 0/0 .text * makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRenderingMap_c::makeResTIMG(ResTIMG* param_0, u16 param_1, u16 param_2, u8* param_3, - u8* param_4, u16 param_5) const { - nofralloc -#include "asm/d/map/d_map_path/makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs.s" +void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p_data, + u8* p_palette, u16 param_5) const { + p_image->format = GX_TF_CI14; + p_image->alphaEnabled = 2; + p_image->width = width; + p_image->height = height; + p_image->wrapS = GX_CLAMP; + p_image->wrapT = GX_CLAMP; + p_image->palettesEnabled = true; + p_image->paletteFormat = 2; + p_image->paletteCount = param_5 * 4; + p_image->paletteOffset = p_palette - (u8*)p_image; + p_image->mipmapEnabled = false; + p_image->doEdgeLOD = false; + p_image->biasClamp = false; + p_image->maxAnisotropy = 0; + p_image->minFilter = GX_LINEAR; + p_image->magFilter = GX_LINEAR; + p_image->minLOD = 0; + p_image->maxLOD = 0; + p_image->mipmapCount = 1; + p_image->LODBias = 0; + p_image->texDataOffset = p_data - (u8*)p_image; } -#pragma pop /* 8003CDAC-8003CE78 0376EC 00CC+00 0/0 2/2 0/0 .text renderingMap__15dRenderingMap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRenderingMap_c::renderingMap() { - nofralloc -#include "asm/d/map/d_map_path/renderingMap__15dRenderingMap_cFv.s" +void dRenderingMap_c::renderingMap() { + preRenderingMap(); + if (isDrawPath()) { + preDrawPath(); + beforeDrawPath(); + drawPath(); + afterDrawPath(); + postDrawPath(); + } + postRenderingMap(); } -#pragma pop /* 8003CE78-8003CF40 0377B8 00C8+00 2/2 3/3 0/0 .text * setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const { - nofralloc -#include "asm/d/map/d_map_path/setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv.s" +void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const { + GXSetNumTevStages(1); + GXSetNumChans(1); + GXSetNumTexGens(0); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0); } -#pragma pop /* 8003CF40-8003D0AC 037880 016C+00 1/1 3/3 0/0 .text * setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const { - nofralloc -#include "asm/d/map/d_map_path/setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv.s" +void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const { + GXSetNumTevStages(2); + GXSetNumChans(1); + GXSetNumTexGens(1); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_KONST, GX_CC_TEXC, GX_CC_C1); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevColorIn(GX_TEVSTAGE1, GX_CC_CPREV, GX_CC_C2, GX_CC_CPREV, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE1, GX_TEV_COMP_R8_GT, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE1, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_TEXA); + GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); + GXSetAlphaCompare(GX_GREATER, 0, GX_AOP_AND, GX_ALWAYS, 0); + GXSetTevKColorSel(GX_TEVSTAGE0, GX_TEV_KCSEL_1_4); } -#pragma pop /* 8003D0AC-8003D188 0379EC 00DC+00 1/1 0/0 0/0 .text drawBack__18dRenderingFDAmap_cCFv */ @@ -246,14 +268,13 @@ void dRenderingFDAmap_c::drawBack() const { GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0); - GXColor* colorPtr = getBackColor(); - GXSetTevColor(GX_TEVREG0, *colorPtr); + GXSetTevColor(GX_TEVREG0, *getBackColor()); GXBegin(GX_QUADS, GX_VTXFMT0, 4); GXPosition3f32(-field_0x8, -field_0xc, 0); GXPosition3f32(field_0x8, -field_0xc, 0); GXPosition3f32(field_0x8, field_0xc, 0); GXPosition3f32(-field_0x8, field_0xc, 0); - GXEnd(); + i_GXEnd(); } /* 8003D188-8003D320 037AC8 0198+00 1/0 8/0 0/0 .text preRenderingMap__18dRenderingFDAmap_cFv */ @@ -268,15 +289,14 @@ void dRenderingFDAmap_c::preRenderingMap() { GXSetZCompLoc(GX_TRUE); GXSetZMode(GX_FALSE, GX_ALWAYS, GX_FALSE); GXSetBlendMode(GX_BM_NONE, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_CLEAR); - GXColor color = g_clearColor; - GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, color); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, g_clearColor); GXSetCullMode(GX_CULL_NONE); GXSetDither(GX_FALSE); GXSetNumIndStages(0); - GXSetClipMode(GX_FALSE); + GXSetClipMode(GX_CLIP_ENABLE); setTevSettingNonTextureDirectColor(); - float right = field_0x8 * 0.5f; - float top = field_0xc * 0.5f; + f32 right = field_0x8 * 0.5f; + f32 top = field_0xc * 0.5f; Mtx44 matrix; C_MTXOrtho(matrix, top, -top, -right, right, 0.0f, 10000.0f); GXSetProjection(matrix, GX_ORTHOGRAPHIC); @@ -286,14 +306,16 @@ void dRenderingFDAmap_c::preRenderingMap() { } /* 8003D320-8003D3C0 037C60 00A0+00 1/0 7/1 0/0 .text postRenderingMap__18dRenderingFDAmap_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dRenderingFDAmap_c::postRenderingMap() { - nofralloc -#include "asm/d/map/d_map_path/postRenderingMap__18dRenderingFDAmap_cFv.s" +void dRenderingFDAmap_c::postRenderingMap() { + GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL); + GXSetTexCopySrc(0, 0, field_0x1c, field_0x1e); + GXSetTexCopyDst(field_0x1c, field_0x1e, _GX_CTF_R8, GX_FALSE); + GXCopyTex(field_0x4, GX_TRUE); + GXPixModeSync(); + GXSetClipMode(GX_CLIP_ENABLE); + GXSetDither(GX_TRUE); + dComIfGp_getCurrentGrafPort()->setup2D(); } -#pragma pop /* 80424684-804246A0 0513A4 001C+00 2/2 5/5 0/0 .bss m_texObjAgg__8dMpath_n */ dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg; @@ -306,8 +328,8 @@ dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg; /* 8003D3C0-8003D68C 037D00 02CC+00 0/0 2/2 0/0 .text * renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class */ -void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* line) { - s32 width = getDecorationLineWidth(line->unk1); +void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_line) { + s32 width = getDecorationLineWidth(p_line->unk1); if (width <= 0) { return; } @@ -318,13 +340,12 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* line GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_POS_XYZ, GX_F32, 0); GXSetNumTevStages(1); - GXLoadTexObj(dMpath_n::m_texObjAgg.mTexObjs[6], GX_TEXMAP0); - u16* unk = line->unk4; - s32 unk2 = line->unk2; + GXLoadTexObj(dMpath_n::m_texObjAgg.mp_texObj[6], GX_TEXMAP0); + u16* unk = p_line->unk4; + s32 unk2 = p_line->unk2; GXSetLineWidth(width, GX_TO_ONE); GXSetPointSize(width, GX_TO_ONE); - GXColor* lineColorPtr = getDecoLineColor(line->unk0 & 0x3f, line->unk1); - GXColor lineColor = *lineColorPtr; + GXColor lineColor = *getDecoLineColor(p_line->unk0 & 0x3f, p_line->unk1); GXSetTevColor(GX_TEVREG0, lineColor); lineColor.r = lineColor.r - 4; GXSetTevColor(GX_TEVREG1, lineColor); @@ -351,7 +372,7 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* line GXBegin(GX_POINTS, GX_VTXFMT0, 1); GXPosition1x16(unk[0]); GXTexCoord2f32(0, 0); - GXEnd(); + i_GXEnd(); } setTevSettingNonTextureDirectColor(); GXClearVtxDesc(); @@ -360,25 +381,15 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* line } /* 8003D68C-8003D6B8 037FCC 002C+00 1/0 6/0 0/0 .text getDecoLineColor__18dRenderingFDAmap_cFii */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) { - nofralloc -#include "asm/d/map/d_map_path/getDecoLineColor__18dRenderingFDAmap_cFii.s" +GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) { + return getLineColor(param_0, param_1); } -#pragma pop /* 8003D6B8-8003D6E4 037FF8 002C+00 1/0 6/0 0/0 .text * getDecorationLineWidth__18dRenderingFDAmap_cFi */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) { - nofralloc -#include "asm/d/map/d_map_path/getDecorationLineWidth__18dRenderingFDAmap_cFi.s" +s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) { + return getLineWidth(param_0); } -#pragma pop /* ############################################################################################## */ /* 803A7C90-803A7CF8 004DB0 0068+00 0/0 12/12 0/0 .data __vt__18dRenderingFDAmap_c */ diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index 5a6f4b25d86..c267e39d189 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -4,25 +4,18 @@ // #include "d/map/d_map_path_dmap.h" +#include "d/map/d_map_path.h" #include "d/com/d_com_inf_game.h" #include "d/meter/d_meter_HIO.h" #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_mtx.h" +#include "MSL_C/math.h" // // Types: // -struct dMpath_n { - struct dTexObjAggregate_c { - /* 8003C85C */ void create(); - /* 8003C8F4 */ void remove(); - }; - - static u8 m_texObjAgg[28]; -}; - struct dMapInfo_c { /* 8003F40C */ void calcFloorNo(f32, bool, int); /* 8003F570 */ void calcNowStayFloorNo(f32, bool); @@ -614,7 +607,7 @@ asm void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 param_2, int para #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* param_0) { +asm bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* param_0) { nofralloc #include "asm/d/map/d_map_path_dmap/isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class.s" } @@ -654,7 +647,7 @@ asm GXColor* renderingDAmap_c::getBackColor() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void renderingDAmap_c::isRenderingFloor(int param_0) { +asm bool renderingDAmap_c::isRenderingFloor(int param_0) { nofralloc #include "asm/d/map/d_map_path_dmap/isRenderingFloor__16renderingDAmap_cFi.s" } @@ -743,7 +736,7 @@ asm void renderingDAmap_c::getNextDrawRoomNo(int param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void renderingDAmap_c::getFirstRoomPointer() { +asm dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() { nofralloc #include "asm/d/map/d_map_path_dmap/getFirstRoomPointer__16renderingDAmap_cFv.s" } @@ -753,7 +746,7 @@ asm void renderingDAmap_c::getFirstRoomPointer() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void renderingDAmap_c::getNextRoomPointer() { +asm dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() { nofralloc #include "asm/d/map/d_map_path_dmap/getNextRoomPointer__16renderingDAmap_cFv.s" } @@ -763,7 +756,7 @@ asm void renderingDAmap_c::getNextRoomPointer() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void renderingDAmap_c::isDrawPath() { +asm bool renderingDAmap_c::isDrawPath() { nofralloc #include "asm/d/map/d_map_path_dmap/isDrawPath__16renderingDAmap_cFv.s" } diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index 00b1e6c2827..d47a40a9b68 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -279,40 +279,16 @@ SECTION_DATA static char* bmg_filename[10] = { }; /* 803BF350-803BF554 01C470 0204+00 1/1 0/0 0/0 .data i_action_num$8471 */ -SECTION_DATA static u8 i_action_num[516] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xE9, 0x00, 0x00, 0x03, 0xEA, 0x00, 0x00, 0x03, 0xEB, - 0x00, 0x00, 0x03, 0xEC, 0x00, 0x00, 0x03, 0xED, 0x00, 0x00, 0x03, 0xEE, 0x00, 0x00, 0x03, 0xEF, - 0x00, 0x00, 0x05, 0x6B, 0x00, 0x00, 0x03, 0xF1, 0x00, 0x00, 0x03, 0xF2, 0x00, 0x00, 0x03, 0xF3, - 0x00, 0x00, 0x03, 0xF4, 0x00, 0x00, 0x03, 0xF5, 0x00, 0x00, 0x03, 0xF6, 0x00, 0x00, 0x03, 0xF7, - 0x00, 0x00, 0x04, 0x09, 0x00, 0x00, 0x03, 0xF8, 0x00, 0x00, 0x03, 0xF9, 0x00, 0x00, 0x03, 0xFA, - 0x00, 0x00, 0x03, 0xFB, 0x00, 0x00, 0x03, 0xFC, 0x00, 0x00, 0x04, 0x15, 0x00, 0x00, 0x03, 0xFE, - 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x04, 0x05, - 0x00, 0x00, 0x04, 0x06, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x07, 0x00, 0x00, 0x04, 0x01, - 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x04, 0x15, 0x00, 0x00, 0x04, 0x0C, 0x00, 0x00, 0x04, 0x08, - 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x0B, 0x00, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x04, 0x0D, 0x00, 0x00, 0x04, 0x0E, - 0x00, 0x00, 0x04, 0x0F, 0x00, 0x00, 0x04, 0x10, 0x00, 0x00, 0x04, 0x11, 0x00, 0x00, 0x03, 0xE6, - 0x00, 0x00, 0x04, 0x12, 0x00, 0x00, 0x04, 0x13, 0x00, 0x00, 0x04, 0x14, 0x00, 0x00, 0x04, 0x16, - 0x00, 0x00, 0x04, 0x17, 0x00, 0x00, 0x04, 0x18, 0x00, 0x00, 0x04, 0x19, 0x00, 0x00, 0x04, 0x1A, - 0x00, 0x00, 0x04, 0x1B, 0x00, 0x00, 0x04, 0x1C, 0x00, 0x00, 0x04, 0x1D, 0x00, 0x00, 0x04, 0x1E, - 0x00, 0x00, 0x04, 0x1F, 0x00, 0x00, 0x04, 0x20, 0x00, 0x00, 0x04, 0x21, 0x00, 0x00, 0x04, 0x22, - 0x00, 0x00, 0x04, 0x23, 0x00, 0x00, 0x04, 0x2E, 0x00, 0x00, 0x04, 0x24, 0x00, 0x00, 0x04, 0x25, - 0x00, 0x00, 0x04, 0x26, 0x00, 0x00, 0x04, 0x27, 0x00, 0x00, 0x04, 0x28, 0x00, 0x00, 0x04, 0x2B, - 0x00, 0x00, 0x04, 0x29, 0x00, 0x00, 0x04, 0x2A, 0x00, 0x00, 0x04, 0xBB, 0x00, 0x00, 0x04, 0x2D, - 0x00, 0x00, 0x03, 0xFD, 0x00, 0x00, 0x04, 0x30, 0x00, 0x00, 0x04, 0x31, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x04, 0x32, 0x00, 0x00, 0x04, 0x33, 0x00, 0x00, 0x04, 0x34, 0x00, 0x00, 0x04, 0x35, - 0x00, 0x00, 0x04, 0x36, 0x00, 0x00, 0x04, 0x37, 0x00, 0x00, 0x04, 0x38, 0x00, 0x00, 0x04, 0x39, - 0x00, 0x00, 0x04, 0x3A, 0x00, 0x00, 0x04, 0x3B, 0x00, 0x00, 0x04, 0x3C, 0x00, 0x00, 0x04, 0x3D, - 0x00, 0x00, 0x04, 0x3E, 0x00, 0x00, 0x04, 0x3F, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 0x04, 0x41, - 0x00, 0x00, 0x04, 0x42, 0x00, 0x00, 0x04, 0x44, 0x00, 0x00, 0x04, 0x45, 0x00, 0x00, 0x04, 0x46, - 0x00, 0x00, 0x04, 0x47, 0x00, 0x00, 0x04, 0x48, 0x00, 0x00, 0x07, 0x70, 0x00, 0x00, 0x04, 0x49, - 0x00, 0x00, 0x04, 0x4A, 0x00, 0x00, 0x04, 0x4B, 0x00, 0x00, 0x04, 0x4C, 0x00, 0x00, 0x04, 0x7E, - 0x00, 0x00, 0x04, 0x7D, 0x00, 0x00, 0x04, 0x7C, 0x00, 0x00, 0x05, 0x61, 0x00, 0x00, 0x04, 0x7B, - 0x00, 0x00, 0x04, 0x79, 0x00, 0x00, 0x04, 0x7A, 0x00, 0x00, 0x04, 0x89, 0x00, 0x00, 0x04, 0x8A, - 0x00, 0x00, 0x04, 0x8B, 0x00, 0x00, 0x04, 0x8C, 0x00, 0x00, 0x04, 0x8D, 0x00, 0x00, 0x04, 0x8E, - 0x00, 0x00, 0x04, 0x78, 0x00, 0x00, 0x03, 0xD6, 0x00, 0x00, 0x03, 0xD7, 0x00, 0x00, 0x04, 0x77, - 0x00, 0x00, 0x04, 0x88, 0x00, 0x00, 0x05, 0x27, 0x00, 0x00, 0x05, 0x22, 0x00, 0x00, 0x05, 0x77, - 0x00, 0x00, 0x03, 0xF0, +SECTION_DATA static int i_action_num[129] = { + 0, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014, + 1015, 1033, 1016, 1017, 1018, 1019, 1020, 1045, 1022, 1026, 1027, 1028, 1029, 1030, 1024, + 1031, 1025, 1023, 1045, 1036, 1032, 93, 0, 0, 0, 1035, 1034, 1037, 1038, 1039, + 1040, 1041, 998, 1042, 1043, 1044, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, + 1055, 1056, 1057, 1058, 1059, 1070, 1060, 1061, 1062, 1063, 1064, 1067, 1065, 1066, 1211, + 1069, 1021, 1072, 1073, 0, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, + 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1092, 1093, 1094, 1095, 1096, 1904, 1097, 1098, + 1099, 1100, 1150, 1149, 1148, 1377, 1147, 1145, 1146, 1161, 1162, 1163, 1164, 1165, 1166, + 1144, 982, 983, 1143, 1160, 1319, 1314, 1399, 1008, }; /* 803BF554-803BF578 -00001 0024+00 1/1 0/0 0/0 .data @9008 */ @@ -521,7 +497,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* p_heap) { mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL); field_0x548 = ((J2DPicture*)mpPikariScreen->search('pika00'))->getBlack(); field_0x54c = ((J2DPicture*)mpPikariScreen->search('pika00'))->getWhite(); - OSInitFastCast(); + i_OSInitFastCast(); void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive()); mPikariBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(pikari_bck); playPikariBckAnimation(1.0f); @@ -1159,7 +1135,7 @@ void dMeter2Draw_c::initMagic() { mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL); mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); - OSInitFastCast(); + i_OSInitFastCast(); void* res = JKRFileLoader::getGlbResource("zelda_game_image_sanso_10percent.bpk", dComIfGp_getMain2DArchive()); diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index a9f6a3a1400..2feb933df98 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -562,7 +562,7 @@ dScnLogo_c::~dScnLogo_c() { field_0x1d4->destroy(); field_0x1d0->destroy(); - JKRFree(buffer); + i_JKRFree(buffer); dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index b542f18693d..77ac77ae87f 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1007,7 +1007,7 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, priority = 0x1FF; } - return dComIfGp_event_order(0, priority, flag, 0x14F, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_TALK, priority, flag, 0x14F, actorA, actorB, -1, -1); } /* 8001B0FC-8001B19C 015A3C 00A0+00 0/0 1/1 0/0 .text @@ -1019,7 +1019,7 @@ s32 fopAcM_orderTalkItemBtnEvent(u16 eventType, fopAc_ac_c* actorA, fopAc_ac_c* } if (priority == 0) { - priority = 0x1F4; + priority = 500; } return dComIfGp_event_order(eventType, priority, flag, 0x14F, actorA, actorB, -1, -1); @@ -1038,7 +1038,7 @@ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { priority = 0x1EA; } - return dComIfGp_event_order(0, priority, flag, 0x14F, dComIfGp_getPlayer(0), actor, -1, -1); + return dComIfGp_event_order(EVT_TYPE_TALK, priority, flag, 0x14F, dComIfGp_getPlayer(0), actor, -1, -1); } #else #pragma push @@ -1069,7 +1069,7 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, eventID = i_dComIfGp_getEventManager().getEventIdx(actorA, NULL, toolID); } - return dComIfGp_event_order(1, priority, flag, -1, actorA, actorB, eventID, toolID); + return dComIfGp_event_order(EVT_TYPE_DOOR, priority, flag, -1, actorA, actorB, eventID, toolID); } /* 8001B334-8001B3CC 015C74 0098+00 0/0 1/1 0/0 .text @@ -1083,7 +1083,7 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priority, priority = 2; } - return dComIfGp_event_order(10, priority, flag, -1, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_CATCH, priority, flag, -1, actorA, actorB, -1, -1); } /* 8001B3CC-8001B4E0 015D0C 0114+00 0/0 2/2 6/6 .text @@ -1108,7 +1108,7 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actor, char const* param_1, u16 param_2, eventPrio = priority; } - return dComIfGp_event_order(2, eventPrio, flag, param_2, actor, event_second_actor(flag), eventIdx, -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag, param_2, actor, event_second_actor(flag), eventIdx, -1); } /* 8001B4E0-8001B5E4 015E20 0104+00 0/0 1/1 2/2 .text @@ -1133,7 +1133,7 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, char const* p eventPrio = priority; } - return dComIfGp_event_order(2, eventPrio, flag, param_3, actorA, actorB, eventIdx, -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag, param_3, actorA, actorB, eventIdx, -1); } /* 8001B5E4-8001B67C 015F24 0098+00 0/0 2/2 41/41 .text @@ -1144,12 +1144,12 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* actor, s16 eventID, u16 flag, u16 para eventPrio = 0xFF; } - return dComIfGp_event_order(2, eventPrio, flag | 0x400, param_3, actor, event_second_actor(flag), eventID, -1); + return dComIfGp_event_order(EVT_TYPE_OTHER, eventPrio, flag | 0x400, param_3, actor, event_second_actor(flag), eventID, -1); } /* 8001B67C-8001B7B4 015FBC 0138+00 0/0 10/10 101/101 .text * fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs */ -s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 param_2, u16 param_3, +s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3, u16 priority, u16 flag) { if (!i_dComIfGp_getEvent().i_isOrderOK() && (!(flag & 0x400) || !i_dComIfGp_getEvent().isChangeOK(actor))) { return 0; @@ -1168,16 +1168,16 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 param_2, u16 par if (eventPrio != 0) { newPriority = eventPrio; - } else if (param_2 != 0xFF) { - dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(param_2, roomNo); + } else if (mapToolID != 0xFF) { + dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(mapToolID, roomNo); if (dt != NULL) { - newPriority = dt->field_0x6; + newPriority = dt->mPriority; } } } - return dComIfGp_event_order(2, newPriority, flag, param_3, actor, event_second_actor(flag), eventID, param_2); + return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, flag, param_3, actor, event_second_actor(flag), eventID, mapToolID); } /* 8001B7B4-8001B8E0 0160F4 012C+00 1/1 1/1 4/4 .text @@ -1196,7 +1196,7 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 par dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(param_1, roomNo); if (dt != NULL) { - newPriority = dt->field_0x6; + newPriority = dt->mPriority; if (eventID == 0xFF) { eventID = i_dComIfGp_getEventManager().getEventIdx(actor, param_1); @@ -1211,7 +1211,7 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* actor, u8 param_1, s16 eventID, u16 par newPriority = param_5; } - return dComIfGp_event_order(2, newPriority, flag, param_3, actor, event_second_actor(flag), eventID, param_1); + return dComIfGp_event_order(EVT_TYPE_OTHER, newPriority, flag, param_3, actor, event_second_actor(flag), eventID, param_1); } /* 8001B8E0-8001B908 016220 0028+00 0/0 1/1 1/1 .text @@ -1232,7 +1232,7 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* actor, u16 flag, u16 param_2, u16 pri priority = 0xFF; } - return dComIfGp_event_order(4, priority, flag, param_2, actor, event_second_actor(flag), -1, -1); + return dComIfGp_event_order(EVT_TYPE_POTENTIAL, priority, flag, param_2, actor, event_second_actor(flag), -1, -1); } /* 8001B9D0-8001BA7C 016310 00AC+00 0/0 3/3 12/12 .text fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs @@ -1248,7 +1248,7 @@ s32 fopAcM_orderItemEvent(fopAc_ac_c* actor, u16 priority, u16 flag) { priority = 0xFF; } - return dComIfGp_event_order(5, priority, flag, -1, dComIfGp_getPlayer(0), actor, -1, -1); + return dComIfGp_event_order(EVT_TYPE_ITEM, priority, flag, -1, dComIfGp_getPlayer(0), actor, -1, -1); } #else #pragma push @@ -1273,7 +1273,7 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* actorA, fopAc_ac_c* actorB, u16 priori priority = 0xFF; } - return dComIfGp_event_order(11, priority, flag, -1, actorA, actorB, -1, -1); + return dComIfGp_event_order(EVT_TYPE_TREASURE, priority, flag, -1, actorA, actorB, -1, -1); } /* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 7796a97e102..42298f008c1 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -38,7 +38,7 @@ void mDoDvdErr_ThdInit() { sizeof(DvdErr_stack), priority - 3, 1); OSResumeThread(&DvdErr_thread); OSCreateAlarm(&Alarm); - OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, AlarmHandler); + OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, (OSAlarmHandler*)AlarmHandler); mDoDvdErr_initialized = true; } diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 78f702774a1..5a932e20da5 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -10,7 +10,6 @@ #include "SSystem/SComponent/c_node.h" #include "dol2asm.h" #include "dolphin/dvd/dvd.h" -#include "dolphin/os/OSThread.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_reset.h" diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index d9ebebd6a1a..43c0ff16e11 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -372,7 +372,7 @@ static void darwFilter(GXColor matColor) { GXPosition3s8(1, 0, -5); GXPosition3s8(1, 1, -5); GXPosition3s8(0, 1, -5); - GXEnd(); + i_GXEnd(); } #else #pragma push @@ -637,7 +637,7 @@ void mDoGph_drawFilterQuad(s8 param_0, s8 param_1) { GXTexCoord2s8(1, 1); GXPosition2s8(0, param_1); GXTexCoord2s8(0, 1); - GXEnd(); + i_GXEnd(); } /* 80009544-800095F8 003E84 00B4+00 0/0 1/1 0/0 .text create__Q213mDoGph_gInf_c7bloom_cFv @@ -762,9 +762,9 @@ static void drawItem3D() { dMenu_Collect3D_c::setupItem3D(item_mtx); setLight(); j3dSys.setViewMtx(item_mtx); - GXSetClipMode(GX_ENABLE); + GXSetClipMode(GX_CLIP_DISABLE); dComIfGd_drawListItem3d(); - GXSetClipMode(GX_DISABLE); + GXSetClipMode(GX_CLIP_ENABLE); j3dSys.reinitGX(); } diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index ee74a139284..dfb56d6ffe3 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -77,7 +77,7 @@ bool mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 param_2, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoLib_setResTimgObj(ResTIMG const* param_0, _GXTexObj* param_1, u32 param_2, +asm bool mDoLib_setResTimgObj(ResTIMG const* param_0, _GXTexObj* param_1, u32 param_2, _GXTlutObj* param_3) { nofralloc #include "asm/m_Do/m_Do_lib/mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj.s" diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 5dcf89a8c2a..3880b2d23fc 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -25,12 +25,6 @@ extern "C" void mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_vprintf__FPCcP16__va_list_struct(); extern "C" void mDoPrintf_VReport(const char* fmt, va_list args); -extern "C" void OSVReport(const char* fmt, va_list args); -extern "C" void OSReport(const char*, ...); -extern "C" void OSReport_FatalError(const char* fmt, ...); -extern "C" void OSReport_Error(const char* fmt, ...); -extern "C" void OSReport_Warning(const char* fmt, ...); -extern "C" void OSReport_System(const char* fmt, ...); extern "C" extern char const* const m_Do_m_Do_printf__stringBase0; // @@ -64,12 +58,12 @@ void my_PutString(const char* string) { } /* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */ -void OSVAttention(char const* fmt, va_list args) { +void OSVAttention(char* fmt, va_list args) { mDoPrintf_vprintf(fmt, args); } /* 80006814-80006894 001154 0080+00 1/1 1/1 0/0 .text OSAttention */ -void OSAttention(const char* fmt, ...) { +void OSAttention(char* fmt, ...) { va_list args; va_start(args, fmt); mDoPrintf_vprintf(fmt, args); @@ -179,12 +173,12 @@ void mDoPrintf_VReport(const char* fmt, va_list args) { } /* 80006A9C-80006ABC 0013DC 0020+00 2/2 0/0 0/0 .text OSVReport */ -void OSVReport(const char* fmt, va_list args) { +void OSVReport(char* fmt, va_list args) { mDoPrintf_VReport(fmt, args); } /* 80006ABC-80006B3C 0013FC 0080+00 0/0 97/97 10/10 .text OSReport */ -void OSReport(const char* fmt, ...) { +void OSReport(char* fmt, ...) { va_list args; va_start(args, fmt); OSVReport(fmt, args); @@ -192,7 +186,7 @@ void OSReport(const char* fmt, ...) { } /* 80006B3C-80006C0C 00147C 00D0+00 0/0 2/2 0/0 .text OSReport_FatalError */ -void OSReport_FatalError(const char* fmt, ...) { +void OSReport_FatalError(char* fmt, ...) { va_list args; va_start(args, fmt); @@ -208,7 +202,7 @@ void OSReport_FatalError(const char* fmt, ...) { } /* 80006C0C-80006CEC 00154C 00E0+00 0/0 31/31 10/10 .text OSReport_Error */ -void OSReport_Error(const char* fmt, ...) { +void OSReport_Error(char* fmt, ...) { print_errors++; if (!data_80450B99) { va_list args; @@ -224,7 +218,7 @@ void OSReport_Error(const char* fmt, ...) { } /* 80006CEC-80006DCC 00162C 00E0+00 0/0 6/6 0/0 .text OSReport_Warning */ -void OSReport_Warning(const char* fmt, ...) { +void OSReport_Warning(char* fmt, ...) { print_warings++; if (!data_80450B9A) { va_list args; @@ -240,7 +234,7 @@ void OSReport_Warning(const char* fmt, ...) { } /* 80006DCC-80006E7C 00170C 00B0+00 0/0 1/1 0/0 .text OSReport_System */ -void OSReport_System(const char* fmt, ...) { +void OSReport_System(char* fmt, ...) { print_systems++; if (!data_80450B9B) { va_list args; @@ -265,7 +259,7 @@ SECTION_DEAD static char const* const stringBase_80373D4C = "0x%08x: 0x%08x /* 80006E7C-80006FB4 0017BC 0138+00 0/0 9/9 0/0 .text OSPanic */ // loop stuff / ending #ifdef NONMATCHING -void OSPanic(const char* file, s32 line, const char* fmt, ...) { +void OSPanic(char* file, s32 line, char* fmt, ...) { OSDisableInterrupts(); va_list args; @@ -291,7 +285,7 @@ void OSPanic(const char* file, s32 line, const char* fmt, ...) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void OSPanic(const char* file, s32 line, const char* fmt, ...) { +asm void OSPanic(char* file, s32 line, char* fmt, ...) { nofralloc #include "asm/m_Do/m_Do_printf/OSPanic.s" }