From 929c5cfa5a18effef4ef76e61282dd774b3deb1b Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Mon, 4 Jul 2022 12:21:57 -0700 Subject: [PATCH] d_menu_save / pane_class / rename some data (#205) * 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 --- Progress.md | 8 +- .../JUTGamePad/update__10JUTGamePadFv.s | 2 +- .../cAPICPad_ANY_BUTTON__FUl.s | 8 - .../cAPICPad_recalibrate__Fv.s | 9 - .../processHeartGaugeSound__11Z2StatusMgrFv.s | 2 +- asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s | 17 + asm/d/a/d_a_alink/create__9daAlink_cFv.s | 4 +- .../a/d_a_no_chg_room/execute__9daNocrm_cFv.s | 2 +- ...c_at_check__FP10fopAc_ac_cP11dCcU_AtInfo.s | 2 +- .../dComIfGs_isOneZoneItem__Fii.s | 2 +- .../dComIfGs_isOneZoneSwitch__Fii.s | 2 +- .../dComIfGs_isVisitedRoom__Fi.s | 2 +- .../d_com_inf_game/dComIfGs_isZoneItem__Fii.s | 2 +- .../dComIfGs_isZoneSwitch__Fii.s | 2 +- .../dComIfGs_offOneZoneSwitch__Fii.s | 2 +- .../dComIfGs_offVisitedRoom__Fi.s | 2 +- .../dComIfGs_offZoneSwitch__Fii.s | 2 +- .../dComIfGs_onOneZoneSwitch__Fii.s | 2 +- .../dComIfGs_onVisitedRoom__Fi.s | 2 +- .../dComIfGs_onZoneSwitch__Fii.s | 2 +- .../checkButton__12dAttention_cFv.s | 2 +- asm/d/d_camera/Run__9dCamera_cFv.s | 2 +- ...etTagData__9dCamera_cFP10fopAc_ac_clUsUc.s | 2 +- asm/d/d_camera/blureCamera__9dCamera_cFv.s | 4 +- ...amera_cFP12camera_classP10fopAc_ac_cUlUl.s | 4 +- asm/d/d_camera/nextType__9dCamera_cFl.s | 2 +- asm/d/d_camera/setMapToolData__9dCamera_cFv.s | 2 +- asm/d/d_camera/shakeCamera__9dCamera_cFv.s | 2 +- .../emitter_create__16dDemo_particle_cFUl.s | 2 +- asm/d/d_envse/execute__8dEnvSe_cFv.s | 2 +- ...on__8dEnvSe_cFP18dStage_SoundInfo_cPScUc.s | 2 +- .../execute__19dShutdownErrorMsg_cFv.s | 2 +- .../maptoolIdEvCamera__9dCamera_cFv.s | 2 +- asm/d/d_item/item_func_WOOD_STICK__Fv.s | 2 +- .../dkWmark_Create__FP12kankyo_class.s | 2 +- asm/d/d_k_wpillar/create__11dkWpillar_cFv.s | 2 +- asm/d/d_ky_thunder/create__10dThunder_cFv.s | 4 +- .../loadRoom__20dStage_roomControl_cFiPUcb.s | 2 +- .../d_event_data/dEvDt_Next_Stage__Fii.s | 2 +- .../specialProcCreate__12dEvDtStaff_cFv.s | 2 +- .../specialProcDirector__12dEvDtStaff_cFv.s | 2 +- .../GetTimePass__20dStage_roomControl_cFv.s | 2 +- .../dKy_BossLight_set__FP4cXyzP8_GXColorfUc.s | 2 +- asm/d/kankyo/d_kankyo/dKy_Create__FPv.s | 2 +- asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s | 23 - .../d_kankyo/dKy_Itemgetcol_chg_on__Fv.s | 12 - asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s | 28 - ...8_GXColorP8_GXColorP8_GXColorP8_GXColorf.s | 8 +- asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s | 5 - asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s | 13 - .../d_kankyo/dKy_SunMoon_Light_Check__Fv.s | 50 - .../dKy_TeachWind_existence_chk__Fv.s | 12 - .../dKy_camera_water_in_status_check__Fv.s | 5 - .../dKy_camera_water_in_status_set__FUc.s | 5 - .../kankyo/d_kankyo/dKy_change_colpat__FUc.s | 11 - .../d_kankyo/dKy_custom_colset__FUcUcf.s | 21 - .../kankyo/d_kankyo/dKy_darkworld_check__Fv.s | 18 - asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s | 9 - .../kankyo/d_kankyo/dKy_instant_rainchg__Fv.s | 16 - .../kankyo/d_kankyo/dKy_instant_timechg__Ff.s | 26 - .../dKy_light_influence_id__F4cXyzi.s | 2 +- ...dKy_pol_argument_get__FPC13cBgS_PolyInfo.s | 57 - asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s | 5 - asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s | 10 - .../dKy_setLight_mine__FP12dKy_tevstr_c.s | 39 - .../dKy_setLight_nowroom_common__Fcf.s | 2 +- .../d_kankyo/dKy_set_actcol_ratio__Ff.s | 5 - .../d_kankyo/dKy_set_allcol_ratio__Ff.s | 5 - .../kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s | 5 - .../d_kankyo/dKy_set_fogcol_ratio__Ff.s | 5 - asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s | 5 - .../d_kankyo/dKy_set_vrboxcol_ratio__Ff.s | 14 - .../d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s | 5 - .../d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s | 5 - .../dKy_tevstr_init__FP12dKy_tevstr_cScUc.s | 2 +- .../d_kankyo/dKy_twilight_camelight_set__Fv.s | 2 +- .../d_kankyo/dKy_vrbox_addcol_set__Fsssf.s | 29 - asm/d/kankyo/d_kankyo/envcolor_init__Fv.s | 4 +- ...v_light_cFP12J3DModelDataP12dKy_tevstr_c.s | 2 +- ...ScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c.s | 6 +- .../dKyr_drawHousi__FPA4_fPPUc.s | 2 +- .../dKyr_drawSibuki__FPA4_fPPUc.s | 2 +- .../d_kankyo_rain/dKyr_drawSnow__FPA4_fPPUc.s | 8 +- .../d_kankyo_rain/dKyr_drawStar__FPA4_fPPUc.s | 2 +- .../dKyr_evil_draw2__FPA4_fPPUc.s | 4 +- .../dKyr_evil_draw__FPA4_fPPUc.s | 2 +- .../kankyo/d_kankyo_rain/dKyr_rain_move__Fv.s | 12 +- .../d_kankyo_rain/dKyr_thunder_move__Fv.s | 2 +- .../drawVrkumo__FPA4_fR8_GXColorPPUc.s | 4 +- .../forward_overhead_bg_chk__FP4cXyzf.s | 2 +- .../d_kankyo_rain/overhead_bg_chk__Fv.s | 2 +- asm/d/kankyo/d_kankyo_rain/vrkumo_move__Fv.s | 2 +- .../d_kankyo_wether/dKyw_wind_set__Fv.s | 14 +- .../d_kankyo_wether/wether_move_vrkumo__Fv.s | 2 +- ...gPlusDoor_cFPC21stage_tgsc_data_classiib.s | 2 +- .../getMapPlayerAngleY__10dMapInfo_nFv.s | 2 +- .../getMapPlayerPos__10dMapInfo_nFv.s | 2 +- ...ate__20dMenu_StageMapCtrl_cFUsUsUsUsScPv.s | 2 +- ...st__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s | 2 +- .../setPos__15dMenu_DmapMap_cFiifffbf.s | 4 +- .../drawIcon__12dMenu_Fmap_cFUci.s | 2 +- .../searchIcon__12dMenu_Fmap_cFUciPfPf.s | 2 +- .../table_demo1_init__12dMenu_Fmap_cFv.s | 2 +- .../isDrawRoom__15renderingFmap_cFv.s | 2 +- .../IPLSelect2Disp__12dMenu_save_cFv.s | 36 - .../IPLSelectDisp2__12dMenu_save_cFv.s | 34 - .../backSaveQuestion2__12dMenu_save_cFv.s | 69 - ...ackSaveQuestionInitSet__12dMenu_save_cFv.s | 14 - .../backSaveQuestion__12dMenu_save_cFv.s | 29 - .../cardFormatNoSelDisp__12dMenu_save_cFv.s | 28 - .../cardFormatYesSel2Disp__12dMenu_save_cFv.s | 33 - .../cardFormatYesSelDisp__12dMenu_save_cFv.s | 36 - .../endingDataCheck__12dMenu_save_cFv.s | 6 - .../endingNoSave2__12dMenu_save_cFv.s | 14 - .../endingNoSave__12dMenu_save_cFv.s | 35 - .../errYesNoCursorMoveAnm__12dMenu_save_cFv.s | 30 - .../errorTxtChangeAnm__12dMenu_save_cFv.s | 62 - .../gameContinue2__12dMenu_save_cFv.s | 12 - .../gameContinue3__12dMenu_save_cFv.s | 15 - .../gameContinueDisp__12dMenu_save_cFv.s | 41 - .../headerTxtChangeAnm__12dMenu_save_cFv.s | 62 - .../iplSelInitSet__12dMenu_save_cFv.s | 23 - .../ketteiTxtDispAnmInit__12dMenu_save_cFUc.s | 35 - .../ketteiTxtDispAnm__12dMenu_save_cFv.s | 60 - .../memCardCommandEnd2__12dMenu_save_cFv.s | 51 - .../memCardCommandEnd__12dMenu_save_cFv.s | 30 - .../memCardDataLoadWait__12dMenu_save_cFv.s | 32 - .../memCardErrGoIPLSel2__12dMenu_save_cFv.s | 44 - .../memCardErrGoIPLSel__12dMenu_save_cFv.s | 36 - .../memCardErrGotoIPL__12dMenu_save_cFv.s | 36 - ...rdErrMsgWaitFormatSel2__12dMenu_save_cFv.s | 48 - ...ardErrMsgWaitFormatSel__12dMenu_save_cFv.s | 46 - .../memCardFormatWait__12dMenu_save_cFv.s | 34 - ...emCardMakeGameFileWait__12dMenu_save_cFv.s | 39 - .../memCardMakeGameFile__12dMenu_save_cFv.s | 27 - .../messageChange__12dMenu_save_cFv.s | 61 - .../modoruTxtDispAnmInit__12dMenu_save_cFUc.s | 35 - .../modoruTxtDispAnm__12dMenu_save_cFv.s | 60 - .../msgWindowClose__12dMenu_save_cFv.s | 43 - .../msgWindowInitOpen__12dMenu_save_cFv.s | 110 - .../msgWindowOpen__12dMenu_save_cFv.s | 43 - .../openSaveSelect2__12dMenu_save_cFv.s | 61 - .../restartInit__12dMenu_save_cFv.s | 66 - .../retryQuestion0__12dMenu_save_cFv.s | 28 - .../retryQuestion1__12dMenu_save_cFv.s | 38 - .../retryQuestion2__12dMenu_save_cFv.s | 33 - .../d_menu_save/saveEnd__12dMenu_save_cFv.s | 48 - .../d_menu_save/saveGuide__12dMenu_save_cFv.s | 12 - .../saveQuestion21__12dMenu_save_cFv.s | 11 - .../saveQuestion2__12dMenu_save_cFv.s | 55 - .../saveQuestion3__12dMenu_save_cFv.s | 31 - .../saveQuestion4__12dMenu_save_cFv.s | 17 - .../saveSelectOpenAnmSet__12dMenu_save_cFv.s | 20 - .../saveSelectOpenInit__12dMenu_save_cFv.s | 56 - .../saveYesNoCancelMove__12dMenu_save_cFv.s | 34 - .../selectDataOpenMove__12dMenu_save_cFv.s | 41 - ...akuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s | 16 - .../selectWakuAlpahAnm__12dMenu_save_cFUc.s | 52 - .../yesNoCursorMoveAnm__12dMenu_save_cFv.s | 30 - ...akuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s | 20 - .../yesnoWakuAlpahAnm__12dMenu_save_cFUc.s | 93 - .../d_menu_window/key_wait_proc__5dMw_cFv.s | 2 +- .../d_meter_map/_move__11dMeterMap_cFUl.s | 2 +- .../getMapDispSizeTypeNo__11dMeterMap_cFv.s | 2 +- ...27jmessage_tSequenceProcessorFUcUcP4cXyz.s | 4 +- ...10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s | 2 +- .../d_msg_string/__ct__12dMsgString_cFUc.s | 36 - .../msg/d_msg_string/__ct__12dMsgString_cFv.s | 34 - .../msg/d_msg_string/__dt__12dMsgString_cFv.s | 38 - ...__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s | 13 - ...FontLocal__12dMsgString_cFP10J2DTextBoxf.s | 61 - ...tringLocal__12dMsgString_cFP10J2DTextBox.s | 13 - .../dOvlpFd2_Draw__FP10dOvlpFd2_c.s | 2 +- .../pane/d_pane_class/__dt__10JSUIosBaseFv.s | 20 - .../__dt__20JSUMemoryInputStreamFv.s | 31 - .../__dt__20JSURandomInputStreamFv.s | 26 - .../d_pane_class/__sinit_d_pane_class_cpp.s | 8 - .../childPaneGetSize__8CPaneMgrFP7J2DPane.s | 73 - .../childPaneSetSize__8CPaneMgrFP7J2DPaneff.s | 112 - ...PvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s | 82 - asm/d/pane/d_pane_class/func_802548BC.s | 263 -- .../getBounds__8CPaneMgrFP7J2DPane.s | 78 - ...etGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s | 64 - ...obalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s | 148 - ...itiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s | 268 -- .../d_pane_class/paneScale__8CPaneMgrFff.s | 104 - .../d_pane_class/paneTrans__8CPaneMgrFff.s | 35 - ...MgrFQ28JUtility6TColorQ28JUtility6TColor.s | 75 - ...aneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s | 29 - .../__ct__13CPaneMgrAlphaFv.s | 5 - ...grAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s | 18 - .../__dt__13CPaneMgrAlphaFv.s | 32 - .../__dt__17CPaneMgrAlphaMorfFv.s | 43 - .../alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s | 66 - .../alphaAnime__13CPaneMgrAlphaFsUcUcUc.s | 63 - ...ckupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s | 38 - ...hildPaneCount__13CPaneMgrAlphaFP7J2DPane.s | 29 - ...dPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s | 40 - ...lphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s | 64 - ...aneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s | 72 - .../getAlphaRate__13CPaneMgrAlphaFv.s | 22 - .../hide__13CPaneMgrAlphaFv.s | 19 - ...initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s | 36 - ...__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s | 64 - .../isVisible__13CPaneMgrAlphaFv.s | 4 - .../rateCalc__13CPaneMgrAlphaFssUc.s | 70 - .../setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s | 31 - .../setAlphaRate__13CPaneMgrAlphaFf.s | 23 - .../setAlpha__13CPaneMgrAlphaFUc.s | 32 - .../setBackupAlpha__17CPaneMgrAlphaMorfFv.s | 24 - .../show__13CPaneMgrAlphaFv.s | 18 - .../drawSecond_b_light8__FP14JPABaseEmitter.s | 2 +- .../drawSecond_light8__FP14JPABaseEmitter.s | 2 +- asm/d/s/d_s_name/create__10dScnName_cFv.s | 2 +- .../s/d_s_play/dScnPly_Delete__FP9dScnPly_c.s | 4 +- asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s | 4 +- asm/d/s/d_s_play/phase_4__FP9dScnPly_c.s | 16 +- asm/d/s/d_s_play/phase_5__FP9dScnPly_c.s | 2 +- asm/d/s/d_s_play/phase_6__FP9dScnPly_c.s | 2 +- ...ScnRoom_Execute__FP19room_of_scene_class.s | 4 +- asm/f_op/f_op_actor/fopAc_Create__FPv.s | 2 +- .../fopCam_Execute__FP12camera_class.s | 2 +- asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s | 2 +- .../calcFade__13mDoGph_gInf_cFv.s | 4 +- .../m_Do_graphic/create__13mDoGph_gInf_cFv.s | 4 +- ...epth2__FP10view_classP15view_port_classi.s | 2 +- .../m_Do_graphic/mDoGph_AfterOfDraw__Fv.s | 2 +- asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s | 4 +- .../motionBlure__FP10view_class.s | 4 +- ...ault_callback_scroll__FUsP9OSContextUlUl.s | 2 +- asm/m_Do/m_Do_machine/mDoMch_Create__Fv.s | 6 +- asm/m_Do/m_Do_main/main01__Fv.s | 8 +- .../d_a_b_bq/daB_BQ_Draw__FP10b_bq_class.s | 8 +- .../d_a_b_dre/daB_DRE_Draw__FP9daB_DRE_c.s | 8 +- .../d_a_b_ds/damageSet__8daB_DS_cFv.s | 4 +- .../executeBattle2Damage__8daB_DS_cFv.s | 4 +- .../d_a_b_gg/d_a_b_gg/At_Check__8daB_GG_cFv.s | 4 +- .../a/b/d_a_b_gg/d_a_b_gg/Draw__8daB_GG_cFv.s | 8 +- .../d_a_b_gnd/damage_check__FP11b_gnd_class.s | 4 +- .../d_a_b_mgn/d_a_b_mgn/draw__9daB_MGN_cFv.s | 8 +- .../d_a_b_ob/daB_OB_Draw__FP10b_ob_class.s | 8 +- .../b/d_a_b_tn/d_a_b_tn/create__8daB_TN_cFv.s | 4 +- .../d_a_b_yo/damage_check__8daB_YO_cFv.s | 4 +- .../a/b/d_a_b_yo/d_a_b_yo/draw__8daB_YO_cFv.s | 8 +- .../d_a_b_zant/action__10daB_ZANT_cFv.s | 4 +- .../d_a_b_zant/create__10daB_ZANT_cFv.s | 4 +- .../d_a_b_zant/damage_check__10daB_ZANT_cFv.s | 4 +- .../ice_damage_check__10daB_ZANT_cFv.s | 4 +- .../executeSmall__11daB_ZANTM_cFv.s | 12 +- .../d_a_arrow/setRoomInfo__9daArrow_cFv.s | 4 +- .../setRoomInfo__13daBoomerang_cFv.s | 4 +- .../d_a_bullet/Execute__10daBullet_cFv.s | 4 +- .../d_a_canoe/setRoomInfo__9daCanoe_cFv.s | 4 +- .../d_a_cstaF/setRoomInfo__9daCstaF_cFv.s | 4 +- .../setRoomInfo__11daCstatue_cFv.s | 4 +- ...rformance__10daDemo00_cFP13dDemo_actor_c.s | 4 +- .../daDemo00_Create__FP10fopAc_ac_c.s | 4 +- .../d_a_demo_item/actionEvent__9daDitem_cFv.s | 4 +- .../d_a_ep/d_a_ep/daEp_Execute__FP8ep_class.s | 4 +- .../d_a_grass/calc__15dGrass_packet_cFv.s | 4 +- .../d_a_grass/calc__16dFlower_packet_cFv.s | 4 +- .../callHorseSubstance__9daHorse_cFPC4cXyz.s | 4 +- .../d_a_horse/checkEnding__9daHorse_cFv.s | 4 +- .../d_a_horse/setRoomInfo__9daHorse_cFi.s | 4 +- .../executeBalloonMenu__8daKago_cFv.s | 4 +- .../d_a_midna/setRoomInfo__9daMidna_cFv.s | 4 +- .../isFade__13mDoGph_gInf_cFv.s | 4 +- .../d_a_nbomb/setRoomInfo__9daNbomb_cFv.s | 4 +- .../d_a_spinner/execute__11daSpinner_cFv.s | 8 +- .../setRoomInfo__11daSpinner_cFv.s | 4 +- .../d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s | 4 +- .../daVrbox2_Draw__FP12vrbox2_class.s | 4 +- .../checkFront__11daBdoorL1_cFv.s | 8 +- .../CreateInit__12daMBdoorL1_cFv.s | 4 +- .../checkMBossRoom__12daMBdoorL1_cFv.s | 4 +- .../checkExecute__10daDoor20_cFv.s | 4 +- .../closeInit_0__10daDoor20_cFv.s | 4 +- .../demoProc__10daDoor20_cFv.s | 4 +- .../drawCheck__10daDoor20_cFi.s | 4 +- .../d_a_door_shutter/draw__10daDoor20_cFv.s | 8 +- .../execute__10daDoor20_cFv.s | 4 +- .../frontCheck__10daDoor20_cFv.s | 4 +- .../setDoorAngleSpec__10daDoor20_cFv.s | 8 +- .../setEventPrm__10daDoor20_cFv.s | 4 +- .../d_a_e_ai/damage_check__10e_ai_classFv.s | 8 +- .../d_a_e_ba/damage_check__FP10e_ba_class.s | 4 +- .../d_a_e_bg/damage_check__8daE_BG_cFv.s | 4 +- .../d_a_e_bg/setSparkEffect__8daE_BG_cFv.s | 4 +- .../d_a_e_dn/daE_DN_Execute__FP10e_dn_class.s | 4 +- .../a/e/d_a_e_dt/d_a_e_dt/draw__8daE_DT_cFv.s | 8 +- .../d_a_e_gm/damage_check__8daE_GM_cFv.s | 4 +- .../d_a_e_hb/damage_check__FP10e_hb_class.s | 4 +- .../d_a_e_hm/d_a_e_hm/At_Check__8daE_HM_cFv.s | 4 +- .../daE_HZELDA_Execute__FP14e_hzelda_class.s | 8 +- .../d_a_e_kk/damage_check__8daE_KK_cFv.s | 4 +- .../d_a_e_mf/daE_MF_Execute__FP10e_mf_class.s | 4 +- .../d_a_e_mk/damage_check__FP10e_mk_class.s | 4 +- .../d_a_e_mm_mt/action__FP13e_mm_mt_class.s | 8 +- .../d_a_e_ms/damage_check__FP10e_ms_class.s | 4 +- .../damage_check__11daE_OctBg_cFv.s | 4 +- .../d_a_e_ot/damage_check__8daE_OT_cFv.s | 4 +- .../d_a_e_pm/d_a_e_pm/At_Check__8daE_PM_cFv.s | 4 +- .../d_a_e_po/damage_check__FP10e_po_class.s | 8 +- .../d_a_e_po/e_po_dead__FP10e_po_class.s | 4 +- .../d_a_e_po/e_po_wolfbite__FP10e_po_class.s | 4 +- .../d_a_e_rd/daE_RD_Draw__FP10e_rd_class.s | 8 +- .../d_a_e_rd/damage_check__FP10e_rd_class.s | 16 +- .../d_a_e_s1/e_s1_roof__FP10e_s1_class.s | 4 +- .../d_a_e_sf/daE_SF_Execute__FP10e_sf_class.s | 4 +- .../d_a_e_st/damage_check_g__FP10e_st_class.s | 4 +- .../d_a_e_ws/damage_check__8daE_WS_cFv.s | 4 +- .../d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s | 4 +- .../d_a_e_yd/damage_check__FP10e_yd_class.s | 4 +- .../d_a_e_yg/damage_check__FP10e_yg_class.s | 4 +- .../d_a_e_yk/damage_check__FP10e_yk_class.s | 4 +- .../d_a_e_zs/damage_check__8daE_ZS_cFv.s | 4 +- .../daKytag00_Create__FP10fopAc_ac_c.s | 8 +- .../daKytag00_Execute__FP13kytag00_class.s | 8 +- ...wether_tag_efect_move__FP13kytag00_class.s | 12 +- .../daKytag01_Create__FP10fopAc_ac_c.s | 4 +- .../daKytag01_Execute__FP13kytag01_class.s | 4 +- .../daKytag02_Execute__FP13kytag02_class.s | 4 +- .../odour_move__FP13kytag03_class.s | 4 +- .../daKytag04_Create__FP10fopAc_ac_c.s | 16 +- .../daKytag04_Draw__FP13kytag04_class.s | 4 +- .../daKytag04_Execute__FP13kytag04_class.s | 20 +- .../daKytag06_Execute__FP13kytag06_class.s | 4 +- .../daKytag06_type03_init__FP10fopAc_ac_c.s | 8 +- ...tag06_type_03_Execute__FP13kytag06_class.s | 8 +- ...tag06_type_10_Execute__FP13kytag06_class.s | 8 +- ...tag06_type_11_Execute__FP13kytag06_class.s | 4 +- .../daKytag07_Execute__FP13kytag07_class.s | 4 +- .../daKytag11_Execute__FP13kytag11_class.s | 8 +- ...tag12_Execute_arrival__FP13kytag12_class.s | 4 +- ...ag12_Execute_standard__FP13kytag12_class.s | 4 +- .../daKytag13_Create__FP10fopAc_ac_c.s | 4 +- .../daKytag13_Execute__FP13kytag13_class.s | 4 +- ...ag13_Execute_standard__FP13kytag13_class.s | 24 +- .../daKytag14_Execute__FP13kytag14_class.s | 8 +- .../daKytag16_Execute__FP13kytag16_class.s | 4 +- ...erIn2ndFloorOfBombShop__12daNpc_Bans_cFv.s | 4 +- ...erParam__15daNpc_Kakashi_cFP10fopAc_ac_c.s | 12 +- .../d_a_npc_ks/action__FP12npc_ks_class.s | 4 +- .../npc_ks_home__FP12npc_ks_class.s | 4 +- .../cutHaveFavorToAsk__13daNpc_Pouya_cFi.s | 4 +- .../setRoomInf__13daNpc_Shop0_cFv.s | 4 +- .../executeWolfPerch__10daNPC_TK_cFv.s | 4 +- .../cutMeetingAgain__11daNpc_Uri_cFi.s | 4 +- .../Execute__16daObj_AutoMata_cFv.s | 4 +- .../CreateInit_LightBall__12daObjCarry_cFv.s | 4 +- ...checkCreate_LightBallA__12daObjCarry_cFv.s | 40 +- ...checkCreate_LightBallB__12daObjCarry_cFv.s | 40 +- .../d_a_obj_carry/draw__12daObjCarry_cFv.s | 4 +- .../d_a_obj_carry/execute__12daObjCarry_cFv.s | 4 +- .../d_a_obj_cdoor/create__12daObjCdoor_cFv.s | 4 +- .../create__12daObjDigpl_cFv.s | 4 +- .../create__13daObjFchain_cFv.s | 4 +- .../create__15daObj_ItaMato_cFv.s | 4 +- .../Execute__15daObj_KBacket_cFv.s | 4 +- .../daObj_Kbox_Execute__FP14obj_kbox_class.s | 4 +- .../checkE3Special__14daObjRBridge_cFv.s | 4 +- .../Execute__13daObj_Roten_cFPPA3_A4_f.s | 4 +- .../Execute__14daObj_Sekizo_cFPPA3_A4_f.s | 4 +- .../Execute__14daObj_SMTile_cFv.s | 4 +- .../actionRun__14daObjSwBallB_cFv.s | 8 +- .../create__13daObjWchain_cFv.s | 4 +- .../Execute__15daTag_AllMato_cFv.s | 4 +- .../d_a_tag_camera/execute__11daTag_Cam_cFv.s | 4 +- .../execute__11daTag_Chk_cFv.s | 4 +- .../execute__13daTag_Event_cFv.s | 4 +- .../d_a_tag_evt/execute__11daTag_Evt_cFv.s | 4 +- .../Execute__15daTag_EvtArea_cFv.s | 4 +- .../Execute__14daTag_EvtMsg_cFv.s | 4 +- .../d_a_tag_howl/execute__12daTag_Howl_cFv.s | 4 +- .../actionWaitFall__15daTagKagoFall_cFv.s | 4 +- .../actionWaitRiver__15daTagKagoFall_cFv.s | 4 +- .../d_a_tag_kmsg/Execute__12daTag_KMsg_cFv.s | 4 +- .../Execute__15daTag_Lantern_cFv.s | 4 +- .../d_a_tag_msg/execute__11daTag_Msg_cFv.s | 4 +- .../Execute__17daTag_MynaLight_cFv.s | 4 +- ...etTurnOnOffChange__17daTag_MynaLight_cFv.s | 8 +- .../d_a_tag_push/Execute__12daTag_Push_cFv.s | 4 +- .../execute__14daTagRestart_cFv.s | 4 +- include/JSystem/J2DGraph/J2DOrthoGraph.h | 6 + include/JSystem/J2DGraph/J2DPane.h | 1 + include/JSystem/J2DGraph/J2DTextBox.h | 4 +- include/JSystem/J3DGraphBase/J3DStruct.h | 10 +- include/JSystem/JSupport/JSUMemoryStream.h | 4 +- include/JSystem/JUtility/JUTGamePad.h | 7 +- include/Z2AudioLib/Z2SeqMgr.h | 177 +- include/d/bg/d_bg_s.h | 4 +- include/d/bg/d_bg_w.h | 8 +- include/d/bg/d_bg_w_base.h | 4 +- include/d/bg/d_bg_w_kcol.h | 4 +- include/d/com/d_com_inf_game.h | 38 +- include/d/d_stage.h | 36 +- include/d/file/d_file_sel_info.h | 4 + include/d/file/d_file_sel_warning.h | 5 + include/d/kankyo/d_kankyo.h | 342 ++- include/d/kankyo/d_kankyo_wether.h | 125 +- include/d/menu/d_menu_save.h | 121 +- include/d/meter/d_meter2_info.h | 4 + include/d/msg/d_msg_string.h | 3 +- include/d/pane/d_pane_class.h | 11 +- include/d/pane/d_pane_class_alpha.h | 40 +- include/d/s/d_s_play.h | 11 +- include/d/save/d_save.h | 2 + include/dolphin/gx/GX.h | 1 + include/m_Do/m_Do_Reset.h | 5 +- include/m_Do/m_Do_audio.h | 22 +- include/m_Do/m_Do_controller_pad.h | 2 +- include/m_Do/m_Do_ext.h | 2 +- include/m_Do/m_Do_graphic.h | 15 +- include/m_Do/m_Do_main.h | 3 +- include/msg/scrn/d_msg_scrn_explain.h | 3 +- libs/JSystem/JUtility/JUTGamePad.cpp | 18 +- .../SComponent/c_API_controller_pad.cpp | 47 +- libs/Z2AudioLib/Z2SeqMgr.cpp | 2 +- libs/Z2AudioLib/Z2StatusMgr.cpp | 2 +- rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp | 2 +- rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp | 2 +- rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp | 2 +- rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp | 4 +- rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp | 2 +- rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp | 2 +- rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp | 2 +- rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp | 2 +- rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp | 4 +- rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp | 6 +- .../a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp | 2 +- rel/d/a/d_a_arrow/d_a_arrow.cpp | 2 +- rel/d/a/d_a_bullet/d_a_bullet.cpp | 2 +- rel/d/a/d_a_canoe/d_a_canoe.cpp | 2 +- rel/d/a/d_a_cstaf/d_a_cstaF.cpp | 2 +- rel/d/a/d_a_cstatue/d_a_cstatue.cpp | 2 +- rel/d/a/d_a_demo00/d_a_demo00.cpp | 2 +- rel/d/a/d_a_demo_item/d_a_demo_item.cpp | 2 +- rel/d/a/d_a_ep/d_a_ep.cpp | 2 +- rel/d/a/d_a_grass/d_a_grass.cpp | 2 +- rel/d/a/d_a_kago/d_a_kago.cpp | 2 +- rel/d/a/d_a_midna/d_a_midna.cpp | 2 +- rel/d/a/d_a_movie_player/d_a_movie_player.cpp | 2 +- rel/d/a/d_a_nbomb/d_a_nbomb.cpp | 2 +- rel/d/a/d_a_spinner/d_a_spinner.cpp | 2 +- rel/d/a/d_a_vrbox/d_a_vrbox.cpp | 2 +- rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp | 2 +- .../door/d_a_door_bossl1/d_a_door_bossL1.cpp | 2 +- .../d_a_door_mbossL1/d_a_door_mbossL1.cpp | 2 +- .../d_a_door_shutter/d_a_door_shutter.cpp | 2 +- rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp | 2 +- rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp | 2 +- rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp | 4 +- rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp | 2 +- rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp | 2 +- rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp | 2 +- rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp | 2 +- rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp | 2 +- rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp | 2 +- rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp | 2 +- rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp | 2 +- rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp | 2 +- rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp | 2 +- rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp | 2 +- rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp | 2 +- rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp | 2 +- rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp | 2 +- rel/d/a/e/d_a_e_po/d_a_e_po.cpp | 2 +- rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp | 4 +- rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp | 2 +- rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp | 2 +- rel/d/a/e/d_a_e_st/d_a_e_st.cpp | 2 +- rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp | 2 +- rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp | 2 +- rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp | 2 +- rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp | 2 +- rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp | 2 +- rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp | 2 +- rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp | 2 +- rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp | 2 +- rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp | 2 +- rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp | 2 +- rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp | 2 +- rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 2 +- rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp | 2 +- rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp | 2 +- rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp | 2 +- rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp | 2 +- rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp | 2 +- rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp | 2 +- rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp | 2 +- .../a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp | 2 +- rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp | 2 +- rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp | 2 +- rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp | 2 +- rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp | 2 +- rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp | 2 +- .../obj/d_a_obj_automata/d_a_obj_automata.cpp | 2 +- rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp | 2 +- .../obj/d_a_obj_digplace/d_a_obj_digplace.cpp | 2 +- rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp | 2 +- .../a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp | 2 +- .../a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp | 2 +- rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp | 2 +- .../d_a_obj_rope_bridge.cpp | 2 +- rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp | 2 +- rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp | 2 +- rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp | 2 +- .../a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp | 2 +- rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp | 2 +- .../a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp | 2 +- rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp | 2 +- .../tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp | 2 +- rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp | 2 +- rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp | 2 +- .../a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp | 2 +- rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp | 2 +- rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp | 2 +- .../d_a_tag_kago_fall/d_a_tag_kago_fall.cpp | 2 +- rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp | 2 +- .../a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp | 2 +- rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp | 2 +- .../d_a_tag_myna_light/d_a_tag_myna_light.cpp | 2 +- rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp | 2 +- .../d_a_tag_setrestart/d_a_tag_setrestart.cpp | 2 +- src/d/a/d_a_alink.cpp | 27 +- src/d/a/d_a_no_chg_room.cpp | 2 +- src/d/a/d_a_npc.cpp | 22 +- src/d/bg/d_bg_s.cpp | 8 +- src/d/bg/d_bg_w.cpp | 4 +- src/d/bg/d_bg_w_kcol.cpp | 4 +- src/d/d_camera.cpp | 2 +- src/d/d_demo.cpp | 2 +- src/d/d_envse.cpp | 2 +- src/d/d_error_msg.cpp | 2 +- src/d/d_ev_camera.cpp | 2 +- src/d/d_k_wmark.cpp | 2 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_ky_thunder.cpp | 2 +- src/d/d_model.cpp | 4 +- src/d/d_stage.cpp | 85 +- src/d/d_tresure.cpp | 8 +- src/d/kankyo/d_kankyo.cpp | 718 +++-- src/d/kankyo/d_kankyo_rain.cpp | 2 +- src/d/kankyo/d_kankyo_wether.cpp | 203 +- src/d/menu/d_menu_dmap_map.cpp | 2 +- src/d/menu/d_menu_fmap.cpp | 2 +- src/d/menu/d_menu_fmap_map.cpp | 2 +- src/d/menu/d_menu_letter.cpp | 4 +- src/d/menu/d_menu_save.cpp | 2670 +++++++++++++---- src/d/msg/d_msg_class.cpp | 2 +- src/d/msg/d_msg_flow.cpp | 2 +- src/d/msg/d_msg_string.cpp | 89 +- src/d/ovlp/d_ovlp_fade2.cpp | 2 +- src/d/pane/d_pane_class.cpp | 601 ++-- src/d/pane/d_pane_class_alpha.cpp | 470 ++- src/d/particle/d_particle.cpp | 2 +- src/d/s/d_s_logo.cpp | 1 + src/d/s/d_s_play.cpp | 41 +- src/d/s/d_s_room.cpp | 2 +- src/f_ap/f_ap_game.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 22 +- src/f_op/f_op_kankyo.cpp | 2 +- src/m_Do/m_Do_DVDError.cpp | 8 +- src/m_Do/m_Do_Reset.cpp | 11 +- src/m_Do/m_Do_audio.cpp | 14 +- src/m_Do/m_Do_controller_pad.cpp | 9 +- src/m_Do/m_Do_dvd_thread.cpp | 12 +- src/m_Do/m_Do_ext.cpp | 2 +- src/m_Do/m_Do_graphic.cpp | 20 +- src/m_Do/m_Do_machine.cpp | 41 +- src/m_Do/m_Do_main.cpp | 30 +- src/m_Do/m_Do_printf.cpp | 8 +- 572 files changed, 4756 insertions(+), 8007 deletions(-) delete mode 100644 asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s delete mode 100644 asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s create mode 100644 asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Itemgetcol_chg_on__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_SunMoon_Light_Check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_TeachWind_existence_chk__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_set__FUc.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_change_colpat__FUc.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_custom_colset__FUcUcf.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_darkworld_check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_instant_rainchg__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_instant_timechg__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_pol_argument_get__FPC13cBgS_PolyInfo.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_setLight_mine__FP12dKy_tevstr_c.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_actcol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_allcol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_fogcol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_vrboxcol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s delete mode 100644 asm/d/kankyo/d_kankyo/dKy_vrbox_addcol_set__Fsssf.s delete mode 100644 asm/d/menu/d_menu_save/IPLSelect2Disp__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/IPLSelectDisp2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/backSaveQuestion2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/backSaveQuestionInitSet__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/backSaveQuestion__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/cardFormatNoSelDisp__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/cardFormatYesSel2Disp__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/cardFormatYesSelDisp__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/endingDataCheck__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/endingNoSave2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/endingNoSave__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/errYesNoCursorMoveAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/errorTxtChangeAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/gameContinue2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/gameContinue3__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/gameContinueDisp__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/headerTxtChangeAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/iplSelInitSet__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/ketteiTxtDispAnmInit__12dMenu_save_cFUc.s delete mode 100644 asm/d/menu/d_menu_save/ketteiTxtDispAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardCommandEnd2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardCommandEnd__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardDataLoadWait__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardErrGoIPLSel2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardErrGoIPLSel__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardErrGotoIPL__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardFormatWait__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardMakeGameFileWait__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/memCardMakeGameFile__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/messageChange__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/modoruTxtDispAnmInit__12dMenu_save_cFUc.s delete mode 100644 asm/d/menu/d_menu_save/modoruTxtDispAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/msgWindowClose__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/msgWindowInitOpen__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/msgWindowOpen__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/openSaveSelect2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/restartInit__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/retryQuestion0__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/retryQuestion1__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/retryQuestion2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveEnd__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveGuide__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveQuestion21__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveQuestion2__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveQuestion3__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveQuestion4__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveSelectOpenAnmSet__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveSelectOpenInit__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/saveYesNoCancelMove__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/selectDataOpenMove__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s delete mode 100644 asm/d/menu/d_menu_save/selectWakuAlpahAnm__12dMenu_save_cFUc.s delete mode 100644 asm/d/menu/d_menu_save/yesNoCursorMoveAnm__12dMenu_save_cFv.s delete mode 100644 asm/d/menu/d_menu_save/yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s delete mode 100644 asm/d/menu/d_menu_save/yesnoWakuAlpahAnm__12dMenu_save_cFUc.s delete mode 100644 asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s delete mode 100644 asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s delete mode 100644 asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s delete mode 100644 asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s delete mode 100644 asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s delete mode 100644 asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s delete mode 100644 asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s delete mode 100644 asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s delete mode 100644 asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s delete mode 100644 asm/d/pane/d_pane_class/__sinit_d_pane_class_cpp.s delete mode 100644 asm/d/pane/d_pane_class/childPaneGetSize__8CPaneMgrFP7J2DPane.s delete mode 100644 asm/d/pane/d_pane_class/childPaneSetSize__8CPaneMgrFP7J2DPaneff.s delete mode 100644 asm/d/pane/d_pane_class/dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s delete mode 100644 asm/d/pane/d_pane_class/func_802548BC.s delete mode 100644 asm/d/pane/d_pane_class/getBounds__8CPaneMgrFP7J2DPane.s delete mode 100644 asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s delete mode 100644 asm/d/pane/d_pane_class/getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s delete mode 100644 asm/d/pane/d_pane_class/initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s delete mode 100644 asm/d/pane/d_pane_class/paneScale__8CPaneMgrFff.s delete mode 100644 asm/d/pane/d_pane_class/paneTrans__8CPaneMgrFff.s delete mode 100644 asm/d/pane/d_pane_class/setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor.s delete mode 100644 asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s delete mode 100644 asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s delete mode 100644 asm/d/pane/d_pane_class_alpha/__dt__13CPaneMgrAlphaFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/__dt__17CPaneMgrAlphaMorfFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s delete mode 100644 asm/d/pane/d_pane_class_alpha/alphaAnime__13CPaneMgrAlphaFsUcUcUc.s delete mode 100644 asm/d/pane/d_pane_class_alpha/childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s delete mode 100644 asm/d/pane/d_pane_class_alpha/childPaneCount__13CPaneMgrAlphaFP7J2DPane.s delete mode 100644 asm/d/pane/d_pane_class_alpha/childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s delete mode 100644 asm/d/pane/d_pane_class_alpha/childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s delete mode 100644 asm/d/pane/d_pane_class_alpha/childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s delete mode 100644 asm/d/pane/d_pane_class_alpha/getAlphaRate__13CPaneMgrAlphaFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/hide__13CPaneMgrAlphaFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s delete mode 100644 asm/d/pane/d_pane_class_alpha/isVisible__13CPaneMgrAlphaFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/rateCalc__13CPaneMgrAlphaFssUc.s delete mode 100644 asm/d/pane/d_pane_class_alpha/setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s delete mode 100644 asm/d/pane/d_pane_class_alpha/setAlphaRate__13CPaneMgrAlphaFf.s delete mode 100644 asm/d/pane/d_pane_class_alpha/setAlpha__13CPaneMgrAlphaFUc.s delete mode 100644 asm/d/pane/d_pane_class_alpha/setBackupAlpha__17CPaneMgrAlphaMorfFv.s delete mode 100644 asm/d/pane/d_pane_class_alpha/show__13CPaneMgrAlphaFv.s diff --git a/Progress.md b/Progress.md index 26fe2809c6..d63bf8a74a 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.351444% | 516156 | 3596544 +.text | 14.988834% | 539080 | 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.367039% | 939512 | 4020672 +Total | 23.937193% | 962436 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 23.367039% | 939512 | 4020672 +main.dol | 23.937193% | 962436 | 4020672 RELs | 33.183726% | 3816236 | 11500324 -Total | 30.640740% | 4755748 | 15520996 +Total | 30.788437% | 4778672 | 15520996 ## RELs diff --git a/asm/JSystem/JUtility/JUTGamePad/update__10JUTGamePadFv.s b/asm/JSystem/JUtility/JUTGamePad/update__10JUTGamePadFv.s index fa3c1044be..57c8370bad 100644 --- a/asm/JSystem/JUtility/JUTGamePad/update__10JUTGamePadFv.s +++ b/asm/JSystem/JUtility/JUTGamePad/update__10JUTGamePadFv.s @@ -100,7 +100,7 @@ lbl_802E0E54: /* 802E0E58 98 1E 00 98 */ stb r0, 0x98(r30) /* 802E0E5C 48 00 00 50 */ b lbl_802E0EAC lbl_802E0E60: -/* 802E0E60 88 0D 8F 81 */ lbz r0, struct_80451500+0x1(r13) +/* 802E0E60 88 0D 8F 81 */ lbz r0, sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset+0x1(r13) /* 802E0E64 28 00 00 00 */ cmplwi r0, 0 /* 802E0E68 40 82 00 44 */ bne lbl_802E0EAC /* 802E0E6C 88 1E 00 98 */ lbz r0, 0x98(r30) diff --git a/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s b/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s deleted file mode 100644 index 578daeffff..0000000000 --- a/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_802632AC: -/* 802632AC 54 64 30 32 */ slwi r4, r3, 6 -/* 802632B0 3C 60 80 3E */ lis r3, m_cpadInfo__8mDoCPd_c@ha /* 0x803DD2E8@ha */ -/* 802632B4 38 03 D2 E8 */ addi r0, r3, m_cpadInfo__8mDoCPd_c@l /* 0x803DD2E8@l */ -/* 802632B8 7C 60 22 14 */ add r3, r0, r4 -/* 802632BC 80 03 00 34 */ lwz r0, 0x34(r3) -/* 802632C0 70 03 13 00 */ andi. r3, r0, 0x1300 -/* 802632C4 4E 80 00 20 */ blr diff --git a/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s b/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s deleted file mode 100644 index ff3e8771c7..0000000000 --- a/asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_8026328C: -/* 8026328C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80263290 7C 08 02 A6 */ mflr r0 -/* 80263294 90 01 00 14 */ stw r0, 0x14(r1) -/* 80263298 4B DA 4A DD */ bl recalibrate__8mDoCPd_cFv -/* 8026329C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802632A0 7C 08 03 A6 */ mtlr r0 -/* 802632A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 802632A8 4E 80 00 20 */ blr diff --git a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s b/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s index 21b1b4aa77..1fc4c275e6 100644 --- a/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s +++ b/asm/Z2AudioLib/Z2StatusMgr/processHeartGaugeSound__11Z2StatusMgrFv.s @@ -10,7 +10,7 @@ lbl_802B5F7C: /* 802B5F9C 88 83 00 2D */ lbz r4, 0x2d(r3) /* 802B5FA0 28 04 00 00 */ cmplwi r4, 0 /* 802B5FA4 41 82 01 18 */ beq lbl_802B60BC -/* 802B5FA8 88 0D 8B A4 */ lbz r0, struct_80451124+0x0(r13) +/* 802B5FA8 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13) /* 802B5FAC 7C 00 07 75 */ extsb. r0, r0 /* 802B5FB0 40 82 00 0C */ bne lbl_802B5FBC /* 802B5FB4 38 04 FF FF */ addi r0, r4, -1 diff --git a/asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s b/asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s new file mode 100644 index 0000000000..6274c34a4e --- /dev/null +++ b/asm/d/a/d_a_alink/__dt__15LIGHT_INFLUENCEFv.s @@ -0,0 +1,17 @@ +lbl_800CFC7C: +/* 800CFC7C 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 800CFC80 7C 08 02 A6 */ mflr r0 +/* 800CFC84 90 01 00 14 */ stw r0, 0x14(r1) +/* 800CFC88 93 E1 00 0C */ stw r31, 0xc(r1) +/* 800CFC8C 7C 7F 1B 79 */ or. r31, r3, r3 +/* 800CFC90 41 82 00 10 */ beq lbl_800CFCA0 +/* 800CFC94 7C 80 07 35 */ extsh. r0, r4 +/* 800CFC98 40 81 00 08 */ ble lbl_800CFCA0 +/* 800CFC9C 48 1F F0 A1 */ bl __dl__FPv +lbl_800CFCA0: +/* 800CFCA0 7F E3 FB 78 */ mr r3, r31 +/* 800CFCA4 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 800CFCA8 80 01 00 14 */ lwz r0, 0x14(r1) +/* 800CFCAC 7C 08 03 A6 */ mtlr r0 +/* 800CFCB0 38 21 00 10 */ addi r1, r1, 0x10 +/* 800CFCB4 4E 80 00 20 */ blr diff --git a/asm/d/a/d_a_alink/create__9daAlink_cFv.s b/asm/d/a/d_a_alink/create__9daAlink_cFv.s index 702a5201ee..aa055f22dc 100644 --- a/asm/d/a/d_a_alink/create__9daAlink_cFv.s +++ b/asm/d/a/d_a_alink/create__9daAlink_cFv.s @@ -43,7 +43,7 @@ lbl_800A5D20: /* 800A5D60 4B FF 7D 01 */ bl checkStageName__9daAlink_cFPCc /* 800A5D64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A5D68 41 82 00 34 */ beq lbl_800A5D9C -/* 800A5D6C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 800A5D6C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800A5D70 7C 00 07 75 */ extsb. r0, r0 /* 800A5D74 40 82 00 28 */ bne lbl_800A5D9C /* 800A5D78 38 60 00 00 */ li r3, 0 @@ -581,7 +581,7 @@ lbl_800A64FC: /* 800A652C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 0x804061C0@l */ /* 800A6530 80 C6 5D B4 */ lwz r6, 0x5db4(r6) /* 800A6534 38 C6 04 D0 */ addi r6, r6, 0x4d0 -/* 800A6538 88 ED 87 E4 */ lbz r7, struct_80450D64+0x0(r13) +/* 800A6538 88 ED 87 E4 */ lbz r7, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800A653C 7C E7 07 74 */ extsb r7, r7 /* 800A6540 39 01 00 1C */ addi r8, r1, 0x1c /* 800A6544 39 20 00 00 */ li r9, 0 diff --git a/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s b/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s index 736386dc1d..fd1e392bab 100644 --- a/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s +++ b/asm/d/a/d_a_no_chg_room/execute__9daNocrm_cFv.s @@ -141,7 +141,7 @@ lbl_801454C8: /* 801454DC 48 00 00 10 */ b lbl_801454EC lbl_801454E0: /* 801454E0 38 00 00 01 */ li r0, 1 -/* 801454E4 98 0D 87 E8 */ stb r0, data_80450D68(r13) +/* 801454E4 98 0D 87 E8 */ stb r0, mNoChangeRoom__20dStage_roomControl_c(r13) /* 801454E8 98 1F 05 CA */ stb r0, 0x5ca(r31) lbl_801454EC: /* 801454EC 38 60 00 01 */ li r3, 1 diff --git a/asm/d/cc/d_cc_uty/cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo.s b/asm/d/cc/d_cc_uty/cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo.s index 355f8a499f..9119558b5a 100644 --- a/asm/d/cc/d_cc_uty/cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo.s +++ b/asm/d/cc/d_cc_uty/cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo.s @@ -355,7 +355,7 @@ lbl_800880D4: /* 800880FC 41 82 00 08 */ beq lbl_80088104 /* 80088100 3B A0 00 04 */ li r29, 4 lbl_80088104: -/* 80088104 9B AD 8B A5 */ stb r29, struct_80451124+0x1(r13) +/* 80088104 9B AD 8B A5 */ stb r29, pauseTimer__9dScnPly_c+0x1(r13) lbl_80088108: /* 80088108 80 7C 00 04 */ lwz r3, 4(r28) /* 8008810C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* qr0 */ diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s index 5509558eff..87306beb46 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s @@ -8,7 +8,7 @@ lbl_8002DC3C: /* 8002DC54 41 80 00 08 */ blt lbl_8002DC5C /* 8002DC58 48 00 00 18 */ b lbl_8002DC70 lbl_8002DC5C: -/* 8002DC5C 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DC5C 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DC60 7C 84 07 75 */ extsb. r4, r4 /* 8002DC64 40 80 00 0C */ bge lbl_8002DC70 /* 8002DC68 38 60 00 00 */ li r3, 0 diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneSwitch__Fii.s index bd07a6db49..bee9b46580 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_isOneZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002DB64: /* 8002DB7C 41 80 00 08 */ blt lbl_8002DB84 /* 8002DB80 48 00 00 18 */ b lbl_8002DB98 lbl_8002DB84: -/* 8002DB84 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DB84 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DB88 7C 84 07 75 */ extsb. r4, r4 /* 8002DB8C 40 80 00 0C */ bge lbl_8002DB98 /* 8002DB90 38 60 00 00 */ li r3, 0 diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s index 3949d31b7b..0274fe1654 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_isVisitedRoom__Fi.s @@ -4,7 +4,7 @@ lbl_8002FC98: /* 8002FCA0 90 01 00 14 */ stw r0, 0x14(r1) /* 8002FCA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002FCA8 7C 7F 1B 78 */ mr r31, r3 -/* 8002FCAC 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8002FCAC 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002FCB0 7C 00 07 74 */ extsb r0, r0 /* 8002FCB4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ /* 8002FCB8 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s index fc3e8f8867..a76b04750c 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s @@ -8,7 +8,7 @@ lbl_8002DBD0: /* 8002DBE8 41 80 00 08 */ blt lbl_8002DBF0 /* 8002DBEC 48 00 00 18 */ b lbl_8002DC04 lbl_8002DBF0: -/* 8002DBF0 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DBF0 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DBF4 7C 84 07 75 */ extsb. r4, r4 /* 8002DBF8 40 80 00 0C */ bge lbl_8002DC04 /* 8002DBFC 38 60 00 00 */ li r3, 0 diff --git a/asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s index b6a41b3598..3e55e7b813 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002DA30: /* 8002DA48 41 80 00 08 */ blt lbl_8002DA50 /* 8002DA4C 48 00 00 18 */ b lbl_8002DA64 lbl_8002DA50: -/* 8002DA50 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DA50 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DA54 7C 84 07 75 */ extsb. r4, r4 /* 8002DA58 40 80 00 0C */ bge lbl_8002DA64 /* 8002DA5C 38 60 00 00 */ li r3, 0 diff --git a/asm/d/com/d_com_inf_game/dComIfGs_offOneZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_offOneZoneSwitch__Fii.s index 20691f3e25..bf9ab415cc 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_offOneZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_offOneZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002DB00: /* 8002DB18 41 80 00 08 */ blt lbl_8002DB20 /* 8002DB1C 48 00 00 10 */ b lbl_8002DB2C lbl_8002DB20: -/* 8002DB20 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DB20 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DB24 7C 84 07 75 */ extsb. r4, r4 /* 8002DB28 41 80 00 28 */ blt lbl_8002DB50 lbl_8002DB2C: diff --git a/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s index 59c4803303..8e256c7a2f 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_offVisitedRoom__Fi.s @@ -4,7 +4,7 @@ lbl_8002FC3C: /* 8002FC44 90 01 00 14 */ stw r0, 0x14(r1) /* 8002FC48 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002FC4C 7C 7F 1B 78 */ mr r31, r3 -/* 8002FC50 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8002FC50 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002FC54 7C 00 07 74 */ extsb r0, r0 /* 8002FC58 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ /* 8002FC5C 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ diff --git a/asm/d/com/d_com_inf_game/dComIfGs_offZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_offZoneSwitch__Fii.s index 9702357270..37ee77a471 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_offZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_offZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002D9CC: /* 8002D9E4 41 80 00 08 */ blt lbl_8002D9EC /* 8002D9E8 48 00 00 10 */ b lbl_8002D9F8 lbl_8002D9EC: -/* 8002D9EC 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002D9EC 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002D9F0 7C 84 07 75 */ extsb. r4, r4 /* 8002D9F4 41 80 00 28 */ blt lbl_8002DA1C lbl_8002D9F8: diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onOneZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_onOneZoneSwitch__Fii.s index 2fc9022ae5..bb2099a82a 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_onOneZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_onOneZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002DA9C: /* 8002DAB4 41 80 00 08 */ blt lbl_8002DABC /* 8002DAB8 48 00 00 10 */ b lbl_8002DAC8 lbl_8002DABC: -/* 8002DABC 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002DABC 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002DAC0 7C 84 07 75 */ extsb. r4, r4 /* 8002DAC4 41 80 00 28 */ blt lbl_8002DAEC lbl_8002DAC8: diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s b/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s index 1ad5450b55..9722587bc2 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_onVisitedRoom__Fi.s @@ -31,7 +31,7 @@ lbl_8002FB80: /* 8002FBF4 7F C4 F3 78 */ mr r4, r30 /* 8002FBF8 48 00 32 55 */ bl onRegionBit__33dSv_player_field_last_stay_info_cFi lbl_8002FBFC: -/* 8002FBFC 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8002FBFC 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002FC00 7C 00 07 74 */ extsb r0, r0 /* 8002FC04 1C 00 04 04 */ mulli r0, r0, 0x404 /* 8002FC08 7C 9D 00 2E */ lwzx r4, r29, r0 diff --git a/asm/d/com/d_com_inf_game/dComIfGs_onZoneSwitch__Fii.s b/asm/d/com/d_com_inf_game/dComIfGs_onZoneSwitch__Fii.s index d372d8f1e0..5725fd0064 100644 --- a/asm/d/com/d_com_inf_game/dComIfGs_onZoneSwitch__Fii.s +++ b/asm/d/com/d_com_inf_game/dComIfGs_onZoneSwitch__Fii.s @@ -8,7 +8,7 @@ lbl_8002D94C: /* 8002D964 41 80 00 08 */ blt lbl_8002D96C /* 8002D968 48 00 00 10 */ b lbl_8002D978 lbl_8002D96C: -/* 8002D96C 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8002D96C 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8002D970 7C 84 07 75 */ extsb. r4, r4 /* 8002D974 41 80 00 28 */ blt lbl_8002D99C lbl_8002D978: diff --git a/asm/d/d_attention/checkButton__12dAttention_cFv.s b/asm/d/d_attention/checkButton__12dAttention_cFv.s index 24260c3943..db3e953c46 100644 --- a/asm/d/d_attention/checkButton__12dAttention_cFv.s +++ b/asm/d/d_attention/checkButton__12dAttention_cFv.s @@ -7,7 +7,7 @@ lbl_800720F8: /* 8007210C 88 0D 89 D8 */ lbz r0, data_80450F58(r13) /* 80072110 28 00 00 00 */ cmplwi r0, 0 /* 80072114 41 82 00 60 */ beq lbl_80072174 -/* 80072118 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80072118 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8007211C 7C 00 07 75 */ extsb. r0, r0 /* 80072120 40 82 00 54 */ bne lbl_80072174 /* 80072124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/d/d_camera/Run__9dCamera_cFv.s b/asm/d/d_camera/Run__9dCamera_cFv.s index c6ee94dc6d..93e4bc1dc0 100644 --- a/asm/d/d_camera/Run__9dCamera_cFv.s +++ b/asm/d/d_camera/Run__9dCamera_cFv.s @@ -46,7 +46,7 @@ lbl_80162304: /* 80162360 38 00 00 00 */ li r0, 0 /* 80162364 90 1F 01 8C */ stw r0, 0x18c(r31) /* 80162368 90 1F 01 88 */ stw r0, 0x188(r31) -/* 8016236C 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8016236C 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80162370 7C 84 07 74 */ extsb r4, r4 /* 80162374 80 1F 00 04 */ lwz r0, 4(r31) /* 80162378 7C 04 00 00 */ cmpw r4, r0 diff --git a/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s b/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s index 8b2b5eae57..4afac980e8 100644 --- a/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s +++ b/asm/d/d_camera/SetTagData__9dCamera_cFP10fopAc_ac_clUsUc.s @@ -12,7 +12,7 @@ lbl_80163558: /* 80163580 7C 05 07 74 */ extsb r5, r0 /* 80163584 48 00 00 0C */ b lbl_80163590 lbl_80163588: -/* 80163588 88 AD 87 E4 */ lbz r5, struct_80450D64+0x0(r13) +/* 80163588 88 AD 87 E4 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8016358C 7C A5 07 74 */ extsb r5, r5 lbl_80163590: /* 80163590 7D 46 53 78 */ mr r6, r10 diff --git a/asm/d/d_camera/blureCamera__9dCamera_cFv.s b/asm/d/d_camera/blureCamera__9dCamera_cFv.s index 14fd086b7c..d001b1b2a7 100644 --- a/asm/d/d_camera/blureCamera__9dCamera_cFv.s +++ b/asm/d/d_camera/blureCamera__9dCamera_cFv.s @@ -118,11 +118,11 @@ lbl_80181340: /* 8018144C 83 C1 00 4C */ lwz r30, 0x4c(r1) /* 80181450 38 61 00 14 */ addi r3, r1, 0x14 /* 80181454 4B E8 BA 1D */ bl scaleM__14mDoMtx_stack_cFRC4cXyz -/* 80181458 9B CD 86 65 */ stb r30, struct_80450BE4+0x1(r13) +/* 80181458 9B CD 86 65 */ stb r30, mBlureFlag__13mDoGph_gInf_c+0x1(r13) /* 8018145C 48 00 00 10 */ b lbl_8018146C lbl_80181460: /* 80181460 38 00 00 00 */ li r0, 0 -/* 80181464 98 0D 86 64 */ stb r0, struct_80450BE4+0x0(r13) +/* 80181464 98 0D 86 64 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) /* 80181468 90 1F 07 04 */ stw r0, 0x704(r31) lbl_8018146C: /* 8018146C 80 7F 07 04 */ lwz r3, 0x704(r31) diff --git a/asm/d/d_camera/initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl.s b/asm/d/d_camera/initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl.s index efe6f6e60f..dc8b66c20e 100644 --- a/asm/d/d_camera/initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl.s +++ b/asm/d/d_camera/initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl.s @@ -37,7 +37,7 @@ lbl_80160470: /* 801604FC 48 00 10 55 */ bl initPad__9dCamera_cFv /* 80160500 38 7C 02 28 */ addi r3, r28, 0x228 /* 80160504 48 02 1F C5 */ bl Init__14dCamForcusLineFv -/* 80160508 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80160508 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8016050C 7C 00 07 74 */ extsb r0, r0 /* 80160510 90 1C 00 04 */ stw r0, 4(r28) /* 80160514 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -612,7 +612,7 @@ lbl_80160DB4: /* 80160DC8 90 7C 06 94 */ stw r3, 0x694(r28) lbl_80160DCC: /* 80160DCC 3B 60 00 FF */ li r27, 0xff -/* 80160DD0 8B 4D 87 E4 */ lbz r26, struct_80450D64+0x0(r13) +/* 80160DD0 8B 4D 87 E4 */ lbz r26, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80160DD4 7F 5A 07 74 */ extsb r26, r26 /* 80160DD8 38 7D 3F 8C */ addi r3, r29, 0x3f8c /* 80160DDC 7F 44 D3 78 */ mr r4, r26 diff --git a/asm/d/d_camera/nextType__9dCamera_cFl.s b/asm/d/d_camera/nextType__9dCamera_cFl.s index c0a362167b..1dde2d3287 100644 --- a/asm/d/d_camera/nextType__9dCamera_cFl.s +++ b/asm/d/d_camera/nextType__9dCamera_cFl.s @@ -333,7 +333,7 @@ lbl_80164208: /* 8016420C 2C 04 00 FF */ cmpwi r4, 0xff /* 80164210 41 82 00 4C */ beq lbl_8016425C /* 80164214 38 77 07 AC */ addi r3, r23, 0x7ac -/* 80164218 88 AD 87 E4 */ lbz r5, struct_80450D64+0x0(r13) +/* 80164218 88 AD 87 E4 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8016421C 7C A5 07 74 */ extsb r5, r5 /* 80164220 38 C0 00 00 */ li r6, 0 /* 80164224 38 E0 00 FF */ li r7, 0xff diff --git a/asm/d/d_camera/setMapToolData__9dCamera_cFv.s b/asm/d/d_camera/setMapToolData__9dCamera_cFv.s index 9bb2fd7a72..9f8f5570a6 100644 --- a/asm/d/d_camera/setMapToolData__9dCamera_cFv.s +++ b/asm/d/d_camera/setMapToolData__9dCamera_cFv.s @@ -5,7 +5,7 @@ lbl_80163340: /* 8016334C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80163350 93 C1 00 08 */ stw r30, 8(r1) /* 80163354 7C 7F 1B 78 */ mr r31, r3 -/* 80163358 8B CD 87 E4 */ lbz r30, struct_80450D64+0x0(r13) +/* 80163358 8B CD 87 E4 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8016335C 7F DE 07 74 */ extsb r30, r30 /* 80163360 7F C3 F3 78 */ mr r3, r30 /* 80163364 4B EC 9E F9 */ bl dComIfGp_getRoomCamera__Fi diff --git a/asm/d/d_camera/shakeCamera__9dCamera_cFv.s b/asm/d/d_camera/shakeCamera__9dCamera_cFv.s index 6e0ba3ed4f..d815b50f21 100644 --- a/asm/d/d_camera/shakeCamera__9dCamera_cFv.s +++ b/asm/d/d_camera/shakeCamera__9dCamera_cFv.s @@ -150,7 +150,7 @@ lbl_80180F40: /* 80180F54 FC 00 00 1E */ fctiwz f0, f0 /* 80180F58 D8 01 00 58 */ stfd f0, 0x58(r1) /* 80180F5C 80 01 00 5C */ lwz r0, 0x5c(r1) -/* 80180F60 98 0D 86 65 */ stb r0, struct_80450BE4+0x1(r13) +/* 80180F60 98 0D 86 65 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1(r13) /* 80180F64 4B E8 71 15 */ bl onBlure__13mDoGph_gInf_cFv /* 80180F68 48 00 00 70 */ b lbl_80180FD8 lbl_80180F6C: diff --git a/asm/d/d_demo/emitter_create__16dDemo_particle_cFUl.s b/asm/d/d_demo/emitter_create__16dDemo_particle_cFUl.s index c8b53e39d5..800327a593 100644 --- a/asm/d/d_demo/emitter_create__16dDemo_particle_cFUl.s +++ b/asm/d/d_demo/emitter_create__16dDemo_particle_cFUl.s @@ -12,7 +12,7 @@ lbl_80039F1C: /* 80039F44 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80039F48 38 80 00 00 */ li r4, 0 /* 80039F4C 90 81 00 08 */ stw r4, 8(r1) -/* 80039F50 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80039F50 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80039F54 7C 00 07 74 */ extsb r0, r0 /* 80039F58 90 01 00 0C */ stw r0, 0xc(r1) /* 80039F5C 90 81 00 10 */ stw r4, 0x10(r1) diff --git a/asm/d/d_envse/execute__8dEnvSe_cFv.s b/asm/d/d_envse/execute__8dEnvSe_cFv.s index f71cc29c2f..3ebd473184 100644 --- a/asm/d/d_envse/execute__8dEnvSe_cFv.s +++ b/asm/d/d_envse/execute__8dEnvSe_cFv.s @@ -5,7 +5,7 @@ lbl_80183480: /* 8018348C 39 61 00 20 */ addi r11, r1, 0x20 /* 80183490 48 1D ED 49 */ bl _savegpr_28 /* 80183494 7C 7C 1B 78 */ mr r28, r3 -/* 80183498 8B CD 87 E4 */ lbz r30, struct_80450D64+0x0(r13) +/* 80183498 8B CD 87 E4 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8018349C 7F DE 07 74 */ extsb r30, r30 /* 801834A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 801834A4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/d/d_envse/execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc.s b/asm/d/d_envse/execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc.s index 5dbc9d086b..5fe72b0d7c 100644 --- a/asm/d/d_envse/execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc.s +++ b/asm/d/d_envse/execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc.s @@ -9,7 +9,7 @@ lbl_80182FD8: /* 80182FF4 7C 7E 1B 78 */ mr r30, r3 /* 80182FF8 7C BD 2B 78 */ mr r29, r5 /* 80182FFC 7C D6 33 78 */ mr r22, r6 -/* 80183000 8B 6D 87 E4 */ lbz r27, struct_80450D64+0x0(r13) +/* 80183000 8B 6D 87 E4 */ lbz r27, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80183004 7F 7B 07 74 */ extsb r27, r27 /* 80183008 7F 7C DB 78 */ mr r28, r27 /* 8018300C 3B 20 00 00 */ li r25, 0 diff --git a/asm/d/d_error_msg/execute__19dShutdownErrorMsg_cFv.s b/asm/d/d_error_msg/execute__19dShutdownErrorMsg_cFv.s index 421d4bb8ce..efbca18825 100644 --- a/asm/d/d_error_msg/execute__19dShutdownErrorMsg_cFv.s +++ b/asm/d/d_error_msg/execute__19dShutdownErrorMsg_cFv.s @@ -27,7 +27,7 @@ lbl_8009D7C0: /* 8009D7F0 38 60 00 01 */ li r3, 1 /* 8009D7F4 48 00 00 78 */ b lbl_8009D86C lbl_8009D7F8: -/* 8009D7F8 88 0D 86 38 */ lbz r0, struct_80450BB8+0x0(r13) +/* 8009D7F8 88 0D 86 38 */ lbz r0, mInitFlag__17mDoAud_zelAudio_c+0x0(r13) /* 8009D7FC 28 00 00 00 */ cmplwi r0, 0 /* 8009D800 41 82 00 14 */ beq lbl_8009D814 /* 8009D804 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) diff --git a/asm/d/d_ev_camera/maptoolIdEvCamera__9dCamera_cFv.s b/asm/d/d_ev_camera/maptoolIdEvCamera__9dCamera_cFv.s index 3b06d840ef..d827261d32 100644 --- a/asm/d/d_ev_camera/maptoolIdEvCamera__9dCamera_cFv.s +++ b/asm/d/d_ev_camera/maptoolIdEvCamera__9dCamera_cFv.s @@ -50,7 +50,7 @@ lbl_800902E4: /* 800902E4 38 60 00 01 */ li r3, 1 /* 800902E8 48 00 01 78 */ b lbl_80090460 lbl_800902EC: -/* 800902EC 8B AD 87 E4 */ lbz r29, struct_80450D64+0x0(r13) +/* 800902EC 8B AD 87 E4 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800902F0 7F BD 07 74 */ extsb r29, r29 /* 800902F4 88 63 00 04 */ lbz r3, 4(r3) /* 800902F8 4B FF 87 01 */ bl func_800889F8 diff --git a/asm/d/d_item/item_func_WOOD_STICK__Fv.s b/asm/d/d_item/item_func_WOOD_STICK__Fv.s index 2db2317f6e..acfe2e4327 100644 --- a/asm/d/d_item/item_func_WOOD_STICK__Fv.s +++ b/asm/d/d_item/item_func_WOOD_STICK__Fv.s @@ -10,7 +10,7 @@ lbl_800986C4: /* 800986E4 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc /* 800986E8 38 60 00 3F */ li r3, 0x3f /* 800986EC 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword__FUc -/* 800986F0 88 AD 87 E4 */ lbz r5, struct_80450D64+0x0(r13) +/* 800986F0 88 AD 87 E4 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800986F4 7C A5 07 74 */ extsb r5, r5 /* 800986F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 800986FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s b/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s index 1a2994664e..93239463b5 100644 --- a/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s +++ b/asm/d/d_k_wmark/dkWmark_Create__FP12kankyo_class.s @@ -138,7 +138,7 @@ lbl_80261608: /* 80261608 C0 02 B5 B4 */ lfs f0, lit_3719(r2) /* 8026160C D0 1F 04 90 */ stfs f0, 0x490(r31) /* 80261610 38 7F 01 00 */ addi r3, r31, 0x100 -/* 80261614 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80261614 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80261618 7C 04 07 74 */ extsb r4, r0 /* 8026161C 38 A0 00 FF */ li r5, 0xff /* 80261620 4B F4 72 CD */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc diff --git a/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s b/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s index 7437fe0363..6e805f0aac 100644 --- a/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s +++ b/asm/d/d_k_wpillar/create__11dkWpillar_cFv.s @@ -68,7 +68,7 @@ lbl_80261C14: /* 80261C58 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80261C5C 48 00 00 10 */ b lbl_80261C6C lbl_80261C60: -/* 80261C60 8B 8D 87 E4 */ lbz r28, struct_80450D64+0x0(r13) +/* 80261C60 8B 8D 87 E4 */ lbz r28, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80261C64 7F 9C 07 74 */ extsb r28, r28 /* 80261C68 38 A0 00 FF */ li r5, 0xff lbl_80261C6C: diff --git a/asm/d/d_ky_thunder/create__10dThunder_cFv.s b/asm/d/d_ky_thunder/create__10dThunder_cFv.s index 0ced1830ae..3bab881c04 100644 --- a/asm/d/d_ky_thunder/create__10dThunder_cFv.s +++ b/asm/d/d_ky_thunder/create__10dThunder_cFv.s @@ -159,7 +159,7 @@ lbl_801AE68C: /* 801AE6A8 48 1B A2 ED */ bl strcmp /* 801AE6AC 2C 03 00 00 */ cmpwi r3, 0 /* 801AE6B0 40 82 00 20 */ bne lbl_801AE6D0 -/* 801AE6B4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801AE6B4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801AE6B8 2C 00 00 04 */ cmpwi r0, 4 /* 801AE6BC 40 82 00 14 */ bne lbl_801AE6D0 /* 801AE6C0 C3 82 A4 80 */ lfs f28, lit_3923(r2) @@ -274,7 +274,7 @@ lbl_801AE7B0: /* 801AE860 48 1B A1 35 */ bl strcmp /* 801AE864 2C 03 00 00 */ cmpwi r3, 0 /* 801AE868 40 82 00 40 */ bne lbl_801AE8A8 -/* 801AE86C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801AE86C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801AE870 2C 00 00 04 */ cmpwi r0, 4 /* 801AE874 40 82 00 34 */ bne lbl_801AE8A8 /* 801AE878 C0 22 A4 E4 */ lfs f1, lit_4095(r2) diff --git a/asm/d/d_stage/loadRoom__20dStage_roomControl_cFiPUcb.s b/asm/d/d_stage/loadRoom__20dStage_roomControl_cFiPUcb.s index 4b13f919c2..7decef37e8 100644 --- a/asm/d/d_stage/loadRoom__20dStage_roomControl_cFiPUcb.s +++ b/asm/d/d_stage/loadRoom__20dStage_roomControl_cFiPUcb.s @@ -10,7 +10,7 @@ lbl_8002451C: /* 8002453C 88 0D 80 70 */ lbz r0, data_804505F0(r13) /* 80024540 7C 00 07 75 */ extsb. r0, r0 /* 80024544 40 80 00 18 */ bge lbl_8002455C -/* 80024548 88 0D 87 E8 */ lbz r0, data_80450D68(r13) +/* 80024548 88 0D 87 E8 */ lbz r0, mNoChangeRoom__20dStage_roomControl_c(r13) /* 8002454C 28 00 00 00 */ cmplwi r0, 0 /* 80024550 41 82 00 0C */ beq lbl_8002455C /* 80024554 38 60 00 00 */ li r3, 0 diff --git a/asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s b/asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s index 5632b8c49b..44d177d5f1 100644 --- a/asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s +++ b/asm/d/event/d_event_data/dEvDt_Next_Stage__Fii.s @@ -28,7 +28,7 @@ lbl_80043A14: /* 80043A7C 28 03 00 00 */ cmplwi r3, 0 /* 80043A80 41 82 00 E0 */ beq lbl_80043B60 /* 80043A84 82 83 00 00 */ lwz r20, 0(r3) -/* 80043A88 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80043A88 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80043A8C 7C 04 07 74 */ extsb r4, r0 /* 80043A90 2C 04 FF FF */ cmpwi r4, -1 /* 80043A94 40 82 00 1C */ bne lbl_80043AB0 diff --git a/asm/d/event/d_event_data/specialProcCreate__12dEvDtStaff_cFv.s b/asm/d/event/d_event_data/specialProcCreate__12dEvDtStaff_cFv.s index 53540a8eef..b8b52fd89a 100644 --- a/asm/d/event/d_event_data/specialProcCreate__12dEvDtStaff_cFv.s +++ b/asm/d/event/d_event_data/specialProcCreate__12dEvDtStaff_cFv.s @@ -135,7 +135,7 @@ lbl_80044EA8: /* 80044EA8 A8 7D 00 08 */ lha r3, 8(r29) /* 80044EAC 7F 84 E3 78 */ mr r4, r28 /* 80044EB0 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80044EB4 88 CD 87 E4 */ lbz r6, struct_80450D64+0x0(r13) +/* 80044EB4 88 CD 87 E4 */ lbz r6, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80044EB8 7C C6 07 74 */ extsb r6, r6 /* 80044EBC 38 E1 00 08 */ addi r7, r1, 8 /* 80044EC0 39 01 00 10 */ addi r8, r1, 0x10 diff --git a/asm/d/event/d_event_data/specialProcDirector__12dEvDtStaff_cFv.s b/asm/d/event/d_event_data/specialProcDirector__12dEvDtStaff_cFv.s index 88ed3e40e7..8681fe2739 100644 --- a/asm/d/event/d_event_data/specialProcDirector__12dEvDtStaff_cFv.s +++ b/asm/d/event/d_event_data/specialProcDirector__12dEvDtStaff_cFv.s @@ -571,7 +571,7 @@ lbl_80045720: /* 80045728 4B FF E9 15 */ bl specialProc_WaitProc__12dEvDtStaff_cFi /* 8004572C 48 00 01 34 */ b lbl_80045860 lbl_80045730: -/* 80045730 88 0D 86 66 */ lbz r0, struct_80450BE4+0x2(r13) +/* 80045730 88 0D 86 66 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 80045734 28 00 00 00 */ cmplwi r0, 0 /* 80045738 40 82 00 14 */ bne lbl_8004574C /* 8004573C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s b/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s index d60247397f..9ec8c4e3e6 100644 --- a/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s +++ b/asm/d/kankyo/d_kankyo/GetTimePass__20dStage_roomControl_cFv.s @@ -1,3 +1,3 @@ lbl_8019F780: -/* 8019F780 88 6D 87 E7 */ lbz r3, struct_80450D64+0x3(r13) +/* 8019F780 88 6D 87 E7 */ lbz r3, mStayNo__20dStage_roomControl_c+0x3(r13) /* 8019F784 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_BossLight_set__FP4cXyzP8_GXColorfUc.s b/asm/d/kankyo/d_kankyo/dKy_BossLight_set__FP4cXyzP8_GXColorfUc.s index 2c23180c91..9f8042e626 100644 --- a/asm/d/kankyo/d_kankyo/dKy_BossLight_set__FP4cXyzP8_GXColorfUc.s +++ b/asm/d/kankyo/d_kankyo/dKy_BossLight_set__FP4cXyzP8_GXColorfUc.s @@ -29,7 +29,7 @@ lbl_801A9D60: /* 801A9DCC 48 1B EB C9 */ bl strcmp /* 801A9DD0 2C 03 00 00 */ cmpwi r3, 0 /* 801A9DD4 41 82 00 58 */ beq lbl_801A9E2C -/* 801A9DD8 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 801A9DD8 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A9DDC 3B B5 4E C4 */ addi r29, r21, 0x4ec4 /* 801A9DE0 7F A3 EB 78 */ mr r3, r29 /* 801A9DE4 7C 95 23 78 */ mr r21, r4 diff --git a/asm/d/kankyo/d_kankyo/dKy_Create__FPv.s b/asm/d/kankyo/d_kankyo/dKy_Create__FPv.s index d0e396c425..31be93ee4f 100644 --- a/asm/d/kankyo/d_kankyo/dKy_Create__FPv.s +++ b/asm/d/kankyo/d_kankyo/dKy_Create__FPv.s @@ -46,7 +46,7 @@ lbl_801A5C8C: /* 801A5CC8 48 00 24 C9 */ bl dKy_Sound_init__Fv /* 801A5CCC 4B EB 48 F5 */ bl dKyw_wind_set__Fv /* 801A5CD0 4B FF 8B A5 */ bl dungeonlight_init__Fv -/* 801A5CD4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A5CD4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A5CD8 7C 03 07 74 */ extsb r3, r0 /* 801A5CDC 48 00 0F 45 */ bl dKy_setLight_nowroom__Fc /* 801A5CE0 3C 60 80 39 */ lis r3, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ diff --git a/asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s deleted file mode 100644 index 94d877483d..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801AC28C: -/* 801AC28C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AC290 7C 08 02 A6 */ mflr r0 -/* 801AC294 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AC298 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AC29C 3B E0 00 00 */ li r31, 0 -/* 801AC2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AC2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AC2A8 85 83 4E 20 */ lwzu r12, 0x4e20(r3) -/* 801AC2AC 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801AC2B0 7D 89 03 A6 */ mtctr r12 -/* 801AC2B4 4E 80 04 21 */ bctrl -/* 801AC2B8 80 03 00 0C */ lwz r0, 0xc(r3) -/* 801AC2BC 54 00 87 7F */ rlwinm. r0, r0, 0x10, 0x1d, 0x1f -/* 801AC2C0 41 82 00 08 */ beq lbl_801AC2C8 -/* 801AC2C4 3B E0 00 01 */ li r31, 1 -lbl_801AC2C8: -/* 801AC2C8 7F E3 FB 78 */ mr r3, r31 -/* 801AC2CC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AC2D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AC2D4 7C 08 03 A6 */ mtlr r0 -/* 801AC2D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AC2DC 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Itemgetcol_chg_on__Fv.s b/asm/d/kankyo/d_kankyo/dKy_Itemgetcol_chg_on__Fv.s deleted file mode 100644 index 1898b2661e..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Itemgetcol_chg_on__Fv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801A8168: -/* 801A8168 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A816C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8170 88 03 12 D1 */ lbz r0, 0x12d1(r3) -/* 801A8174 28 00 00 00 */ cmplwi r0, 0 -/* 801A8178 41 82 00 0C */ beq lbl_801A8184 -/* 801A817C 28 00 00 06 */ cmplwi r0, 6 -/* 801A8180 4C 82 00 20 */ bnelr -lbl_801A8184: -/* 801A8184 38 00 00 01 */ li r0, 1 -/* 801A8188 98 03 12 D1 */ stb r0, 0x12d1(r3) -/* 801A818C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s deleted file mode 100644 index 67ad6c246f..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801AC228: -/* 801AC228 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AC22C 7C 08 02 A6 */ mflr r0 -/* 801AC230 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AC234 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AC238 3B E0 00 00 */ li r31, 0 -/* 801AC23C 38 00 00 00 */ li r0, 0 -/* 801AC240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AC244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AC248 34 63 4E 20 */ addic. r3, r3, 0x4e20 -/* 801AC24C 41 82 00 1C */ beq lbl_801AC268 -/* 801AC250 81 83 00 00 */ lwz r12, 0(r3) -/* 801AC254 81 8C 00 BC */ lwz r12, 0xbc(r12) -/* 801AC258 7D 89 03 A6 */ mtctr r12 -/* 801AC25C 4E 80 04 21 */ bctrl -/* 801AC260 80 03 00 0C */ lwz r0, 0xc(r3) -/* 801AC264 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f -lbl_801AC268: -/* 801AC268 28 00 00 00 */ cmplwi r0, 0 -/* 801AC26C 40 82 00 08 */ bne lbl_801AC274 -/* 801AC270 3B E0 00 01 */ li r31, 1 -lbl_801AC274: -/* 801AC274 7F E3 FB 78 */ mr r3, r31 -/* 801AC278 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AC27C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AC280 7C 08 03 A6 */ mtlr r0 -/* 801AC284 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AC288 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf.s b/asm/d/kankyo/d_kankyo/dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf.s index 49a9560b12..23561d9b39 100644 --- a/asm/d/kankyo/d_kankyo/dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf.s +++ b/asm/d/kankyo/d_kankyo/dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf.s @@ -50,7 +50,7 @@ lbl_801A8EC0: /* 801A8EDC 8A 03 00 1B */ lbz r16, 0x1b(r3) /* 801A8EE0 48 00 00 C0 */ b lbl_801A8FA0 lbl_801A8EE4: -/* 801A8EE4 8A 8D 87 E4 */ lbz r20, struct_80450D64+0x0(r13) +/* 801A8EE4 8A 8D 87 E4 */ lbz r20, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A8EE8 7E 94 07 74 */ extsb r20, r20 /* 801A8EEC 48 00 32 7D */ bl dKy_SunMoon_Light_Check__Fv /* 801A8EF0 2C 03 00 01 */ cmpwi r3, 1 @@ -204,7 +204,7 @@ lbl_801A90C4: /* 801A9114 4E 80 04 21 */ bctrl /* 801A9118 48 00 00 48 */ b lbl_801A9160 lbl_801A911C: -/* 801A911C 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 801A911C 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A9120 7C 84 07 74 */ extsb r4, r4 /* 801A9124 7D E3 7B 78 */ mr r3, r15 /* 801A9128 4B E7 B2 5D */ bl getStatusRoomDt__20dStage_roomControl_cFi @@ -213,7 +213,7 @@ lbl_801A911C: /* 801A9134 7D 89 03 A6 */ mtctr r12 /* 801A9138 4E 80 04 21 */ bctrl /* 801A913C 7C 74 1B 78 */ mr r20, r3 -/* 801A9140 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 801A9140 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A9144 7C 84 07 74 */ extsb r4, r4 /* 801A9148 7D E3 7B 78 */ mr r3, r15 /* 801A914C 4B E7 B2 39 */ bl getStatusRoomDt__20dStage_roomControl_cFi @@ -241,7 +241,7 @@ lbl_801A9160: /* 801A91A0 7C 60 1B 78 */ mr r0, r3 /* 801A91A4 48 00 00 0C */ b lbl_801A91B0 lbl_801A91A8: -/* 801A91A8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A91A8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A91AC 7C 00 07 74 */ extsb r0, r0 lbl_801A91B0: /* 801A91B0 7E 83 A3 78 */ mr r3, r20 diff --git a/asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s b/asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s deleted file mode 100644 index 85eee25815..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8474: -/* 801A8474 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8478 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A847C 38 63 09 74 */ addi r3, r3, 0x974 -/* 801A8480 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s b/asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s deleted file mode 100644 index b0b9ab332c..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_801A8190: -/* 801A8190 C0 02 A2 A8 */ lfs f0, lit_5346(r2) -/* 801A8194 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8198 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A819C D0 04 09 74 */ stfs f0, 0x974(r4) -/* 801A81A0 D0 04 09 78 */ stfs f0, 0x978(r4) -/* 801A81A4 D0 04 09 7C */ stfs f0, 0x97c(r4) -/* 801A81A8 38 60 00 00 */ li r3, 0 -/* 801A81AC 90 64 09 80 */ stw r3, 0x980(r4) -/* 801A81B0 38 00 FF FF */ li r0, -1 -/* 801A81B4 90 04 09 88 */ stw r0, 0x988(r4) -/* 801A81B8 90 64 09 84 */ stw r3, 0x984(r4) -/* 801A81BC 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_SunMoon_Light_Check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_SunMoon_Light_Check__Fv.s deleted file mode 100644 index 87ac328252..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_SunMoon_Light_Check__Fv.s +++ /dev/null @@ -1,50 +0,0 @@ -lbl_801AC168: -/* 801AC168 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AC16C 7C 08 02 A6 */ mflr r0 -/* 801AC170 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AC174 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AC178 93 C1 00 08 */ stw r30, 8(r1) -/* 801AC17C 3B C0 00 00 */ li r30, 0 -/* 801AC180 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AC184 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AC188 88 03 0E 70 */ lbz r0, 0xe70(r3) -/* 801AC18C 28 00 00 00 */ cmplwi r0, 0 -/* 801AC190 41 82 00 7C */ beq lbl_801AC20C -/* 801AC194 48 00 03 E9 */ bl dKy_darkworld_check__Fv -/* 801AC198 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801AC19C 40 82 00 70 */ bne lbl_801AC20C -/* 801AC1A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AC1A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AC1A8 3B E3 4E 00 */ addi r31, r3, 0x4e00 -/* 801AC1AC 7F E3 FB 78 */ mr r3, r31 -/* 801AC1B0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ -/* 801AC1B4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */ -/* 801AC1B8 38 84 00 C3 */ addi r4, r4, 0xc3 -/* 801AC1BC 38 A0 00 06 */ li r5, 6 -/* 801AC1C0 48 1B 9E CD */ bl memcmp -/* 801AC1C4 2C 03 00 00 */ cmpwi r3, 0 -/* 801AC1C8 41 82 00 44 */ beq lbl_801AC20C -/* 801AC1CC 7F E3 FB 78 */ mr r3, r31 -/* 801AC1D0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ -/* 801AC1D4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */ -/* 801AC1D8 38 84 01 6C */ addi r4, r4, 0x16c -/* 801AC1DC 38 A0 00 06 */ li r5, 6 -/* 801AC1E0 48 1B 9E AD */ bl memcmp -/* 801AC1E4 2C 03 00 00 */ cmpwi r3, 0 -/* 801AC1E8 41 82 00 24 */ beq lbl_801AC20C -/* 801AC1EC 7F E3 FB 78 */ mr r3, r31 -/* 801AC1F0 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ -/* 801AC1F4 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */ -/* 801AC1F8 38 84 01 82 */ addi r4, r4, 0x182 -/* 801AC1FC 48 1B C7 99 */ bl strcmp -/* 801AC200 2C 03 00 00 */ cmpwi r3, 0 -/* 801AC204 41 82 00 08 */ beq lbl_801AC20C -/* 801AC208 3B C0 00 01 */ li r30, 1 -lbl_801AC20C: -/* 801AC20C 7F C3 F3 78 */ mr r3, r30 -/* 801AC210 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AC214 83 C1 00 08 */ lwz r30, 8(r1) -/* 801AC218 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AC21C 7C 08 03 A6 */ mtlr r0 -/* 801AC220 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AC224 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_TeachWind_existence_chk__Fv.s b/asm/d/kankyo/d_kankyo/dKy_TeachWind_existence_chk__Fv.s deleted file mode 100644 index 35045566fd..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_TeachWind_existence_chk__Fv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801AC140: -/* 801AC140 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AC144 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AC148 88 63 0E 6E */ lbz r3, 0xe6e(r3) -/* 801AC14C 28 03 00 FF */ cmplwi r3, 0xff -/* 801AC150 40 82 00 0C */ bne lbl_801AC15C -/* 801AC154 38 60 FF FF */ li r3, -1 -/* 801AC158 4E 80 00 20 */ blr -lbl_801AC15C: -/* 801AC15C 30 03 FF FF */ addic r0, r3, -1 -/* 801AC160 7C 60 19 10 */ subfe r3, r0, r3 -/* 801AC164 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_check__Fv.s deleted file mode 100644 index 8c7c4dcf03..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_check__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801AB280: -/* 801AB280 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AB284 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AB288 88 63 12 D8 */ lbz r3, 0x12d8(r3) -/* 801AB28C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_set__FUc.s b/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_set__FUc.s deleted file mode 100644 index dff74cb586..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_set__FUc.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801AB270: -/* 801AB270 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AB274 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ -/* 801AB278 98 64 12 D8 */ stb r3, 0x12d8(r4) -/* 801AB27C 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_change_colpat__FUc.s b/asm/d/kankyo/d_kankyo/dKy_change_colpat__FUc.s deleted file mode 100644 index a4345d54db..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_change_colpat__FUc.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801A87E4: -/* 801A87E4 3C 80 80 43 */ lis r4, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A87E8 38 A4 CA 54 */ addi r5, r4, g_env_light@l /* 0x8042CA54@l */ -/* 801A87EC 98 65 12 C5 */ stb r3, 0x12c5(r5) -/* 801A87F0 88 85 12 C3 */ lbz r4, 0x12c3(r5) -/* 801A87F4 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801A87F8 7C 04 00 40 */ cmplw r4, r0 -/* 801A87FC 4D 82 00 20 */ beqlr -/* 801A8800 C0 02 A2 0C */ lfs f0, lit_4409(r2) -/* 801A8804 D0 05 11 E0 */ stfs f0, 0x11e0(r5) -/* 801A8808 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_custom_colset__FUcUcf.s b/asm/d/kankyo/d_kankyo/dKy_custom_colset__FUcUcf.s deleted file mode 100644 index a9c8523e18..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_custom_colset__FUcUcf.s +++ /dev/null @@ -1,21 +0,0 @@ -lbl_801A880C: -/* 801A880C 3C A0 80 43 */ lis r5, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8810 38 A5 CA 54 */ addi r5, r5, g_env_light@l /* 0x8042CA54@l */ -/* 801A8814 88 05 12 D2 */ lbz r0, 0x12d2(r5) -/* 801A8818 28 00 00 01 */ cmplwi r0, 1 -/* 801A881C 4D 82 00 20 */ beqlr -/* 801A8820 C0 02 A2 48 */ lfs f0, lit_4505(r2) -/* 801A8824 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 801A8828 40 80 00 0C */ bge lbl_801A8834 -/* 801A882C 98 65 12 C4 */ stb r3, 0x12c4(r5) -/* 801A8830 48 00 00 08 */ b lbl_801A8838 -lbl_801A8834: -/* 801A8834 98 85 12 C4 */ stb r4, 0x12c4(r5) -lbl_801A8838: -/* 801A8838 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A883C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8840 98 83 12 C5 */ stb r4, 0x12c5(r3) -/* 801A8844 D0 23 11 E0 */ stfs f1, 0x11e0(r3) -/* 801A8848 38 00 00 01 */ li r0, 1 -/* 801A884C 98 03 12 CE */ stb r0, 0x12ce(r3) -/* 801A8850 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_darkworld_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_darkworld_check__Fv.s deleted file mode 100644 index 53df7e6a21..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_darkworld_check__Fv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_801AC57C: -/* 801AC57C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801AC580 7C 08 02 A6 */ mflr r0 -/* 801AC584 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AC588 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801AC58C 3B E0 00 00 */ li r31, 0 -/* 801AC590 4B E8 2F 89 */ bl dComIfGp_world_dark_get__Fv -/* 801AC594 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801AC598 28 00 00 01 */ cmplwi r0, 1 -/* 801AC59C 40 82 00 08 */ bne lbl_801AC5A4 -/* 801AC5A0 3B E0 00 01 */ li r31, 1 -lbl_801AC5A4: -/* 801AC5A4 7F E3 FB 78 */ mr r3, r31 -/* 801AC5A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801AC5AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801AC5B0 7C 08 03 A6 */ mtlr r0 -/* 801AC5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801AC5B8 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s b/asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s deleted file mode 100644 index 20f8c57e62..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_801A8B38: -/* 801A8B38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A8B3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A8B40 A0 83 00 38 */ lhz r4, 0x38(r3) -/* 801A8B44 38 60 00 07 */ li r3, 7 -/* 801A8B48 7C 04 1B D6 */ divw r0, r4, r3 -/* 801A8B4C 7C 00 19 D6 */ mullw r0, r0, r3 -/* 801A8B50 7C 60 20 50 */ subf r3, r0, r4 -/* 801A8B54 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_instant_rainchg__Fv.s b/asm/d/kankyo/d_kankyo/dKy_instant_rainchg__Fv.s deleted file mode 100644 index 47fd273a8d..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_instant_rainchg__Fv.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801A8BC8: -/* 801A8BC8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A8BCC 7C 08 02 A6 */ mflr r0 -/* 801A8BD0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A8BD4 38 60 00 FA */ li r3, 0xfa -/* 801A8BD8 4B EB 2A 75 */ bl dKyw_rain_set__Fi -/* 801A8BDC 38 00 00 01 */ li r0, 1 -/* 801A8BE0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8BE4 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8BE8 98 03 12 C8 */ stb r0, 0x12c8(r3) -/* 801A8BEC 98 03 12 C2 */ stb r0, 0x12c2(r3) -/* 801A8BF0 98 03 12 C3 */ stb r0, 0x12c3(r3) -/* 801A8BF4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A8BF8 7C 08 03 A6 */ mtlr r0 -/* 801A8BFC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A8C00 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_instant_timechg__Ff.s b/asm/d/kankyo/d_kankyo/dKy_instant_timechg__Ff.s deleted file mode 100644 index 4e62a11151..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_instant_timechg__Ff.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_801A8B68: -/* 801A8B68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A8B6C 7C 08 02 A6 */ mflr r0 -/* 801A8B70 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A8B74 DB E1 00 08 */ stfd f31, 8(r1) -/* 801A8B78 FF E0 08 90 */ fmr f31, f1 -/* 801A8B7C 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8B80 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8B84 4B FF 6E 85 */ bl getDaytime__18dScnKy_env_light_cFv -/* 801A8B88 FC 1F 08 40 */ fcmpo cr0, f31, f1 -/* 801A8B8C 40 80 00 1C */ bge lbl_801A8BA8 -/* 801A8B90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A8B94 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A8B98 A0 64 00 38 */ lhz r3, 0x38(r4) -/* 801A8B9C 38 03 00 01 */ addi r0, r3, 1 -/* 801A8BA0 B0 04 00 38 */ sth r0, 0x38(r4) -/* 801A8BA4 48 00 51 5D */ bl dKankyo_DayProc__Fv -lbl_801A8BA8: -/* 801A8BA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801A8BAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801A8BB0 D3 E3 00 34 */ stfs f31, 0x34(r3) -/* 801A8BB4 CB E1 00 08 */ lfd f31, 8(r1) -/* 801A8BB8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A8BBC 7C 08 03 A6 */ mtlr r0 -/* 801A8BC0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A8BC4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_light_influence_id__F4cXyzi.s b/asm/d/kankyo/d_kankyo/dKy_light_influence_id__F4cXyzi.s index 73154d91c5..d1fc073bb5 100644 --- a/asm/d/kankyo/d_kankyo/dKy_light_influence_id__F4cXyzi.s +++ b/asm/d/kankyo/d_kankyo/dKy_light_influence_id__F4cXyzi.s @@ -218,7 +218,7 @@ lbl_8019E044: /* 8019E064 48 1C A9 31 */ bl strcmp /* 8019E068 2C 03 00 00 */ cmpwi r3, 0 /* 8019E06C 40 82 00 30 */ bne lbl_8019E09C -/* 8019E070 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8019E070 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8019E074 7C 00 07 75 */ extsb. r0, r0 /* 8019E078 40 82 00 24 */ bne lbl_8019E09C /* 8019E07C C0 22 A2 60 */ lfs f1, lit_4529(r2) diff --git a/asm/d/kankyo/d_kankyo/dKy_pol_argument_get__FPC13cBgS_PolyInfo.s b/asm/d/kankyo/d_kankyo/dKy_pol_argument_get__FPC13cBgS_PolyInfo.s deleted file mode 100644 index 4d02570914..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_pol_argument_get__FPC13cBgS_PolyInfo.s +++ /dev/null @@ -1,57 +0,0 @@ -lbl_801AB59C: -/* 801AB59C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801AB5A0 7C 08 02 A6 */ mflr r0 -/* 801AB5A4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801AB5A8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB5AC 48 1B 6C 2D */ bl _savegpr_28 -/* 801AB5B0 7C 7C 1B 79 */ or. r28, r3, r3 -/* 801AB5B4 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AB5B8 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AB5BC 41 82 00 14 */ beq lbl_801AB5D0 -/* 801AB5C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801AB5C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801AB5C8 37 C3 0F 38 */ addic. r30, r3, 0xf38 -/* 801AB5CC 40 82 00 0C */ bne lbl_801AB5D8 -lbl_801AB5D0: -/* 801AB5D0 38 60 00 00 */ li r3, 0 -/* 801AB5D4 48 00 00 7C */ b lbl_801AB650 -lbl_801AB5D8: -/* 801AB5D8 7F C3 F3 78 */ mr r3, r30 -/* 801AB5DC 7F 84 E3 78 */ mr r4, r28 -/* 801AB5E0 4B EC 98 71 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo -/* 801AB5E4 7C 7D 1B 78 */ mr r29, r3 -/* 801AB5E8 38 7E 3E C8 */ addi r3, r30, 0x3ec8 -/* 801AB5EC 3C 80 80 39 */ lis r4, d_kankyo_d_kankyo__stringBase0@ha /* 0x80394C6C@ha */ -/* 801AB5F0 38 84 4C 6C */ addi r4, r4, d_kankyo_d_kankyo__stringBase0@l /* 0x80394C6C@l */ -/* 801AB5F4 38 84 01 7A */ addi r4, r4, 0x17a -/* 801AB5F8 48 1B D3 9D */ bl strcmp -/* 801AB5FC 2C 03 00 00 */ cmpwi r3, 0 -/* 801AB600 40 82 00 24 */ bne lbl_801AB624 -/* 801AB604 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801AB608 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801AB60C 88 03 12 FE */ lbz r0, 0x12fe(r3) -/* 801AB610 28 00 00 04 */ cmplwi r0, 4 -/* 801AB614 40 82 00 10 */ bne lbl_801AB624 -/* 801AB618 2C 1D 00 04 */ cmpwi r29, 4 -/* 801AB61C 40 82 00 08 */ bne lbl_801AB624 -/* 801AB620 3B A0 00 0D */ li r29, 0xd -lbl_801AB624: -/* 801AB624 7F C3 F3 78 */ mr r3, r30 -/* 801AB628 7F 84 E3 78 */ mr r4, r28 -/* 801AB62C 4B EC 98 75 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo -/* 801AB630 80 9F 12 F0 */ lwz r4, 0x12f0(r31) -/* 801AB634 28 04 00 00 */ cmplwi r4, 0 -/* 801AB638 41 82 00 14 */ beq lbl_801AB64C -/* 801AB63C 57 A0 18 38 */ slwi r0, r29, 3 -/* 801AB640 7C 00 1A 14 */ add r0, r0, r3 -/* 801AB644 7C 64 00 AE */ lbzx r3, r4, r0 -/* 801AB648 48 00 00 08 */ b lbl_801AB650 -lbl_801AB64C: -/* 801AB64C 38 60 00 00 */ li r3, 0 -lbl_801AB650: -/* 801AB650 39 61 00 20 */ addi r11, r1, 0x20 -/* 801AB654 48 1B 6B D1 */ bl _restgpr_28 -/* 801AB658 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801AB65C 7C 08 03 A6 */ mtlr r0 -/* 801AB660 38 21 00 20 */ addi r1, r1, 0x20 -/* 801AB664 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s b/asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s deleted file mode 100644 index f9acff8454..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8A34: -/* 801A8A34 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8A38 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8A3C 80 63 0E 80 */ lwz r3, 0xe80(r3) -/* 801A8A40 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s b/asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s deleted file mode 100644 index 23dcfd79a5..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s +++ /dev/null @@ -1,10 +0,0 @@ -lbl_801A60BC: -/* 801A60BC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A60C0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A60C4 C0 03 10 88 */ lfs f0, 0x1088(r3) -/* 801A60C8 D0 03 10 70 */ stfs f0, 0x1070(r3) -/* 801A60CC C0 03 10 8C */ lfs f0, 0x108c(r3) -/* 801A60D0 D0 03 10 74 */ stfs f0, 0x1074(r3) -/* 801A60D4 C0 03 10 90 */ lfs f0, 0x1090(r3) -/* 801A60D8 D0 03 10 78 */ stfs f0, 0x1078(r3) -/* 801A60DC 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_setLight_mine__FP12dKy_tevstr_c.s b/asm/d/kankyo/d_kankyo/dKy_setLight_mine__FP12dKy_tevstr_c.s deleted file mode 100644 index a764b4abcd..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_setLight_mine__FP12dKy_tevstr_c.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801A8854: -/* 801A8854 94 21 FF A0 */ stwu r1, -0x60(r1) -/* 801A8858 7C 08 02 A6 */ mflr r0 -/* 801A885C 90 01 00 64 */ stw r0, 0x64(r1) -/* 801A8860 93 E1 00 5C */ stw r31, 0x5c(r1) -/* 801A8864 7C 7F 1B 78 */ mr r31, r3 -/* 801A8868 38 61 00 0C */ addi r3, r1, 0xc -/* 801A886C C0 3F 00 00 */ lfs f1, 0(r31) -/* 801A8870 C0 5F 00 04 */ lfs f2, 4(r31) -/* 801A8874 C0 7F 00 08 */ lfs f3, 8(r31) -/* 801A8878 48 1B 50 35 */ bl GXInitLightPos -/* 801A887C 38 61 00 0C */ addi r3, r1, 0xc -/* 801A8880 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 801A8884 C0 5F 00 10 */ lfs f2, 0x10(r31) -/* 801A8888 C0 7F 00 14 */ lfs f3, 0x14(r31) -/* 801A888C 48 1B 50 31 */ bl GXInitLightDir -/* 801A8890 80 1F 00 18 */ lwz r0, 0x18(r31) -/* 801A8894 90 01 00 08 */ stw r0, 8(r1) -/* 801A8898 38 61 00 0C */ addi r3, r1, 0xc -/* 801A889C 38 81 00 08 */ addi r4, r1, 8 -/* 801A88A0 48 1B 50 39 */ bl GXInitLightColor -/* 801A88A4 38 61 00 0C */ addi r3, r1, 0xc -/* 801A88A8 C0 3F 00 1C */ lfs f1, 0x1c(r31) -/* 801A88AC C0 5F 00 20 */ lfs f2, 0x20(r31) -/* 801A88B0 C0 7F 00 24 */ lfs f3, 0x24(r31) -/* 801A88B4 C0 9F 00 28 */ lfs f4, 0x28(r31) -/* 801A88B8 C0 BF 00 2C */ lfs f5, 0x2c(r31) -/* 801A88BC C0 DF 00 30 */ lfs f6, 0x30(r31) -/* 801A88C0 48 1B 4D 71 */ bl GXInitLightAttn -/* 801A88C4 38 61 00 0C */ addi r3, r1, 0xc -/* 801A88C8 3C 80 80 3C */ lis r4, lightMaskData@ha /* 0x803BBEAC@ha */ -/* 801A88CC 38 84 BE AC */ addi r4, r4, lightMaskData@l /* 0x803BBEAC@l */ -/* 801A88D0 A0 84 00 00 */ lhz r4, 0(r4) -/* 801A88D4 48 1B 50 11 */ bl GXLoadLightObjImm -/* 801A88D8 83 E1 00 5C */ lwz r31, 0x5c(r1) -/* 801A88DC 80 01 00 64 */ lwz r0, 0x64(r1) -/* 801A88E0 7C 08 03 A6 */ mtlr r0 -/* 801A88E4 38 21 00 60 */ addi r1, r1, 0x60 -/* 801A88E8 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom_common__Fcf.s b/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom_common__Fcf.s index dca6fa76dd..fa9312e6b9 100644 --- a/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom_common__Fcf.s +++ b/asm/d/kankyo/d_kankyo/dKy_setLight_nowroom_common__Fcf.s @@ -459,7 +459,7 @@ lbl_801A68F8: /* 801A6938 88 01 00 0F */ lbz r0, 0xf(r1) /* 801A693C 98 03 00 03 */ stb r0, 3(r3) lbl_801A6940: -/* 801A6940 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A6940 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A6944 7C 00 07 74 */ extsb r0, r0 /* 801A6948 7C 1B 00 00 */ cmpw r27, r0 /* 801A694C 40 82 00 A0 */ bne lbl_801A69EC diff --git a/asm/d/kankyo/d_kankyo/dKy_set_actcol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_actcol_ratio__Ff.s deleted file mode 100644 index ccc45d6529..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_actcol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8A54: -/* 801A8A54 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8A58 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8A5C D0 23 12 18 */ stfs f1, 0x1218(r3) -/* 801A8A60 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_allcol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_allcol_ratio__Ff.s deleted file mode 100644 index 4fcba828d8..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_allcol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8A44: -/* 801A8A44 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8A48 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8A4C D0 23 12 14 */ stfs f1, 0x1214(r3) -/* 801A8A50 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s deleted file mode 100644 index 93c2bd53aa..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8A64: -/* 801A8A64 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8A68 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8A6C D0 23 12 1C */ stfs f1, 0x121c(r3) -/* 801A8A70 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_fogcol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_fogcol_ratio__Ff.s deleted file mode 100644 index 71ee94bb35..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_fogcol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8A74: -/* 801A8A74 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8A78 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8A7C D0 23 12 20 */ stfs f1, 0x1220(r3) -/* 801A8A80 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s deleted file mode 100644 index f576ce9216..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8B58: -/* 801A8B58 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8B5C 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8B60 D0 23 12 48 */ stfs f1, 0x1248(r3) -/* 801A8B64 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_vrboxcol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_vrboxcol_ratio__Ff.s deleted file mode 100644 index a97868fa8a..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_vrboxcol_ratio__Ff.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801A8A84: -/* 801A8A84 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801A8A88 7C 08 02 A6 */ mflr r0 -/* 801A8A8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A8A90 DB E1 00 08 */ stfd f31, 8(r1) -/* 801A8A94 FF E0 08 90 */ fmr f31, f1 -/* 801A8A98 48 00 00 21 */ bl dKy_set_vrboxsoracol_ratio__Ff -/* 801A8A9C FC 20 F8 90 */ fmr f1, f31 -/* 801A8AA0 48 00 00 29 */ bl dKy_set_vrboxkumocol_ratio__Ff -/* 801A8AA4 CB E1 00 08 */ lfd f31, 8(r1) -/* 801A8AA8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801A8AAC 7C 08 03 A6 */ mtlr r0 -/* 801A8AB0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801A8AB4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s deleted file mode 100644 index 1c3739d5be..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8AC8: -/* 801A8AC8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8ACC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8AD0 D0 23 12 28 */ stfs f1, 0x1228(r3) -/* 801A8AD4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s b/asm/d/kankyo/d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s deleted file mode 100644 index 10dc2c1f81..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_801A8AB8: -/* 801A8AB8 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ -/* 801A8ABC 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ -/* 801A8AC0 D0 23 12 24 */ stfs f1, 0x1224(r3) -/* 801A8AC4 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/dKy_tevstr_init__FP12dKy_tevstr_cScUc.s b/asm/d/kankyo/d_kankyo/dKy_tevstr_init__FP12dKy_tevstr_cScUc.s index c0552d5b63..6bbcc45f06 100644 --- a/asm/d/kankyo/d_kankyo/dKy_tevstr_init__FP12dKy_tevstr_cScUc.s +++ b/asm/d/kankyo/d_kankyo/dKy_tevstr_init__FP12dKy_tevstr_cScUc.s @@ -13,7 +13,7 @@ lbl_801A88EC: /* 801A8918 7F A0 07 74 */ extsb r0, r29 /* 801A891C 2C 00 FF FF */ cmpwi r0, -1 /* 801A8920 40 82 00 10 */ bne lbl_801A8930 -/* 801A8924 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A8924 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A8928 98 1F 03 80 */ stb r0, 0x380(r31) /* 801A892C 48 00 00 08 */ b lbl_801A8934 lbl_801A8930: diff --git a/asm/d/kankyo/d_kankyo/dKy_twilight_camelight_set__Fv.s b/asm/d/kankyo/d_kankyo/dKy_twilight_camelight_set__Fv.s index 35cbfc54ad..a1aafb4b78 100644 --- a/asm/d/kankyo/d_kankyo/dKy_twilight_camelight_set__Fv.s +++ b/asm/d/kankyo/d_kankyo/dKy_twilight_camelight_set__Fv.s @@ -18,7 +18,7 @@ lbl_801AAD50: /* 801AAD90 48 1B DC 05 */ bl strcmp /* 801AAD94 2C 03 00 00 */ cmpwi r3, 0 /* 801AAD98 40 82 00 24 */ bne lbl_801AADBC -/* 801AAD9C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801AAD9C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801AADA0 2C 00 00 03 */ cmpwi r0, 3 /* 801AADA4 40 82 00 18 */ bne lbl_801AADBC /* 801AADA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/d/kankyo/d_kankyo/dKy_vrbox_addcol_set__Fsssf.s b/asm/d/kankyo/d_kankyo/dKy_vrbox_addcol_set__Fsssf.s deleted file mode 100644 index 088ede5949..0000000000 --- a/asm/d/kankyo/d_kankyo/dKy_vrbox_addcol_set__Fsssf.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801A8060: -/* 801A8060 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801A8064 7C 08 02 A6 */ mflr r0 -/* 801A8068 90 01 00 24 */ stw r0, 0x24(r1) -/* 801A806C DB E1 00 18 */ stfd f31, 0x18(r1) -/* 801A8070 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A8074 48 1B A1 69 */ bl _savegpr_29 -/* 801A8078 7C 7D 1B 78 */ mr r29, r3 -/* 801A807C 7C 9E 23 78 */ mr r30, r4 -/* 801A8080 7C BF 2B 78 */ mr r31, r5 -/* 801A8084 FF E0 08 90 */ fmr f31, f1 -/* 801A8088 4B FF FE 99 */ bl dKy_vrbox_addcol_sky0_set__Fsssf -/* 801A808C 7F A3 EB 78 */ mr r3, r29 -/* 801A8090 7F C4 F3 78 */ mr r4, r30 -/* 801A8094 7F E5 FB 78 */ mr r5, r31 -/* 801A8098 FC 20 F8 90 */ fmr f1, f31 -/* 801A809C 4B FF FF 25 */ bl dKy_vrbox_addcol_kasumi_set__Fsssf -/* 801A80A0 7F A3 EB 78 */ mr r3, r29 -/* 801A80A4 7F C4 F3 78 */ mr r4, r30 -/* 801A80A8 7F E5 FB 78 */ mr r5, r31 -/* 801A80AC FC 20 F8 90 */ fmr f1, f31 -/* 801A80B0 4B FF FD 39 */ bl dKy_addcol_fog_set__Fsssf -/* 801A80B4 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 801A80B8 39 61 00 18 */ addi r11, r1, 0x18 -/* 801A80BC 48 1B A1 6D */ bl _restgpr_29 -/* 801A80C0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801A80C4 7C 08 03 A6 */ mtlr r0 -/* 801A80C8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801A80CC 4E 80 00 20 */ blr diff --git a/asm/d/kankyo/d_kankyo/envcolor_init__Fv.s b/asm/d/kankyo/d_kankyo/envcolor_init__Fv.s index 75e7395e7f..d88ed4f011 100644 --- a/asm/d/kankyo/d_kankyo/envcolor_init__Fv.s +++ b/asm/d/kankyo/d_kankyo/envcolor_init__Fv.s @@ -156,7 +156,7 @@ lbl_8019EEF0: /* 8019EEF8 38 84 CA 54 */ addi r4, r4, g_env_light@l /* 0x8042CA54@l */ /* 8019EEFC 90 64 00 14 */ stw r3, 0x14(r4) lbl_8019EF00: -/* 8019EF00 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8019EF00 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8019EF04 7C 00 07 74 */ extsb r0, r0 /* 8019EF08 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ /* 8019EF0C 3B C3 CA 54 */ addi r30, r3, g_env_light@l /* 0x8042CA54@l */ @@ -341,7 +341,7 @@ lbl_8019F15C: /* 8019F19C 4B FF F9 05 */ bl undwater_init__Fv /* 8019F1A0 38 60 00 00 */ li r3, 0 /* 8019F1A4 4B E9 08 4D */ bl dComIfGs_PolyDamageOff_Set__FSc -/* 8019F1A8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8019F1A8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8019F1AC 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ /* 8019F1B0 38 63 CA 54 */ addi r3, r3, g_env_light@l /* 0x8042CA54@l */ /* 8019F1B4 98 03 09 8C */ stb r0, 0x98c(r3) diff --git a/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s b/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s index 8cc8e4a64a..d3278bc1c0 100644 --- a/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s +++ b/asm/d/kankyo/d_kankyo/setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c.s @@ -13,7 +13,7 @@ lbl_801A4DA0: /* 801A4DCC 28 00 00 7B */ cmplwi r0, 0x7b /* 801A4DD0 41 82 00 18 */ beq lbl_801A4DE8 /* 801A4DD4 7F A3 EB 78 */ mr r3, r29 -/* 801A4DD8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A4DD8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A4DDC 7C 04 07 74 */ extsb r4, r0 /* 801A4DE0 38 A0 00 FF */ li r5, 0xff /* 801A4DE4 48 00 3B 09 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc diff --git a/asm/d/kankyo/d_kankyo/settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c.s b/asm/d/kankyo/d_kankyo/settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c.s index 0770dacff0..396742f5a1 100644 --- a/asm/d/kankyo/d_kankyo/settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c.s +++ b/asm/d/kankyo/d_kankyo/settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c.s @@ -16,7 +16,7 @@ lbl_801A37C4: /* 801A37FC 88 06 03 80 */ lbz r0, 0x380(r6) /* 801A3800 7C 00 07 75 */ extsb. r0, r0 /* 801A3804 40 80 00 0C */ bge lbl_801A3810 -/* 801A3808 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A3808 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A380C 98 1C 03 80 */ stb r0, 0x380(r28) lbl_801A3810: /* 801A3810 28 1D 00 00 */ cmplwi r29, 0 @@ -59,7 +59,7 @@ lbl_801A3888: /* 801A3898 28 00 00 7C */ cmplwi r0, 0x7c /* 801A389C 41 82 00 18 */ beq lbl_801A38B4 /* 801A38A0 7F 83 E3 78 */ mr r3, r28 -/* 801A38A4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801A38A4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A38A8 7C 04 07 74 */ extsb r4, r0 /* 801A38AC 38 A0 00 FF */ li r5, 0xff /* 801A38B0 48 00 50 3D */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc @@ -508,7 +508,7 @@ lbl_801A3F24: /* 801A3F24 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ /* 801A3F28 38 83 CA 54 */ addi r4, r3, g_env_light@l /* 0x8042CA54@l */ /* 801A3F2C 88 64 09 8C */ lbz r3, 0x98c(r4) -/* 801A3F30 8B 2D 87 E4 */ lbz r25, struct_80450D64+0x0(r13) +/* 801A3F30 8B 2D 87 E4 */ lbz r25, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801A3F34 7F 39 07 74 */ extsb r25, r25 /* 801A3F38 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 801A3F3C 7C 03 00 40 */ cmplw r3, r0 diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_drawHousi__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_drawHousi__FPA4_fPPUc.s index a138a8823d..67b2fb68f9 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_drawHousi__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_drawHousi__FPA4_fPPUc.s @@ -56,7 +56,7 @@ lbl_800665FC: /* 8006660C 48 30 23 89 */ bl strcmp /* 80066610 2C 03 00 00 */ cmpwi r3, 0 /* 80066614 40 82 00 18 */ bne lbl_8006662C -/* 80066618 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80066618 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006661C 7C 00 07 75 */ extsb. r0, r0 /* 80066620 41 82 00 0C */ beq lbl_8006662C /* 80066624 2C 00 00 0B */ cmpwi r0, 0xb diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_drawSibuki__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_drawSibuki__FPA4_fPPUc.s index 55edd7978e..9530404b12 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_drawSibuki__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_drawSibuki__FPA4_fPPUc.s @@ -46,7 +46,7 @@ lbl_800660DC: /* 800660F4 48 30 28 A1 */ bl strcmp /* 800660F8 2C 03 00 00 */ cmpwi r3, 0 /* 800660FC 40 82 00 5C */ bne lbl_80066158 -/* 80066100 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80066100 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80066104 2C 00 00 01 */ cmpwi r0, 1 /* 80066108 40 82 00 50 */ bne lbl_80066158 /* 8006610C C0 7E 00 E0 */ lfs f3, 0xe0(r30) diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_drawSnow__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_drawSnow__FPA4_fPPUc.s index f58c98ede9..9eca9c941e 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_drawSnow__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_drawSnow__FPA4_fPPUc.s @@ -536,7 +536,7 @@ lbl_80067C8C: /* 80067C9C 48 30 0C F9 */ bl strcmp /* 80067CA0 2C 03 00 00 */ cmpwi r3, 0 /* 80067CA4 40 82 00 B8 */ bne lbl_80067D5C -/* 80067CA8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80067CA8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80067CAC 2C 00 00 04 */ cmpwi r0, 4 /* 80067CB0 40 82 00 A0 */ bne lbl_80067D50 /* 80067CB4 C0 41 00 64 */ lfs f2, 0x64(r1) @@ -881,7 +881,7 @@ lbl_800681B4: /* 800681BC 88 0E 0E 90 */ lbz r0, 0xe90(r14) /* 800681C0 28 00 00 00 */ cmplwi r0, 0 /* 800681C4 41 82 00 20 */ beq lbl_800681E4 -/* 800681C8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 800681C8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800681CC 7C 00 07 75 */ extsb. r0, r0 /* 800681D0 40 82 00 14 */ bne lbl_800681E4 /* 800681D4 C0 21 00 6C */ lfs f1, 0x6c(r1) @@ -889,7 +889,7 @@ lbl_800681B4: /* 800681DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800681E0 41 80 00 2C */ blt lbl_8006820C lbl_800681E4: -/* 800681E4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 800681E4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800681E8 7C 00 07 74 */ extsb r0, r0 /* 800681EC 2C 00 00 03 */ cmpwi r0, 3 /* 800681F0 41 82 00 1C */ beq lbl_8006820C @@ -915,7 +915,7 @@ lbl_8006820C: /* 8006823C 38 60 00 01 */ li r3, 1 /* 80068240 38 81 00 0C */ addi r4, r1, 0xc /* 80068244 48 2F 71 39 */ bl GXSetTevColor -/* 80068248 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80068248 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006824C 7C 00 07 75 */ extsb. r0, r0 /* 80068250 40 82 00 0C */ bne lbl_8006825C /* 80068254 C0 22 8B 48 */ lfs f1, lit_9400(r2) diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_drawStar__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_drawStar__FPA4_fPPUc.s index 93617e6e1a..abb8ab39ba 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_drawStar__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_drawStar__FPA4_fPPUc.s @@ -283,7 +283,7 @@ lbl_80068A08: /* 80068A34 48 2F FF 61 */ bl strcmp /* 80068A38 2C 03 00 00 */ cmpwi r3, 0 /* 80068A3C 40 82 00 14 */ bne lbl_80068A50 -/* 80068A40 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80068A40 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80068A44 7C 00 07 75 */ extsb. r0, r0 /* 80068A48 40 82 00 08 */ bne lbl_80068A50 lbl_80068A4C: diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw2__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw2__FPA4_fPPUc.s index 5f3a7b7b97..31ca316976 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw2__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw2__FPA4_fPPUc.s @@ -255,7 +255,7 @@ lbl_8006DDDC: /* 8006DE64 48 2F AB 31 */ bl strcmp /* 8006DE68 2C 03 00 00 */ cmpwi r3, 0 /* 8006DE6C 40 82 00 2C */ bne lbl_8006DE98 -/* 8006DE70 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8006DE70 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006DE74 2C 00 00 01 */ cmpwi r0, 1 /* 8006DE78 40 82 00 20 */ bne lbl_8006DE98 /* 8006DE7C 2C 1A 06 40 */ cmpwi r26, 0x640 @@ -396,7 +396,7 @@ lbl_8006E03C: /* 8006E05C EC 00 07 B2 */ fmuls f0, f0, f30 /* 8006E060 EC 01 00 2A */ fadds f0, f1, f0 /* 8006E064 EF BD 00 32 */ fmuls f29, f29, f0 -/* 8006E068 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8006E068 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006E06C 7C 00 07 75 */ extsb. r0, r0 /* 8006E070 40 82 00 08 */ bne lbl_8006E078 /* 8006E074 C3 A2 89 A4 */ lfs f29, lit_6355(r2) diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw__FPA4_fPPUc.s b/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw__FPA4_fPPUc.s index 6964e91e5e..dafbca84b7 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw__FPA4_fPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_evil_draw__FPA4_fPPUc.s @@ -452,7 +452,7 @@ lbl_8006ED20: /* 8006ED64 80 01 01 2C */ lwz r0, 0x12c(r1) /* 8006ED68 98 01 00 1E */ stb r0, 0x1e(r1) lbl_8006ED6C: -/* 8006ED6C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8006ED6C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006ED70 7C 00 07 75 */ extsb. r0, r0 /* 8006ED74 40 82 00 58 */ bne lbl_8006EDCC /* 8006ED78 C0 7A 00 14 */ lfs f3, 0x14(r26) diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_rain_move__Fv.s b/asm/d/kankyo/d_kankyo_rain/dKyr_rain_move__Fv.s index 22d851730a..699c4d6efa 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_rain_move__Fv.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_rain_move__Fv.s @@ -374,7 +374,7 @@ lbl_8005D614: /* 8005D6D4 48 30 B2 C1 */ bl strcmp /* 8005D6D8 2C 03 00 00 */ cmpwi r3, 0 /* 8005D6DC 40 82 00 20 */ bne lbl_8005D6FC -/* 8005D6E0 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005D6E0 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005D6E4 7C 00 07 75 */ extsb. r0, r0 /* 8005D6E8 41 82 00 0C */ beq lbl_8005D6F4 /* 8005D6EC 2C 00 00 04 */ cmpwi r0, 4 @@ -390,7 +390,7 @@ lbl_8005D6FC: /* 8005D70C 48 30 B2 89 */ bl strcmp /* 8005D710 2C 03 00 00 */ cmpwi r3, 0 /* 8005D714 40 82 00 18 */ bne lbl_8005D72C -/* 8005D718 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005D718 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005D71C 2C 00 00 01 */ cmpwi r0, 1 /* 8005D720 40 82 00 0C */ bne lbl_8005D72C /* 8005D724 3A 80 00 02 */ li r20, 2 @@ -1159,7 +1159,7 @@ lbl_8005E1DC: /* 8005E1F4 48 30 A7 A1 */ bl strcmp /* 8005E1F8 2C 03 00 00 */ cmpwi r3, 0 /* 8005E1FC 40 82 00 58 */ bne lbl_8005E254 -/* 8005E200 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005E200 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005E204 7C 00 07 75 */ extsb. r0, r0 /* 8005E208 40 82 00 2C */ bne lbl_8005E234 /* 8005E20C C0 21 00 BC */ lfs f1, 0xbc(r1) @@ -1525,7 +1525,7 @@ lbl_8005E6EC: /* 8005E6FC 48 30 A2 99 */ bl strcmp /* 8005E700 2C 03 00 00 */ cmpwi r3, 0 /* 8005E704 40 82 00 6C */ bne lbl_8005E770 -/* 8005E708 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005E708 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005E70C 2C 00 00 01 */ cmpwi r0, 1 /* 8005E710 40 82 00 60 */ bne lbl_8005E770 /* 8005E714 C0 61 00 C4 */ lfs f3, 0xc4(r1) @@ -1561,7 +1561,7 @@ lbl_8005E770: /* 8005E780 48 30 A2 15 */ bl strcmp /* 8005E784 2C 03 00 00 */ cmpwi r3, 0 /* 8005E788 40 82 00 8C */ bne lbl_8005E814 -/* 8005E78C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005E78C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005E790 2C 00 00 09 */ cmpwi r0, 9 /* 8005E794 40 82 00 80 */ bne lbl_8005E814 /* 8005E798 C0 41 00 BC */ lfs f2, 0xbc(r1) @@ -1604,7 +1604,7 @@ lbl_8005E814: /* 8005E824 48 30 A1 71 */ bl strcmp /* 8005E828 2C 03 00 00 */ cmpwi r3, 0 /* 8005E82C 40 82 00 30 */ bne lbl_8005E85C -/* 8005E830 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005E830 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005E834 2C 00 00 02 */ cmpwi r0, 2 /* 8005E838 40 82 00 24 */ bne lbl_8005E85C /* 8005E83C C0 21 00 C4 */ lfs f1, 0xc4(r1) diff --git a/asm/d/kankyo/d_kankyo_rain/dKyr_thunder_move__Fv.s b/asm/d/kankyo/d_kankyo_rain/dKyr_thunder_move__Fv.s index f6dfb161ff..6fe24239f3 100644 --- a/asm/d/kankyo/d_kankyo_rain/dKyr_thunder_move__Fv.s +++ b/asm/d/kankyo/d_kankyo_rain/dKyr_thunder_move__Fv.s @@ -29,7 +29,7 @@ lbl_8006B1A8: /* 8006B214 48 2F D7 81 */ bl strcmp /* 8006B218 2C 03 00 00 */ cmpwi r3, 0 /* 8006B21C 40 82 00 14 */ bne lbl_8006B230 -/* 8006B220 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8006B220 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006B224 2C 00 00 04 */ cmpwi r0, 4 /* 8006B228 40 82 00 08 */ bne lbl_8006B230 /* 8006B22C 3B A0 00 02 */ li r29, 2 diff --git a/asm/d/kankyo/d_kankyo_rain/drawVrkumo__FPA4_fR8_GXColorPPUc.s b/asm/d/kankyo/d_kankyo_rain/drawVrkumo__FPA4_fR8_GXColorPPUc.s index 2a39a33f1d..d39e4eb1b1 100644 --- a/asm/d/kankyo/d_kankyo_rain/drawVrkumo__FPA4_fR8_GXColorPPUc.s +++ b/asm/d/kankyo/d_kankyo_rain/drawVrkumo__FPA4_fR8_GXColorPPUc.s @@ -67,7 +67,7 @@ lbl_8006A164: /* 8006A18C 80 17 61 B0 */ lwz r0, 0x61b0(r23) /* 8006A190 28 00 00 00 */ cmplwi r0, 0 /* 8006A194 41 82 00 30 */ beq lbl_8006A1C4 -/* 8006A198 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8006A198 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006A19C 7C 84 07 75 */ extsb. r4, r4 /* 8006A1A0 41 80 00 24 */ blt lbl_8006A1C4 /* 8006A1A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -988,7 +988,7 @@ lbl_8006AEC4: /* 8006AF60 48 2F DA 35 */ bl strcmp /* 8006AF64 2C 03 00 00 */ cmpwi r3, 0 /* 8006AF68 40 82 01 68 */ bne lbl_8006B0D0 -/* 8006AF6C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8006AF6C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8006AF70 7C 00 07 75 */ extsb. r0, r0 /* 8006AF74 40 82 01 5C */ bne lbl_8006B0D0 lbl_8006AF78: diff --git a/asm/d/kankyo/d_kankyo_rain/forward_overhead_bg_chk__FP4cXyzf.s b/asm/d/kankyo/d_kankyo_rain/forward_overhead_bg_chk__FP4cXyzf.s index 854168354b..be56fd74dc 100644 --- a/asm/d/kankyo/d_kankyo_rain/forward_overhead_bg_chk__FP4cXyzf.s +++ b/asm/d/kankyo/d_kankyo_rain/forward_overhead_bg_chk__FP4cXyzf.s @@ -90,7 +90,7 @@ lbl_8005CF78: /* 8005D0D8 48 30 B8 BD */ bl strcmp /* 8005D0DC 2C 03 00 00 */ cmpwi r3, 0 /* 8005D0E0 40 82 00 30 */ bne lbl_8005D110 -/* 8005D0E4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005D0E4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005D0E8 2C 00 00 11 */ cmpwi r0, 0x11 /* 8005D0EC 40 82 00 24 */ bne lbl_8005D110 /* 8005D0F0 38 61 00 20 */ addi r3, r1, 0x20 diff --git a/asm/d/kankyo/d_kankyo_rain/overhead_bg_chk__Fv.s b/asm/d/kankyo/d_kankyo_rain/overhead_bg_chk__Fv.s index 9957cdb398..21a683e627 100644 --- a/asm/d/kankyo/d_kankyo_rain/overhead_bg_chk__Fv.s +++ b/asm/d/kankyo/d_kankyo_rain/overhead_bg_chk__Fv.s @@ -65,7 +65,7 @@ lbl_8005CDD0: /* 8005CECC 48 30 BA C9 */ bl strcmp /* 8005CED0 2C 03 00 00 */ cmpwi r3, 0 /* 8005CED4 40 82 00 30 */ bne lbl_8005CF04 -/* 8005CED8 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005CED8 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005CEDC 2C 00 00 11 */ cmpwi r0, 0x11 /* 8005CEE0 40 82 00 24 */ bne lbl_8005CF04 /* 8005CEE4 38 61 00 14 */ addi r3, r1, 0x14 diff --git a/asm/d/kankyo/d_kankyo_rain/vrkumo_move__Fv.s b/asm/d/kankyo/d_kankyo_rain/vrkumo_move__Fv.s index 2388581707..7dda93a8ed 100644 --- a/asm/d/kankyo/d_kankyo_rain/vrkumo_move__Fv.s +++ b/asm/d/kankyo/d_kankyo_rain/vrkumo_move__Fv.s @@ -99,7 +99,7 @@ lbl_800621D0: /* 80062224 41 82 00 50 */ beq lbl_80062274 /* 80062228 C2 82 87 B8 */ lfs f20, lit_3954(r2) /* 8006222C 38 60 00 00 */ li r3, 0 -/* 80062230 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 80062230 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80062234 7C 84 07 75 */ extsb. r4, r4 /* 80062238 41 80 00 1C */ blt lbl_80062254 /* 8006223C 38 78 4E C4 */ addi r3, r24, 0x4ec4 diff --git a/asm/d/kankyo/d_kankyo_wether/dKyw_wind_set__Fv.s b/asm/d/kankyo/d_kankyo_wether/dKyw_wind_set__Fv.s index f2da66c579..9904336f9e 100644 --- a/asm/d/kankyo/d_kankyo_wether/dKyw_wind_set__Fv.s +++ b/asm/d/kankyo/d_kankyo_wether/dKyw_wind_set__Fv.s @@ -100,7 +100,7 @@ lbl_8005A718: lbl_8005A724: /* 8005A724 3B 60 00 00 */ li r27, 0 /* 8005A728 3B 40 00 00 */ li r26, 0 -/* 8005A72C 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8005A72C 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A730 7C 84 07 75 */ extsb. r4, r4 /* 8005A734 41 80 00 28 */ blt lbl_8005A75C /* 8005A738 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -120,7 +120,7 @@ lbl_8005A75C: /* 8005A76C 80 1B 00 00 */ lwz r0, 0(r27) /* 8005A770 54 1C 8F 7E */ rlwinm r28, r0, 0x11, 0x1d, 0x1f lbl_8005A774: -/* 8005A774 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8005A774 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A778 7C 84 07 74 */ extsb r4, r4 /* 8005A77C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8005A780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -129,7 +129,7 @@ lbl_8005A774: /* 8005A78C 4B FC 9B F9 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A790 28 03 00 00 */ cmplwi r3, 0 /* 8005A794 41 82 00 58 */ beq lbl_8005A7EC -/* 8005A798 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8005A798 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A79C 7C 84 07 74 */ extsb r4, r4 /* 8005A7A0 7F E3 FB 78 */ mr r3, r31 /* 8005A7A4 4B FC 9B E1 */ bl getStatusRoomDt__20dStage_roomControl_cFi @@ -207,13 +207,13 @@ lbl_8005A864: /* 8005A8A4 80 1B 00 00 */ lwz r0, 0(r27) /* 8005A8A8 54 1A 77 BE */ rlwinm r26, r0, 0xe, 0x1e, 0x1f lbl_8005A8AC: -/* 8005A8AC 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8005A8AC 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A8B0 7C 84 07 74 */ extsb r4, r4 /* 8005A8B4 7F E3 FB 78 */ mr r3, r31 /* 8005A8B8 4B FC 9A CD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A8BC 28 03 00 00 */ cmplwi r3, 0 /* 8005A8C0 41 82 00 44 */ beq lbl_8005A904 -/* 8005A8C4 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8005A8C4 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A8C8 7C 84 07 74 */ extsb r4, r4 /* 8005A8CC 7F E3 FB 78 */ mr r3, r31 /* 8005A8D0 4B FC 9A B5 */ bl getStatusRoomDt__20dStage_roomControl_cFi @@ -273,7 +273,7 @@ lbl_8005A96C: /* 8005A984 48 30 E0 11 */ bl strcmp /* 8005A988 2C 03 00 00 */ cmpwi r3, 0 /* 8005A98C 40 82 00 88 */ bne lbl_8005AA14 -/* 8005A990 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8005A990 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A994 7C 00 07 75 */ extsb. r0, r0 /* 8005A998 41 82 00 1C */ beq lbl_8005A9B4 /* 8005A99C 2C 00 00 03 */ cmpwi r0, 3 @@ -302,7 +302,7 @@ lbl_8005A9E8: /* 8005A9F0 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ /* 8005A9F4 98 03 01 60 */ stb r0, 0x160(r3) lbl_8005A9F8: -/* 8005A9F8 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) +/* 8005A9F8 88 6D 87 E4 */ lbz r3, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8005A9FC 7C 63 07 74 */ extsb r3, r3 /* 8005AA00 4B FD 26 6D */ bl dComIfGp_getReverb__Fi /* 8005AA04 7C 64 1B 78 */ mr r4, r3 diff --git a/asm/d/kankyo/d_kankyo_wether/wether_move_vrkumo__Fv.s b/asm/d/kankyo/d_kankyo_wether/wether_move_vrkumo__Fv.s index 4ffb2c6f0d..c51df9ed93 100644 --- a/asm/d/kankyo/d_kankyo_wether/wether_move_vrkumo__Fv.s +++ b/asm/d/kankyo/d_kankyo_wether/wether_move_vrkumo__Fv.s @@ -213,7 +213,7 @@ lbl_80059A20: /* 80059A3C 28 03 00 00 */ cmplwi r3, 0 /* 80059A40 41 82 00 30 */ beq lbl_80059A70 /* 80059A44 80 03 00 00 */ lwz r0, 0(r3) -/* 80059A48 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 80059A48 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80059A4C 7C 84 07 74 */ extsb r4, r4 /* 80059A50 7C 00 20 00 */ cmpw r0, r4 /* 80059A54 40 81 00 1C */ ble lbl_80059A70 diff --git a/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s b/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s index 46853e8c84..230f1175b4 100644 --- a/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s +++ b/asm/d/map/d_map_path_dmap/drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib.s @@ -7,7 +7,7 @@ lbl_80040838: /* 8004084C 7C 9D 23 78 */ mr r29, r4 /* 80040850 7C BE 2B 78 */ mr r30, r5 /* 80040854 7C FF 3B 78 */ mr r31, r7 -/* 80040858 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80040858 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8004085C 7C 00 07 74 */ extsb r0, r0 /* 80040860 7C 1E 00 00 */ cmpw r30, r0 /* 80040864 41 82 00 0C */ beq lbl_80040870 diff --git a/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s index 18372893d0..93c09b1965 100644 --- a/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s +++ b/asm/d/map/d_map_path_dmap/getMapPlayerAngleY__10dMapInfo_nFv.s @@ -1,5 +1,5 @@ lbl_8003EF20: -/* 8003EF20 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8003EF20 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8003EF24 7C 00 07 74 */ extsb r0, r0 /* 8003EF28 38 60 00 00 */ li r3, 0 /* 8003EF2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s b/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s index 54a49654b0..c03c664b50 100644 --- a/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s +++ b/asm/d/map/d_map_path_dmap/getMapPlayerPos__10dMapInfo_nFv.s @@ -23,7 +23,7 @@ lbl_8003EEA4: /* 8003EEAC D0 01 00 0C */ stfs f0, 0xc(r1) /* 8003EEB0 D0 01 00 10 */ stfs f0, 0x10(r1) lbl_8003EEB4: -/* 8003EEB4 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8003EEB4 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8003EEB8 7C 00 07 74 */ extsb r0, r0 /* 8003EEBC 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ /* 8003EEC0 38 63 60 94 */ addi r3, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ diff --git a/asm/d/menu/d_menu_dmap_map/_create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv.s b/asm/d/menu/d_menu_dmap_map/_create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv.s index d1b075862e..02aefa8668 100644 --- a/asm/d/menu/d_menu_dmap_map/_create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv.s +++ b/asm/d/menu/d_menu_dmap_map/_create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv.s @@ -10,7 +10,7 @@ lbl_801C235C: /* 801C237C 7C DD 33 78 */ mr r29, r6 /* 801C2380 7C FE 3B 78 */ mr r30, r7 /* 801C2384 7D 3F 4B 78 */ mr r31, r9 -/* 801C2388 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801C2388 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801C238C 98 03 00 E6 */ stb r0, 0xe6(r3) /* 801C2390 99 03 00 E7 */ stb r8, 0xe7(r3) /* 801C2394 88 03 00 E7 */ lbz r0, 0xe7(r3) diff --git a/asm/d/menu/d_menu_dmap_map/getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s b/asm/d/menu/d_menu_dmap_map/getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s index af6d395407..8f8befb10b 100644 --- a/asm/d/menu/d_menu_dmap_map/getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s +++ b/asm/d/menu/d_menu_dmap_map/getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc.s @@ -21,7 +21,7 @@ lbl_801C102C: /* 801C1040 C0 04 00 0C */ lfs f0, 0xc(r4) /* 801C1044 D0 01 00 10 */ stfs f0, 0x10(r1) /* 801C1048 38 7A 00 04 */ addi r3, r26, 4 -/* 801C104C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801C104C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801C1050 7C 05 07 74 */ extsb r5, r0 /* 801C1054 88 DA 00 F7 */ lbz r6, 0xf7(r26) /* 801C1058 7C C6 07 74 */ extsb r6, r6 diff --git a/asm/d/menu/d_menu_dmap_map/setPos__15dMenu_DmapMap_cFiifffbf.s b/asm/d/menu/d_menu_dmap_map/setPos__15dMenu_DmapMap_cFiifffbf.s index b493ab3de4..c9b53293e3 100644 --- a/asm/d/menu/d_menu_dmap_map/setPos__15dMenu_DmapMap_cFiifffbf.s +++ b/asm/d/menu/d_menu_dmap_map/setPos__15dMenu_DmapMap_cFiifffbf.s @@ -13,13 +13,13 @@ lbl_801C0E4C: /* 801C0E78 FF A0 10 90 */ fmr f29, f2 /* 801C0E7C FF C0 18 90 */ fmr f30, f3 /* 801C0E80 FF E0 20 90 */ fmr f31, f4 -/* 801C0E84 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801C0E84 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801C0E88 7C 04 07 74 */ extsb r4, r0 /* 801C0E8C D3 E3 00 38 */ stfs f31, 0x38(r3) /* 801C0E90 38 7E 00 04 */ addi r3, r30, 4 /* 801C0E94 7C C5 07 74 */ extsb r5, r6 /* 801C0E98 4B E7 EE 71 */ bl entry__16renderingDAmap_cFfffiSc -/* 801C0E9C 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801C0E9C 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801C0EA0 7C 04 07 74 */ extsb r4, r0 /* 801C0EA4 D3 FE 00 70 */ stfs f31, 0x70(r30) /* 801C0EA8 38 7E 00 3C */ addi r3, r30, 0x3c diff --git a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s b/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s index 256ef89804..991b6fd7e4 100644 --- a/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s +++ b/asm/d/menu/d_menu_fmap/drawIcon__12dMenu_Fmap_cFUci.s @@ -10,7 +10,7 @@ lbl_801CD10C: /* 801CD12C 3C 80 80 3A */ lis r4, __vt__19dMenuFmapIconDisp_c@ha /* 0x803A7D74@ha */ /* 801CD130 38 04 7D 74 */ addi r0, r4, __vt__19dMenuFmapIconDisp_c@l /* 0x803A7D74@l */ /* 801CD134 90 01 00 4C */ stw r0, 0x4c(r1) -/* 801CD138 8B AD 87 E4 */ lbz r29, struct_80450D64+0x0(r13) +/* 801CD138 8B AD 87 E4 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801CD13C 7F BD 07 74 */ extsb r29, r29 /* 801CD140 83 C3 02 0C */ lwz r30, 0x20c(r3) /* 801CD144 48 00 02 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv diff --git a/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s b/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s index c3c5d0f0f2..9e2f005467 100644 --- a/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s +++ b/asm/d/menu/d_menu_fmap/searchIcon__12dMenu_Fmap_cFUciPfPf.s @@ -13,7 +13,7 @@ lbl_801CD000: /* 801CD02C 38 04 7D 74 */ addi r0, r4, __vt__19dMenuFmapIconDisp_c@l /* 0x803A7D74@l */ /* 801CD030 90 01 00 48 */ stw r0, 0x48(r1) /* 801CD034 3B 00 00 00 */ li r24, 0 -/* 801CD038 8B 2D 87 E4 */ lbz r25, struct_80450D64+0x0(r13) +/* 801CD038 8B 2D 87 E4 */ lbz r25, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801CD03C 7F 39 07 74 */ extsb r25, r25 /* 801CD040 83 43 02 0C */ lwz r26, 0x20c(r3) /* 801CD044 48 00 03 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv diff --git a/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s b/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s index 25e27b17e1..966ec795fb 100644 --- a/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s +++ b/asm/d/menu/d_menu_fmap/table_demo1_init__12dMenu_Fmap_cFv.s @@ -34,7 +34,7 @@ lbl_801CA8E0: /* 801CA8F0 80 A3 00 44 */ lwz r5, 0x44(r3) /* 801CA8F4 28 05 00 00 */ cmplwi r5, 0 /* 801CA8F8 41 82 00 94 */ beq lbl_801CA98C -/* 801CA8FC 89 0D 87 E4 */ lbz r8, struct_80450D64+0x0(r13) +/* 801CA8FC 89 0D 87 E4 */ lbz r8, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801CA900 7D 08 07 74 */ extsb r8, r8 /* 801CA904 38 61 00 18 */ addi r3, r1, 0x18 /* 801CA908 38 C0 00 05 */ li r6, 5 diff --git a/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s b/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s index 06c1817247..65f5f553de 100644 --- a/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s +++ b/asm/d/menu/d_menu_fmap_map/isDrawRoom__15renderingFmap_cFv.s @@ -16,7 +16,7 @@ lbl_801CE4DC: /* 801CE514 7C 03 00 00 */ cmpw r3, r0 /* 801CE518 40 82 00 18 */ bne lbl_801CE530 /* 801CE51C 80 7E 00 9C */ lwz r3, 0x9c(r30) -/* 801CE520 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 801CE520 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 801CE524 7C 00 07 74 */ extsb r0, r0 /* 801CE528 7C 03 00 00 */ cmpw r3, r0 /* 801CE52C 41 82 00 14 */ beq lbl_801CE540 diff --git a/asm/d/menu/d_menu_save/IPLSelect2Disp__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/IPLSelect2Disp__12dMenu_save_cFv.s deleted file mode 100644 index b67056d473..0000000000 --- a/asm/d/menu/d_menu_save/IPLSelect2Disp__12dMenu_save_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801F1E58: -/* 801F1E58 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F1E5C 7C 08 02 A6 */ mflr r0 -/* 801F1E60 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F1E64 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1E68 48 17 03 75 */ bl _savegpr_29 -/* 801F1E6C 7C 7D 1B 78 */ mr r29, r3 -/* 801F1E70 48 00 33 21 */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F1E74 7C 7E 1B 78 */ mr r30, r3 -/* 801F1E78 7F A3 EB 78 */ mr r3, r29 -/* 801F1E7C 38 80 00 01 */ li r4, 1 -/* 801F1E80 48 00 3C 65 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc -/* 801F1E84 7C 7F 1B 78 */ mr r31, r3 -/* 801F1E88 7F A3 EB 78 */ mr r3, r29 -/* 801F1E8C 88 9D 01 B7 */ lbz r4, 0x1b7(r29) -/* 801F1E90 48 00 47 C5 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc -/* 801F1E94 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F1E98 28 00 00 01 */ cmplwi r0, 1 -/* 801F1E9C 40 82 00 2C */ bne lbl_801F1EC8 -/* 801F1EA0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F1EA4 28 00 00 01 */ cmplwi r0, 1 -/* 801F1EA8 40 82 00 20 */ bne lbl_801F1EC8 -/* 801F1EAC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F1EB0 28 00 00 01 */ cmplwi r0, 1 -/* 801F1EB4 40 82 00 14 */ bne lbl_801F1EC8 -/* 801F1EB8 7F A3 EB 78 */ mr r3, r29 -/* 801F1EBC 48 00 3E C9 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F1EC0 38 00 00 0E */ li r0, 0xe -/* 801F1EC4 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F1EC8: -/* 801F1EC8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1ECC 48 17 03 5D */ bl _restgpr_29 -/* 801F1ED0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F1ED4 7C 08 03 A6 */ mtlr r0 -/* 801F1ED8 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F1EDC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/IPLSelectDisp2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/IPLSelectDisp2__12dMenu_save_cFv.s deleted file mode 100644 index cb372d7bdb..0000000000 --- a/asm/d/menu/d_menu_save/IPLSelectDisp2__12dMenu_save_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801F1D54: -/* 801F1D54 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F1D58 7C 08 02 A6 */ mflr r0 -/* 801F1D5C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F1D60 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1D64 48 17 04 79 */ bl _savegpr_29 -/* 801F1D68 7C 7D 1B 78 */ mr r29, r3 -/* 801F1D6C 48 00 34 25 */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F1D70 7C 7E 1B 78 */ mr r30, r3 -/* 801F1D74 7F A3 EB 78 */ mr r3, r29 -/* 801F1D78 48 00 3B 51 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F1D7C 7C 7F 1B 78 */ mr r31, r3 -/* 801F1D80 7F A3 EB 78 */ mr r3, r29 -/* 801F1D84 48 00 44 F5 */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F1D88 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F1D8C 28 00 00 01 */ cmplwi r0, 1 -/* 801F1D90 40 82 00 2C */ bne lbl_801F1DBC -/* 801F1D94 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F1D98 28 00 00 01 */ cmplwi r0, 1 -/* 801F1D9C 40 82 00 20 */ bne lbl_801F1DBC -/* 801F1DA0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F1DA4 28 00 00 01 */ cmplwi r0, 1 -/* 801F1DA8 40 82 00 14 */ bne lbl_801F1DBC -/* 801F1DAC 7F A3 EB 78 */ mr r3, r29 -/* 801F1DB0 48 00 3F D5 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F1DB4 38 00 00 0C */ li r0, 0xc -/* 801F1DB8 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F1DBC: -/* 801F1DBC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F1DC0 48 17 04 69 */ bl _restgpr_29 -/* 801F1DC4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F1DC8 7C 08 03 A6 */ mtlr r0 -/* 801F1DCC 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F1DD0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/backSaveQuestion2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/backSaveQuestion2__12dMenu_save_cFv.s deleted file mode 100644 index 988dc47ffc..0000000000 --- a/asm/d/menu/d_menu_save/backSaveQuestion2__12dMenu_save_cFv.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_801F1A48: -/* 801F1A48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1A4C 7C 08 02 A6 */ mflr r0 -/* 801F1A50 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1A54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1A58 7C 7F 1B 78 */ mr r31, r3 -/* 801F1A5C 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F1A60 28 04 00 00 */ cmplwi r4, 0 -/* 801F1A64 41 82 00 10 */ beq lbl_801F1A74 -/* 801F1A68 38 04 FF FF */ addi r0, r4, -1 -/* 801F1A6C 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F1A70 48 00 00 B4 */ b lbl_801F1B24 -lbl_801F1A74: -/* 801F1A74 88 1F 01 BC */ lbz r0, 0x1bc(r31) -/* 801F1A78 28 00 00 04 */ cmplwi r0, 4 -/* 801F1A7C 40 82 00 38 */ bne lbl_801F1AB4 -/* 801F1A80 88 1F 21 A2 */ lbz r0, 0x21a2(r31) -/* 801F1A84 28 00 00 01 */ cmplwi r0, 1 -/* 801F1A88 40 82 00 24 */ bne lbl_801F1AAC -/* 801F1A8C 38 00 00 00 */ li r0, 0 -/* 801F1A90 98 1F 21 90 */ stb r0, 0x2190(r31) -/* 801F1A94 38 00 00 01 */ li r0, 1 -/* 801F1A98 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F1A9C 38 80 04 E4 */ li r4, 0x4e4 -/* 801F1AA0 38 A0 00 01 */ li r5, 1 -/* 801F1AA4 48 00 1A 19 */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F1AA8 48 00 00 10 */ b lbl_801F1AB8 -lbl_801F1AAC: -/* 801F1AAC 4B FF FE FD */ bl backSaveQuestionInitSet__12dMenu_save_cFv -/* 801F1AB0 48 00 00 08 */ b lbl_801F1AB8 -lbl_801F1AB4: -/* 801F1AB4 4B FF FE F5 */ bl backSaveQuestionInitSet__12dMenu_save_cFv -lbl_801F1AB8: -/* 801F1AB8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F1ABC 80 63 00 04 */ lwz r3, 4(r3) -/* 801F1AC0 28 03 00 00 */ cmplwi r3, 0 -/* 801F1AC4 41 82 00 18 */ beq lbl_801F1ADC -/* 801F1AC8 38 80 00 01 */ li r4, 1 -/* 801F1ACC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F1AD0 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F1AD4 7D 89 03 A6 */ mtctr r12 -/* 801F1AD8 4E 80 04 21 */ bctrl -lbl_801F1ADC: -/* 801F1ADC 38 60 00 00 */ li r3, 0 -/* 801F1AE0 98 7F 21 A0 */ stb r3, 0x21a0(r31) -/* 801F1AE4 98 7F 01 C0 */ stb r3, 0x1c0(r31) -/* 801F1AE8 38 00 00 01 */ li r0, 1 -/* 801F1AEC 98 1F 01 BF */ stb r0, 0x1bf(r31) -/* 801F1AF0 98 7F 01 B0 */ stb r3, 0x1b0(r31) -/* 801F1AF4 88 1F 01 BC */ lbz r0, 0x1bc(r31) -/* 801F1AF8 28 00 00 04 */ cmplwi r0, 4 -/* 801F1AFC 40 82 00 24 */ bne lbl_801F1B20 -/* 801F1B00 88 1F 21 A2 */ lbz r0, 0x21a2(r31) -/* 801F1B04 28 00 00 01 */ cmplwi r0, 1 -/* 801F1B08 40 82 00 10 */ bne lbl_801F1B18 -/* 801F1B0C 38 00 00 05 */ li r0, 5 -/* 801F1B10 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F1B14 48 00 00 10 */ b lbl_801F1B24 -lbl_801F1B18: -/* 801F1B18 98 7F 01 B2 */ stb r3, 0x1b2(r31) -/* 801F1B1C 48 00 00 08 */ b lbl_801F1B24 -lbl_801F1B20: -/* 801F1B20 98 7F 01 B2 */ stb r3, 0x1b2(r31) -lbl_801F1B24: -/* 801F1B24 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1B28 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1B2C 7C 08 03 A6 */ mtlr r0 -/* 801F1B30 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1B34 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/backSaveQuestionInitSet__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/backSaveQuestionInitSet__12dMenu_save_cFv.s deleted file mode 100644 index 297b817ce9..0000000000 --- a/asm/d/menu/d_menu_save/backSaveQuestionInitSet__12dMenu_save_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801F19A8: -/* 801F19A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F19AC 7C 08 02 A6 */ mflr r0 -/* 801F19B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F19B4 38 00 00 01 */ li r0, 1 -/* 801F19B8 98 03 21 90 */ stb r0, 0x2190(r3) -/* 801F19BC 98 03 01 B6 */ stb r0, 0x1b6(r3) -/* 801F19C0 38 80 03 CE */ li r4, 0x3ce -/* 801F19C4 38 A0 00 01 */ li r5, 1 -/* 801F19C8 48 00 1A F5 */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F19CC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F19D0 7C 08 03 A6 */ mtlr r0 -/* 801F19D4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F19D8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/backSaveQuestion__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/backSaveQuestion__12dMenu_save_cFv.s deleted file mode 100644 index 29ee6663ef..0000000000 --- a/asm/d/menu/d_menu_save/backSaveQuestion__12dMenu_save_cFv.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_801F19DC: -/* 801F19DC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F19E0 7C 08 02 A6 */ mflr r0 -/* 801F19E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F19E8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F19EC 7C 7F 1B 78 */ mr r31, r3 -/* 801F19F0 3C 60 80 43 */ lis r3, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F19F4 38 63 E8 4C */ addi r3, r3, g_msHIO@l /* 0x8042E84C@l */ -/* 801F19F8 88 03 00 0B */ lbz r0, 0xb(r3) -/* 801F19FC 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F1A00 88 9F 01 BD */ lbz r4, 0x1bd(r31) -/* 801F1A04 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F1A08 80 63 00 04 */ lwz r3, 4(r3) -/* 801F1A0C 28 03 00 00 */ cmplwi r3, 0 -/* 801F1A10 41 82 00 14 */ beq lbl_801F1A24 -/* 801F1A14 81 83 00 00 */ lwz r12, 0(r3) -/* 801F1A18 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801F1A1C 7D 89 03 A6 */ mtctr r12 -/* 801F1A20 4E 80 04 21 */ bctrl -lbl_801F1A24: -/* 801F1A24 38 00 00 01 */ li r0, 1 -/* 801F1A28 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F1A2C 38 00 00 08 */ li r0, 8 -/* 801F1A30 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F1A34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1A38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1A3C 7C 08 03 A6 */ mtlr r0 -/* 801F1A40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1A44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/cardFormatNoSelDisp__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/cardFormatNoSelDisp__12dMenu_save_cFv.s deleted file mode 100644 index 6fd7e2805f..0000000000 --- a/asm/d/menu/d_menu_save/cardFormatNoSelDisp__12dMenu_save_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801F2134: -/* 801F2134 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2138 7C 08 02 A6 */ mflr r0 -/* 801F213C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2140 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2144 93 C1 00 08 */ stw r30, 8(r1) -/* 801F2148 7C 7E 1B 78 */ mr r30, r3 -/* 801F214C 48 00 30 45 */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F2150 7C 7F 1B 78 */ mr r31, r3 -/* 801F2154 7F C3 F3 78 */ mr r3, r30 -/* 801F2158 48 00 37 71 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F215C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F2160 28 00 00 01 */ cmplwi r0, 1 -/* 801F2164 40 82 00 20 */ bne lbl_801F2184 -/* 801F2168 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F216C 28 00 00 01 */ cmplwi r0, 1 -/* 801F2170 40 82 00 14 */ bne lbl_801F2184 -/* 801F2174 38 00 00 09 */ li r0, 9 -/* 801F2178 98 1E 01 B2 */ stb r0, 0x1b2(r30) -/* 801F217C 38 00 00 3D */ li r0, 0x3d -/* 801F2180 98 1E 01 B5 */ stb r0, 0x1b5(r30) -lbl_801F2184: -/* 801F2184 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2188 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F218C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2190 7C 08 03 A6 */ mtlr r0 -/* 801F2194 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2198 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/cardFormatYesSel2Disp__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/cardFormatYesSel2Disp__12dMenu_save_cFv.s deleted file mode 100644 index 1bbe3cdcf0..0000000000 --- a/asm/d/menu/d_menu_save/cardFormatYesSel2Disp__12dMenu_save_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_801F2250: -/* 801F2250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2254 7C 08 02 A6 */ mflr r0 -/* 801F2258 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F225C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2260 93 C1 00 08 */ stw r30, 8(r1) -/* 801F2264 7C 7E 1B 78 */ mr r30, r3 -/* 801F2268 48 00 2F 29 */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F226C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2270 7F C3 F3 78 */ mr r3, r30 -/* 801F2274 48 00 36 55 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F2278 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F227C 28 00 00 01 */ cmplwi r0, 1 -/* 801F2280 40 82 00 34 */ bne lbl_801F22B4 -/* 801F2284 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F2288 28 00 00 01 */ cmplwi r0, 1 -/* 801F228C 40 82 00 28 */ bne lbl_801F22B4 -/* 801F2290 3C 60 80 43 */ lis r3, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F2294 38 63 E8 4C */ addi r3, r3, g_msHIO@l /* 0x8042E84C@l */ -/* 801F2298 88 03 00 06 */ lbz r0, 6(r3) -/* 801F229C 98 1E 01 BD */ stb r0, 0x1bd(r30) -/* 801F22A0 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 801F22A4 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 801F22A8 4B E2 4B B1 */ bl command_format__15mDoMemCd_Ctrl_cFv -/* 801F22AC 38 00 00 15 */ li r0, 0x15 -/* 801F22B0 98 1E 01 B2 */ stb r0, 0x1b2(r30) -lbl_801F22B4: -/* 801F22B4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F22B8 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F22BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F22C0 7C 08 03 A6 */ mtlr r0 -/* 801F22C4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F22C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/cardFormatYesSelDisp__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/cardFormatYesSelDisp__12dMenu_save_cFv.s deleted file mode 100644 index 5b72f3c2a3..0000000000 --- a/asm/d/menu/d_menu_save/cardFormatYesSelDisp__12dMenu_save_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801F20AC: -/* 801F20AC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F20B0 7C 08 02 A6 */ mflr r0 -/* 801F20B4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F20B8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F20BC 48 17 01 21 */ bl _savegpr_29 -/* 801F20C0 7C 7D 1B 78 */ mr r29, r3 -/* 801F20C4 48 00 30 CD */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F20C8 7C 7E 1B 78 */ mr r30, r3 -/* 801F20CC 7F A3 EB 78 */ mr r3, r29 -/* 801F20D0 38 80 00 01 */ li r4, 1 -/* 801F20D4 48 00 3A 11 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc -/* 801F20D8 7C 7F 1B 78 */ mr r31, r3 -/* 801F20DC 7F A3 EB 78 */ mr r3, r29 -/* 801F20E0 88 9D 01 B7 */ lbz r4, 0x1b7(r29) -/* 801F20E4 48 00 45 71 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc -/* 801F20E8 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F20EC 28 00 00 01 */ cmplwi r0, 1 -/* 801F20F0 40 82 00 2C */ bne lbl_801F211C -/* 801F20F4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F20F8 28 00 00 01 */ cmplwi r0, 1 -/* 801F20FC 40 82 00 20 */ bne lbl_801F211C -/* 801F2100 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F2104 28 00 00 01 */ cmplwi r0, 1 -/* 801F2108 40 82 00 14 */ bne lbl_801F211C -/* 801F210C 7F A3 EB 78 */ mr r3, r29 -/* 801F2110 48 00 3C 75 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F2114 38 00 00 13 */ li r0, 0x13 -/* 801F2118 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F211C: -/* 801F211C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2120 48 17 01 09 */ bl _restgpr_29 -/* 801F2124 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F2128 7C 08 03 A6 */ mtlr r0 -/* 801F212C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F2130 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/endingDataCheck__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/endingDataCheck__12dMenu_save_cFv.s deleted file mode 100644 index ded4d48238..0000000000 --- a/asm/d/menu/d_menu_save/endingDataCheck__12dMenu_save_cFv.s +++ /dev/null @@ -1,6 +0,0 @@ -lbl_801F2F38: -/* 801F2F38 38 00 00 29 */ li r0, 0x29 -/* 801F2F3C 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F2F40 38 00 00 03 */ li r0, 3 -/* 801F2F44 98 03 01 BA */ stb r0, 0x1ba(r3) -/* 801F2F48 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/endingNoSave2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/endingNoSave2__12dMenu_save_cFv.s deleted file mode 100644 index 28e5b89d5a..0000000000 --- a/asm/d/menu/d_menu_save/endingNoSave2__12dMenu_save_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_801F2F08: -/* 801F2F08 80 83 21 8C */ lwz r4, 0x218c(r3) -/* 801F2F0C 28 04 00 00 */ cmplwi r4, 0 -/* 801F2F10 41 82 00 18 */ beq lbl_801F2F28 -/* 801F2F14 88 04 00 60 */ lbz r0, 0x60(r4) -/* 801F2F18 28 00 00 00 */ cmplwi r0, 0 -/* 801F2F1C 40 82 00 0C */ bne lbl_801F2F28 -/* 801F2F20 38 00 00 00 */ li r0, 0 -/* 801F2F24 98 03 21 90 */ stb r0, 0x2190(r3) -lbl_801F2F28: -/* 801F2F28 38 00 00 00 */ li r0, 0 -/* 801F2F2C 98 03 01 B6 */ stb r0, 0x1b6(r3) -/* 801F2F30 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F2F34 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/endingNoSave__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/endingNoSave__12dMenu_save_cFv.s deleted file mode 100644 index c288699ca4..0000000000 --- a/asm/d/menu/d_menu_save/endingNoSave__12dMenu_save_cFv.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801F2E88: -/* 801F2E88 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2E8C 7C 08 02 A6 */ mflr r0 -/* 801F2E90 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2E94 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2E98 7C 7F 1B 78 */ mr r31, r3 -/* 801F2E9C 48 00 03 F1 */ bl YesNoSelect__12dMenu_save_cFv -/* 801F2EA0 2C 03 00 00 */ cmpwi r3, 0 -/* 801F2EA4 41 82 00 50 */ beq lbl_801F2EF4 -/* 801F2EA8 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F2EAC 28 00 00 00 */ cmplwi r0, 0 -/* 801F2EB0 41 82 00 20 */ beq lbl_801F2ED0 -/* 801F2EB4 38 00 00 00 */ li r0, 0 -/* 801F2EB8 98 1F 01 BB */ stb r0, 0x1bb(r31) -/* 801F2EBC 38 00 00 29 */ li r0, 0x29 -/* 801F2EC0 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2EC4 38 00 00 03 */ li r0, 3 -/* 801F2EC8 98 1F 01 BA */ stb r0, 0x1ba(r31) -/* 801F2ECC 48 00 00 28 */ b lbl_801F2EF4 -lbl_801F2ED0: -/* 801F2ED0 38 00 00 01 */ li r0, 1 -/* 801F2ED4 98 1F 21 90 */ stb r0, 0x2190(r31) -/* 801F2ED8 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F2EDC 7F E3 FB 78 */ mr r3, r31 -/* 801F2EE0 38 80 03 CF */ li r4, 0x3cf -/* 801F2EE4 38 A0 00 00 */ li r5, 0 -/* 801F2EE8 48 00 05 D5 */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F2EEC 38 00 00 27 */ li r0, 0x27 -/* 801F2EF0 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F2EF4: -/* 801F2EF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2EF8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2EFC 7C 08 03 A6 */ mtlr r0 -/* 801F2F00 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2F04 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/errYesNoCursorMoveAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/errYesNoCursorMoveAnm__12dMenu_save_cFv.s deleted file mode 100644 index 30a5954362..0000000000 --- a/asm/d/menu/d_menu_save/errYesNoCursorMoveAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801F5054: -/* 801F5054 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F5058 7C 08 02 A6 */ mflr r0 -/* 801F505C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F5060 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F5064 93 C1 00 08 */ stw r30, 8(r1) -/* 801F5068 7C 7E 1B 78 */ mr r30, r3 -/* 801F506C 88 83 21 95 */ lbz r4, 0x2195(r3) -/* 801F5070 48 00 0A 75 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc -/* 801F5074 7C 7F 1B 78 */ mr r31, r3 -/* 801F5078 7F C3 F3 78 */ mr r3, r30 -/* 801F507C 88 9E 01 B7 */ lbz r4, 0x1b7(r30) -/* 801F5080 48 00 15 D5 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc -/* 801F5084 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F5088 28 00 00 01 */ cmplwi r0, 1 -/* 801F508C 40 82 00 20 */ bne lbl_801F50AC -/* 801F5090 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F5094 28 00 00 01 */ cmplwi r0, 1 -/* 801F5098 40 82 00 14 */ bne lbl_801F50AC -/* 801F509C 7F C3 F3 78 */ mr r3, r30 -/* 801F50A0 48 00 0C E5 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F50A4 88 1E 01 B3 */ lbz r0, 0x1b3(r30) -/* 801F50A8 98 1E 01 B2 */ stb r0, 0x1b2(r30) -lbl_801F50AC: -/* 801F50AC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F50B0 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F50B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F50B8 7C 08 03 A6 */ mtlr r0 -/* 801F50BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F50C0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/errorTxtChangeAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/errorTxtChangeAnm__12dMenu_save_cFv.s deleted file mode 100644 index b2134cfb32..0000000000 --- a/asm/d/menu/d_menu_save/errorTxtChangeAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_801F5190: -/* 801F5190 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F5194 7C 08 02 A6 */ mflr r0 -/* 801F5198 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F519C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F51A0 48 16 D0 39 */ bl _savegpr_28 -/* 801F51A4 7C 7F 1B 78 */ mr r31, r3 -/* 801F51A8 88 03 00 D1 */ lbz r0, 0xd1(r3) -/* 801F51AC 28 00 00 00 */ cmplwi r0, 0 -/* 801F51B0 41 82 00 0C */ beq lbl_801F51BC -/* 801F51B4 38 60 00 01 */ li r3, 1 -/* 801F51B8 48 00 00 A8 */ b lbl_801F5260 -lbl_801F51BC: -/* 801F51BC 3B 80 00 00 */ li r28, 0 -/* 801F51C0 88 1F 00 D0 */ lbz r0, 0xd0(r31) -/* 801F51C4 54 00 10 3A */ slwi r0, r0, 2 -/* 801F51C8 7C 7F 02 14 */ add r3, r31, r0 -/* 801F51CC 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 801F51D0 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F51D4 3B A4 E8 4C */ addi r29, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F51D8 88 9D 00 08 */ lbz r4, 8(r29) -/* 801F51DC 38 A0 00 FF */ li r5, 0xff -/* 801F51E0 38 C0 00 00 */ li r6, 0 -/* 801F51E4 38 E0 00 00 */ li r7, 0 -/* 801F51E8 48 06 06 91 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F51EC 7C 7E 1B 78 */ mr r30, r3 -/* 801F51F0 88 1F 00 D0 */ lbz r0, 0xd0(r31) -/* 801F51F4 68 00 00 01 */ xori r0, r0, 1 -/* 801F51F8 54 00 10 3A */ slwi r0, r0, 2 -/* 801F51FC 7C 7F 02 14 */ add r3, r31, r0 -/* 801F5200 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 801F5204 88 9D 00 08 */ lbz r4, 8(r29) -/* 801F5208 38 A0 00 00 */ li r5, 0 -/* 801F520C 38 C0 00 FF */ li r6, 0xff -/* 801F5210 38 E0 00 00 */ li r7, 0 -/* 801F5214 48 06 06 65 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F5218 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F521C 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801F5220 A8 84 00 94 */ lha r4, 0x94(r4) -/* 801F5224 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F5228 28 00 00 01 */ cmplwi r0, 1 -/* 801F522C 40 82 00 30 */ bne lbl_801F525C -/* 801F5230 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F5234 28 00 00 01 */ cmplwi r0, 1 -/* 801F5238 40 82 00 24 */ bne lbl_801F525C -/* 801F523C 2C 04 00 00 */ cmpwi r4, 0 -/* 801F5240 40 82 00 1C */ bne lbl_801F525C -/* 801F5244 88 1F 00 D0 */ lbz r0, 0xd0(r31) -/* 801F5248 68 00 00 01 */ xori r0, r0, 1 -/* 801F524C 98 1F 00 D0 */ stb r0, 0xd0(r31) -/* 801F5250 38 00 00 01 */ li r0, 1 -/* 801F5254 98 1F 00 D1 */ stb r0, 0xd1(r31) -/* 801F5258 3B 80 00 01 */ li r28, 1 -lbl_801F525C: -/* 801F525C 7F 83 E3 78 */ mr r3, r28 -lbl_801F5260: -/* 801F5260 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F5264 48 16 CF C1 */ bl _restgpr_28 -/* 801F5268 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F526C 7C 08 03 A6 */ mtlr r0 -/* 801F5270 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F5274 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/gameContinue2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/gameContinue2__12dMenu_save_cFv.s deleted file mode 100644 index 34a99c21b9..0000000000 --- a/asm/d/menu/d_menu_save/gameContinue2__12dMenu_save_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801F2D78: -/* 801F2D78 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F2D7C 28 04 00 00 */ cmplwi r4, 0 -/* 801F2D80 41 82 00 10 */ beq lbl_801F2D90 -/* 801F2D84 38 04 FF FF */ addi r0, r4, -1 -/* 801F2D88 98 03 01 BD */ stb r0, 0x1bd(r3) -/* 801F2D8C 4E 80 00 20 */ blr -lbl_801F2D90: -/* 801F2D90 38 00 00 01 */ li r0, 1 -/* 801F2D94 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 801F2D98 90 03 00 00 */ stw r0, 0(r3) -/* 801F2D9C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/gameContinue3__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/gameContinue3__12dMenu_save_cFv.s deleted file mode 100644 index 249b042ca2..0000000000 --- a/asm/d/menu/d_menu_save/gameContinue3__12dMenu_save_cFv.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_801F2DA0: -/* 801F2DA0 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F2DA4 28 04 00 00 */ cmplwi r4, 0 -/* 801F2DA8 41 82 00 10 */ beq lbl_801F2DB8 -/* 801F2DAC 38 04 FF FF */ addi r0, r4, -1 -/* 801F2DB0 98 03 01 BD */ stb r0, 0x1bd(r3) -/* 801F2DB4 4E 80 00 20 */ blr -lbl_801F2DB8: -/* 801F2DB8 38 00 00 29 */ li r0, 0x29 -/* 801F2DBC 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F2DC0 38 00 00 03 */ li r0, 3 -/* 801F2DC4 98 03 01 BA */ stb r0, 0x1ba(r3) -/* 801F2DC8 38 00 00 00 */ li r0, 0 -/* 801F2DCC 98 03 01 BB */ stb r0, 0x1bb(r3) -/* 801F2DD0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/gameContinueDisp__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/gameContinueDisp__12dMenu_save_cFv.s deleted file mode 100644 index c3b06304b2..0000000000 --- a/asm/d/menu/d_menu_save/gameContinueDisp__12dMenu_save_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_801F2B5C: -/* 801F2B5C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F2B60 7C 08 02 A6 */ mflr r0 -/* 801F2B64 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F2B68 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2B6C 48 16 F6 71 */ bl _savegpr_29 -/* 801F2B70 7C 7D 1B 78 */ mr r29, r3 -/* 801F2B74 48 00 1D B5 */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F2B78 7C 7E 1B 78 */ mr r30, r3 -/* 801F2B7C 7F A3 EB 78 */ mr r3, r29 -/* 801F2B80 48 00 2D 49 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F2B84 7C 7F 1B 78 */ mr r31, r3 -/* 801F2B88 7F A3 EB 78 */ mr r3, r29 -/* 801F2B8C 48 00 36 ED */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F2B90 80 9D 00 30 */ lwz r4, 0x30(r29) -/* 801F2B94 88 84 00 3D */ lbz r4, 0x3d(r4) -/* 801F2B98 30 04 FF FF */ addic r0, r4, -1 -/* 801F2B9C 7C 00 21 10 */ subfe r0, r0, r4 -/* 801F2BA0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801F2BA4 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F2BA8 28 00 00 01 */ cmplwi r0, 1 -/* 801F2BAC 40 82 00 34 */ bne lbl_801F2BE0 -/* 801F2BB0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F2BB4 28 00 00 01 */ cmplwi r0, 1 -/* 801F2BB8 40 82 00 28 */ bne lbl_801F2BE0 -/* 801F2BBC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F2BC0 28 00 00 01 */ cmplwi r0, 1 -/* 801F2BC4 40 82 00 1C */ bne lbl_801F2BE0 -/* 801F2BC8 28 04 00 01 */ cmplwi r4, 1 -/* 801F2BCC 40 82 00 14 */ bne lbl_801F2BE0 -/* 801F2BD0 7F A3 EB 78 */ mr r3, r29 -/* 801F2BD4 48 00 31 B1 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F2BD8 38 00 00 22 */ li r0, 0x22 -/* 801F2BDC 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F2BE0: -/* 801F2BE0 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2BE4 48 16 F6 45 */ bl _restgpr_29 -/* 801F2BE8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F2BEC 7C 08 03 A6 */ mtlr r0 -/* 801F2BF0 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F2BF4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/headerTxtChangeAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/headerTxtChangeAnm__12dMenu_save_cFv.s deleted file mode 100644 index a4f3acfd19..0000000000 --- a/asm/d/menu/d_menu_save/headerTxtChangeAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,62 +0,0 @@ -lbl_801F4928: -/* 801F4928 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F492C 7C 08 02 A6 */ mflr r0 -/* 801F4930 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F4934 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4938 48 16 D8 A1 */ bl _savegpr_28 -/* 801F493C 7C 7F 1B 78 */ mr r31, r3 -/* 801F4940 88 03 01 79 */ lbz r0, 0x179(r3) -/* 801F4944 28 00 00 00 */ cmplwi r0, 0 -/* 801F4948 41 82 00 0C */ beq lbl_801F4954 -/* 801F494C 38 60 00 01 */ li r3, 1 -/* 801F4950 48 00 00 A8 */ b lbl_801F49F8 -lbl_801F4954: -/* 801F4954 3B 80 00 00 */ li r28, 0 -/* 801F4958 88 1F 01 78 */ lbz r0, 0x178(r31) -/* 801F495C 54 00 10 3A */ slwi r0, r0, 2 -/* 801F4960 7C 7F 02 14 */ add r3, r31, r0 -/* 801F4964 80 63 01 68 */ lwz r3, 0x168(r3) -/* 801F4968 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F496C 3B A4 E8 4C */ addi r29, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F4970 88 9D 00 08 */ lbz r4, 8(r29) -/* 801F4974 38 A0 00 FF */ li r5, 0xff -/* 801F4978 38 C0 00 00 */ li r6, 0 -/* 801F497C 38 E0 00 00 */ li r7, 0 -/* 801F4980 48 06 0E F9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F4984 7C 7E 1B 78 */ mr r30, r3 -/* 801F4988 88 1F 01 78 */ lbz r0, 0x178(r31) -/* 801F498C 68 00 00 01 */ xori r0, r0, 1 -/* 801F4990 54 00 10 3A */ slwi r0, r0, 2 -/* 801F4994 7C 7F 02 14 */ add r3, r31, r0 -/* 801F4998 80 63 01 68 */ lwz r3, 0x168(r3) -/* 801F499C 88 9D 00 08 */ lbz r4, 8(r29) -/* 801F49A0 38 A0 00 00 */ li r5, 0 -/* 801F49A4 38 C0 00 FF */ li r6, 0xff -/* 801F49A8 38 E0 00 00 */ li r7, 0 -/* 801F49AC 48 06 0E CD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F49B0 3C 80 80 43 */ lis r4, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F49B4 38 84 01 88 */ addi r4, r4, g_meter2_info@l /* 0x80430188@l */ -/* 801F49B8 A8 84 00 94 */ lha r4, 0x94(r4) -/* 801F49BC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F49C0 28 00 00 01 */ cmplwi r0, 1 -/* 801F49C4 40 82 00 30 */ bne lbl_801F49F4 -/* 801F49C8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F49CC 28 00 00 01 */ cmplwi r0, 1 -/* 801F49D0 40 82 00 24 */ bne lbl_801F49F4 -/* 801F49D4 2C 04 00 00 */ cmpwi r4, 0 -/* 801F49D8 40 82 00 1C */ bne lbl_801F49F4 -/* 801F49DC 88 1F 01 78 */ lbz r0, 0x178(r31) -/* 801F49E0 68 00 00 01 */ xori r0, r0, 1 -/* 801F49E4 98 1F 01 78 */ stb r0, 0x178(r31) -/* 801F49E8 38 00 00 01 */ li r0, 1 -/* 801F49EC 98 1F 01 79 */ stb r0, 0x179(r31) -/* 801F49F0 3B 80 00 01 */ li r28, 1 -lbl_801F49F4: -/* 801F49F4 7F 83 E3 78 */ mr r3, r28 -lbl_801F49F8: -/* 801F49F8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F49FC 48 16 D8 29 */ bl _restgpr_28 -/* 801F4A00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F4A04 7C 08 03 A6 */ mtlr r0 -/* 801F4A08 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F4A0C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/iplSelInitSet__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/iplSelInitSet__12dMenu_save_cFv.s deleted file mode 100644 index 0eec0320d8..0000000000 --- a/asm/d/menu/d_menu_save/iplSelInitSet__12dMenu_save_cFv.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_801F1C94: -/* 801F1C94 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1C98 7C 08 02 A6 */ mflr r0 -/* 801F1C9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1CA0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1CA4 7C 7F 1B 78 */ mr r31, r3 -/* 801F1CA8 38 80 03 C0 */ li r4, 0x3c0 -/* 801F1CAC 48 00 34 19 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F1CB0 38 00 00 00 */ li r0, 0 -/* 801F1CB4 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F1CB8 7F E3 FB 78 */ mr r3, r31 -/* 801F1CBC 38 80 00 01 */ li r4, 1 -/* 801F1CC0 48 00 45 3D */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc -/* 801F1CC4 7F E3 FB 78 */ mr r3, r31 -/* 801F1CC8 38 80 0B B7 */ li r4, 0xbb7 -/* 801F1CCC 38 A0 0B C1 */ li r5, 0xbc1 -/* 801F1CD0 38 C0 00 00 */ li r6, 0 -/* 801F1CD4 48 00 3A 71 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -/* 801F1CD8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1CDC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1CE0 7C 08 03 A6 */ mtlr r0 -/* 801F1CE4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1CE8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/ketteiTxtDispAnmInit__12dMenu_save_cFUc.s b/asm/d/menu/d_menu_save/ketteiTxtDispAnmInit__12dMenu_save_cFUc.s deleted file mode 100644 index dbc2aa664b..0000000000 --- a/asm/d/menu/d_menu_save/ketteiTxtDispAnmInit__12dMenu_save_cFUc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801F61FC: -/* 801F61FC 98 83 01 A9 */ stb r4, 0x1a9(r3) -/* 801F6200 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801F6204 40 82 00 18 */ bne lbl_801F621C -/* 801F6208 80 A3 01 A4 */ lwz r5, 0x1a4(r3) -/* 801F620C 80 A5 00 04 */ lwz r5, 4(r5) -/* 801F6210 88 05 00 B2 */ lbz r0, 0xb2(r5) -/* 801F6214 28 00 00 00 */ cmplwi r0, 0 -/* 801F6218 41 82 00 3C */ beq lbl_801F6254 -lbl_801F621C: -/* 801F621C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801F6220 28 00 00 01 */ cmplwi r0, 1 -/* 801F6224 40 82 00 18 */ bne lbl_801F623C -/* 801F6228 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 801F622C 80 84 00 04 */ lwz r4, 4(r4) -/* 801F6230 88 04 00 B2 */ lbz r0, 0xb2(r4) -/* 801F6234 28 00 00 FF */ cmplwi r0, 0xff -/* 801F6238 41 82 00 1C */ beq lbl_801F6254 -lbl_801F623C: -/* 801F623C 38 00 00 00 */ li r0, 0 -/* 801F6240 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 801F6244 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6248 80 63 01 98 */ lwz r3, 0x198(r3) -/* 801F624C B0 03 00 16 */ sth r0, 0x16(r3) -/* 801F6250 4E 80 00 20 */ blr -lbl_801F6254: -/* 801F6254 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F6258 38 A4 E8 4C */ addi r5, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F625C 88 05 00 08 */ lbz r0, 8(r5) -/* 801F6260 80 83 01 A4 */ lwz r4, 0x1a4(r3) -/* 801F6264 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6268 88 05 00 08 */ lbz r0, 8(r5) -/* 801F626C 80 63 01 98 */ lwz r3, 0x198(r3) -/* 801F6270 B0 03 00 16 */ sth r0, 0x16(r3) -/* 801F6274 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/ketteiTxtDispAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/ketteiTxtDispAnm__12dMenu_save_cFv.s deleted file mode 100644 index a6bd5e427b..0000000000 --- a/asm/d/menu/d_menu_save/ketteiTxtDispAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_801F6278: -/* 801F6278 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F627C 7C 08 02 A6 */ mflr r0 -/* 801F6280 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F6284 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6288 48 16 BF 55 */ bl _savegpr_29 -/* 801F628C 7C 7D 1B 78 */ mr r29, r3 -/* 801F6290 88 03 01 A9 */ lbz r0, 0x1a9(r3) -/* 801F6294 28 00 00 00 */ cmplwi r0, 0 -/* 801F6298 41 82 00 44 */ beq lbl_801F62DC -/* 801F629C 80 7D 01 A4 */ lwz r3, 0x1a4(r29) -/* 801F62A0 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F62A4 3B E4 E8 4C */ addi r31, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F62A8 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F62AC 38 A0 00 00 */ li r5, 0 -/* 801F62B0 38 C0 00 FF */ li r6, 0xff -/* 801F62B4 38 E0 00 00 */ li r7, 0 -/* 801F62B8 48 05 F5 C1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F62BC 7C 7E 1B 78 */ mr r30, r3 -/* 801F62C0 80 7D 01 98 */ lwz r3, 0x198(r29) -/* 801F62C4 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F62C8 38 A0 00 80 */ li r5, 0x80 -/* 801F62CC 38 C0 00 FF */ li r6, 0xff -/* 801F62D0 38 E0 00 00 */ li r7, 0 -/* 801F62D4 48 05 F5 A5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F62D8 48 00 00 40 */ b lbl_801F6318 -lbl_801F62DC: -/* 801F62DC 80 7D 01 A4 */ lwz r3, 0x1a4(r29) -/* 801F62E0 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F62E4 3B E4 E8 4C */ addi r31, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F62E8 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F62EC 38 A0 00 FF */ li r5, 0xff -/* 801F62F0 38 C0 00 00 */ li r6, 0 -/* 801F62F4 38 E0 00 00 */ li r7, 0 -/* 801F62F8 48 05 F5 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F62FC 7C 7E 1B 78 */ mr r30, r3 -/* 801F6300 80 7D 01 98 */ lwz r3, 0x198(r29) -/* 801F6304 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F6308 38 A0 00 FF */ li r5, 0xff -/* 801F630C 38 C0 00 80 */ li r6, 0x80 -/* 801F6310 38 E0 00 00 */ li r7, 0 -/* 801F6314 48 05 F5 65 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_801F6318: -/* 801F6318 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F631C 28 00 00 01 */ cmplwi r0, 1 -/* 801F6320 40 82 00 18 */ bne lbl_801F6338 -/* 801F6324 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F6328 28 00 00 01 */ cmplwi r0, 1 -/* 801F632C 40 82 00 0C */ bne lbl_801F6338 -/* 801F6330 38 60 00 01 */ li r3, 1 -/* 801F6334 48 00 00 08 */ b lbl_801F633C -lbl_801F6338: -/* 801F6338 38 60 00 00 */ li r3, 0 -lbl_801F633C: -/* 801F633C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6340 48 16 BE E9 */ bl _restgpr_29 -/* 801F6344 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F6348 7C 08 03 A6 */ mtlr r0 -/* 801F634C 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6350 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardCommandEnd2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardCommandEnd2__12dMenu_save_cFv.s deleted file mode 100644 index f26f1f3681..0000000000 --- a/asm/d/menu/d_menu_save/memCardCommandEnd2__12dMenu_save_cFv.s +++ /dev/null @@ -1,51 +0,0 @@ -lbl_801F2708: -/* 801F2708 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F270C 7C 08 02 A6 */ mflr r0 -/* 801F2710 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F2714 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F2718 48 16 FA C5 */ bl _savegpr_29 -/* 801F271C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2720 48 00 22 09 */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F2724 7C 7D 1B 78 */ mr r29, r3 -/* 801F2728 7F E3 FB 78 */ mr r3, r31 -/* 801F272C 48 00 3B 4D */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F2730 7C 7E 1B 78 */ mr r30, r3 -/* 801F2734 7F E3 FB 78 */ mr r3, r31 -/* 801F2738 48 00 39 E9 */ bl modoruTxtDispAnm__12dMenu_save_cFv -/* 801F273C 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 801F2740 88 84 00 3D */ lbz r4, 0x3d(r4) -/* 801F2744 30 04 FF FF */ addic r0, r4, -1 -/* 801F2748 7C 00 21 10 */ subfe r0, r0, r4 -/* 801F274C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801F2750 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801F2754 28 00 00 01 */ cmplwi r0, 1 -/* 801F2758 40 82 00 5C */ bne lbl_801F27B4 -/* 801F275C 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F2760 28 00 00 01 */ cmplwi r0, 1 -/* 801F2764 40 82 00 50 */ bne lbl_801F27B4 -/* 801F2768 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F276C 28 00 00 01 */ cmplwi r0, 1 -/* 801F2770 40 82 00 44 */ bne lbl_801F27B4 -/* 801F2774 28 04 00 01 */ cmplwi r4, 1 -/* 801F2778 40 82 00 3C */ bne lbl_801F27B4 -/* 801F277C 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 801F2780 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 801F2784 80 64 00 00 */ lwz r3, 0(r4) -/* 801F2788 80 04 00 04 */ lwz r0, 4(r4) -/* 801F278C 90 7F 01 C4 */ stw r3, 0x1c4(r31) -/* 801F2790 90 1F 01 C8 */ stw r0, 0x1c8(r31) -/* 801F2794 80 04 00 08 */ lwz r0, 8(r4) -/* 801F2798 90 1F 01 CC */ stw r0, 0x1cc(r31) -/* 801F279C 38 00 00 06 */ li r0, 6 -/* 801F27A0 98 1F 01 B5 */ stb r0, 0x1b5(r31) -/* 801F27A4 38 00 00 09 */ li r0, 9 -/* 801F27A8 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F27AC 38 00 00 00 */ li r0, 0 -/* 801F27B0 98 1F 01 BF */ stb r0, 0x1bf(r31) -lbl_801F27B4: -/* 801F27B4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F27B8 48 16 FA 71 */ bl _restgpr_29 -/* 801F27BC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F27C0 7C 08 03 A6 */ mtlr r0 -/* 801F27C4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F27C8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardCommandEnd__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardCommandEnd__12dMenu_save_cFv.s deleted file mode 100644 index d91187f728..0000000000 --- a/asm/d/menu/d_menu_save/memCardCommandEnd__12dMenu_save_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801F2698: -/* 801F2698 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F269C 7C 08 02 A6 */ mflr r0 -/* 801F26A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F26A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F26A8 7C 7F 1B 78 */ mr r31, r3 -/* 801F26AC 48 00 2A E5 */ bl errorTxtChangeAnm__12dMenu_save_cFv -/* 801F26B0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F26B4 28 00 00 01 */ cmplwi r0, 1 -/* 801F26B8 40 82 00 3C */ bne lbl_801F26F4 -/* 801F26BC 3C 60 80 3A */ lis r3, __ptmf_null@ha /* 0x803A2180@ha */ -/* 801F26C0 38 83 21 80 */ addi r4, r3, __ptmf_null@l /* 0x803A2180@l */ -/* 801F26C4 80 64 00 00 */ lwz r3, 0(r4) -/* 801F26C8 80 04 00 04 */ lwz r0, 4(r4) -/* 801F26CC 90 7F 01 C4 */ stw r3, 0x1c4(r31) -/* 801F26D0 90 1F 01 C8 */ stw r0, 0x1c8(r31) -/* 801F26D4 80 04 00 08 */ lwz r0, 8(r4) -/* 801F26D8 90 1F 01 CC */ stw r0, 0x1cc(r31) -/* 801F26DC 38 00 00 06 */ li r0, 6 -/* 801F26E0 98 1F 01 B5 */ stb r0, 0x1b5(r31) -/* 801F26E4 38 00 00 09 */ li r0, 9 -/* 801F26E8 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F26EC 38 00 00 00 */ li r0, 0 -/* 801F26F0 98 1F 01 BF */ stb r0, 0x1bf(r31) -lbl_801F26F4: -/* 801F26F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F26F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F26FC 7C 08 03 A6 */ mtlr r0 -/* 801F2700 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2704 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardDataLoadWait__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardDataLoadWait__12dMenu_save_cFv.s deleted file mode 100644 index 7cf99b1bed..0000000000 --- a/asm/d/menu/d_menu_save/memCardDataLoadWait__12dMenu_save_cFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_801F27CC: -/* 801F27CC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F27D0 7C 08 02 A6 */ mflr r0 -/* 801F27D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F27D8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F27DC 7C 7F 1B 78 */ mr r31, r3 -/* 801F27E0 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 801F27E4 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 801F27E8 38 9F 01 D0 */ addi r4, r31, 0x1d0 -/* 801F27EC 38 A0 1F BC */ li r5, 0x1fbc -/* 801F27F0 38 C0 00 00 */ li r6, 0 -/* 801F27F4 4B E2 42 BD */ bl LoadSync__15mDoMemCd_Ctrl_cFPvUlUl -/* 801F27F8 2C 03 00 00 */ cmpwi r3, 0 -/* 801F27FC 41 82 00 30 */ beq lbl_801F282C -/* 801F2800 2C 03 00 02 */ cmpwi r3, 2 -/* 801F2804 40 82 00 18 */ bne lbl_801F281C -/* 801F2808 38 00 00 00 */ li r0, 0 -/* 801F280C 98 1F 01 C0 */ stb r0, 0x1c0(r31) -/* 801F2810 38 00 00 06 */ li r0, 6 -/* 801F2814 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2818 48 00 00 14 */ b lbl_801F282C -lbl_801F281C: -/* 801F281C 2C 03 00 01 */ cmpwi r3, 1 -/* 801F2820 40 82 00 0C */ bne lbl_801F282C -/* 801F2824 7F E3 FB 78 */ mr r3, r31 -/* 801F2828 48 00 2A 51 */ bl saveSelectOpenInit__12dMenu_save_cFv -lbl_801F282C: -/* 801F282C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2830 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2834 7C 08 03 A6 */ mtlr r0 -/* 801F2838 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F283C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardErrGoIPLSel2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardErrGoIPLSel2__12dMenu_save_cFv.s deleted file mode 100644 index a05d580d76..0000000000 --- a/asm/d/menu/d_menu_save/memCardErrGoIPLSel2__12dMenu_save_cFv.s +++ /dev/null @@ -1,44 +0,0 @@ -lbl_801F1EE0: -/* 801F1EE0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1EE4 7C 08 02 A6 */ mflr r0 -/* 801F1EE8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1EEC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1EF0 7C 7F 1B 78 */ mr r31, r3 -/* 801F1EF4 38 80 00 01 */ li r4, 1 -/* 801F1EF8 38 A0 00 00 */ li r5, 0 -/* 801F1EFC 48 00 2F 4D */ bl errYesNoSelect__12dMenu_save_cFUcUc -/* 801F1F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F1F04 41 82 00 68 */ beq lbl_801F1F6C -/* 801F1F08 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F1F0C 28 00 00 00 */ cmplwi r0, 0 -/* 801F1F10 41 82 00 54 */ beq lbl_801F1F64 -/* 801F1F14 38 00 00 01 */ li r0, 1 -/* 801F1F18 98 1F 01 BF */ stb r0, 0x1bf(r31) -/* 801F1F1C 3C 60 80 43 */ lis r3, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F1F20 38 63 E8 4C */ addi r3, r3, g_msHIO@l /* 0x8042E84C@l */ -/* 801F1F24 88 03 00 0B */ lbz r0, 0xb(r3) -/* 801F1F28 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F1F2C 88 9F 01 BD */ lbz r4, 0x1bd(r31) -/* 801F1F30 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F1F34 80 63 00 04 */ lwz r3, 4(r3) -/* 801F1F38 28 03 00 00 */ cmplwi r3, 0 -/* 801F1F3C 41 82 00 14 */ beq lbl_801F1F50 -/* 801F1F40 81 83 00 00 */ lwz r12, 0(r3) -/* 801F1F44 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801F1F48 7D 89 03 A6 */ mtctr r12 -/* 801F1F4C 4E 80 04 21 */ bctrl -lbl_801F1F50: -/* 801F1F50 38 00 00 01 */ li r0, 1 -/* 801F1F54 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F1F58 38 00 00 0F */ li r0, 0xf -/* 801F1F5C 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F1F60 48 00 00 0C */ b lbl_801F1F6C -lbl_801F1F64: -/* 801F1F64 7F E3 FB 78 */ mr r3, r31 -/* 801F1F68 4B FF FB D1 */ bl closeSelect__12dMenu_save_cFv -lbl_801F1F6C: -/* 801F1F6C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1F70 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1F74 7C 08 03 A6 */ mtlr r0 -/* 801F1F78 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1F7C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardErrGoIPLSel__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardErrGoIPLSel__12dMenu_save_cFv.s deleted file mode 100644 index 7f887576bf..0000000000 --- a/asm/d/menu/d_menu_save/memCardErrGoIPLSel__12dMenu_save_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801F1DD4: -/* 801F1DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1DD8 7C 08 02 A6 */ mflr r0 -/* 801F1DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1DE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1DE4 7C 7F 1B 78 */ mr r31, r3 -/* 801F1DE8 38 80 00 01 */ li r4, 1 -/* 801F1DEC 38 A0 00 00 */ li r5, 0 -/* 801F1DF0 48 00 30 59 */ bl errYesNoSelect__12dMenu_save_cFUcUc -/* 801F1DF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F1DF8 41 82 00 4C */ beq lbl_801F1E44 -/* 801F1DFC 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F1E00 28 00 00 00 */ cmplwi r0, 0 -/* 801F1E04 41 82 00 38 */ beq lbl_801F1E3C -/* 801F1E08 7F E3 FB 78 */ mr r3, r31 -/* 801F1E0C 38 80 03 BD */ li r4, 0x3bd -/* 801F1E10 48 00 32 B5 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F1E14 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F1E18 98 1F 01 B7 */ stb r0, 0x1b7(r31) -/* 801F1E1C 38 00 00 00 */ li r0, 0 -/* 801F1E20 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F1E24 7F E3 FB 78 */ mr r3, r31 -/* 801F1E28 38 80 00 01 */ li r4, 1 -/* 801F1E2C 48 00 26 E5 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc -/* 801F1E30 38 00 00 0D */ li r0, 0xd -/* 801F1E34 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F1E38 48 00 00 0C */ b lbl_801F1E44 -lbl_801F1E3C: -/* 801F1E3C 7F E3 FB 78 */ mr r3, r31 -/* 801F1E40 4B FF FC F9 */ bl closeSelect__12dMenu_save_cFv -lbl_801F1E44: -/* 801F1E44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1E48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1E4C 7C 08 03 A6 */ mtlr r0 -/* 801F1E50 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1E54 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardErrGotoIPL__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardErrGotoIPL__12dMenu_save_cFv.s deleted file mode 100644 index faacaaae44..0000000000 --- a/asm/d/menu/d_menu_save/memCardErrGotoIPL__12dMenu_save_cFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_801F1F80: -/* 801F1F80 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1F84 7C 08 02 A6 */ mflr r0 -/* 801F1F88 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1F8C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1F90 7C 7F 1B 78 */ mr r31, r3 -/* 801F1F94 88 63 01 BD */ lbz r3, 0x1bd(r3) -/* 801F1F98 28 03 00 00 */ cmplwi r3, 0 -/* 801F1F9C 41 82 00 10 */ beq lbl_801F1FAC -/* 801F1FA0 38 03 FF FF */ addi r0, r3, -1 -/* 801F1FA4 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F1FA8 48 00 00 44 */ b lbl_801F1FEC -lbl_801F1FAC: -/* 801F1FAC 38 00 00 01 */ li r0, 1 -/* 801F1FB0 98 1F 21 A1 */ stb r0, 0x21a1(r31) -/* 801F1FB4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F1FB8 80 63 00 04 */ lwz r3, 4(r3) -/* 801F1FBC 28 03 00 00 */ cmplwi r3, 0 -/* 801F1FC0 41 82 00 18 */ beq lbl_801F1FD8 -/* 801F1FC4 38 80 00 00 */ li r4, 0 -/* 801F1FC8 81 83 00 00 */ lwz r12, 0(r3) -/* 801F1FCC 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F1FD0 7D 89 03 A6 */ mtctr r12 -/* 801F1FD4 4E 80 04 21 */ bctrl -lbl_801F1FD8: -/* 801F1FD8 38 00 00 00 */ li r0, 0 -/* 801F1FDC 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F1FE0 38 00 00 01 */ li r0, 1 -/* 801F1FE4 80 6D 86 F8 */ lwz r3, mResetData__6mDoRst(r13) -/* 801F1FE8 98 03 00 10 */ stb r0, 0x10(r3) -lbl_801F1FEC: -/* 801F1FEC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1FF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1FF4 7C 08 03 A6 */ mtlr r0 -/* 801F1FF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F1FFC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel2__12dMenu_save_cFv.s deleted file mode 100644 index 7a20a6bc5f..0000000000 --- a/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel2__12dMenu_save_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801F219C: -/* 801F219C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F21A0 7C 08 02 A6 */ mflr r0 -/* 801F21A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F21A8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F21AC 7C 7F 1B 78 */ mr r31, r3 -/* 801F21B0 38 80 00 01 */ li r4, 1 -/* 801F21B4 38 A0 00 00 */ li r5, 0 -/* 801F21B8 48 00 2C 91 */ bl errYesNoSelect__12dMenu_save_cFUcUc -/* 801F21BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F21C0 41 82 00 7C */ beq lbl_801F223C -/* 801F21C4 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F21C8 28 00 00 00 */ cmplwi r0, 0 -/* 801F21CC 41 82 00 40 */ beq lbl_801F220C -/* 801F21D0 38 00 00 01 */ li r0, 1 -/* 801F21D4 98 1F 01 BF */ stb r0, 0x1bf(r31) -/* 801F21D8 7F E3 FB 78 */ mr r3, r31 -/* 801F21DC 38 80 03 B8 */ li r4, 0x3b8 -/* 801F21E0 48 00 2E E5 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F21E4 38 00 00 00 */ li r0, 0 -/* 801F21E8 98 1F 00 9E */ stb r0, 0x9e(r31) -/* 801F21EC 7F E3 FB 78 */ mr r3, r31 -/* 801F21F0 38 80 0B C1 */ li r4, 0xbc1 -/* 801F21F4 38 A0 0B B7 */ li r5, 0xbb7 -/* 801F21F8 38 C0 00 00 */ li r6, 0 -/* 801F21FC 48 00 35 49 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -/* 801F2200 38 00 00 14 */ li r0, 0x14 -/* 801F2204 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2208 48 00 00 34 */ b lbl_801F223C -lbl_801F220C: -/* 801F220C 7F E3 FB 78 */ mr r3, r31 -/* 801F2210 38 80 03 BC */ li r4, 0x3bc -/* 801F2214 48 00 2E B1 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F2218 38 00 00 00 */ li r0, 0 -/* 801F221C 98 1F 00 9E */ stb r0, 0x9e(r31) -/* 801F2220 7F E3 FB 78 */ mr r3, r31 -/* 801F2224 38 80 0B C1 */ li r4, 0xbc1 -/* 801F2228 38 A0 0B B7 */ li r5, 0xbb7 -/* 801F222C 38 C0 00 00 */ li r6, 0 -/* 801F2230 48 00 35 15 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -/* 801F2234 38 00 00 12 */ li r0, 0x12 -/* 801F2238 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F223C: -/* 801F223C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2240 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2244 7C 08 03 A6 */ mtlr r0 -/* 801F2248 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F224C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel__12dMenu_save_cFv.s deleted file mode 100644 index fb97a40a8b..0000000000 --- a/asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel__12dMenu_save_cFv.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_801F2000: -/* 801F2000 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2004 7C 08 02 A6 */ mflr r0 -/* 801F2008 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F200C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2010 7C 7F 1B 78 */ mr r31, r3 -/* 801F2014 38 80 00 01 */ li r4, 1 -/* 801F2018 38 A0 00 00 */ li r5, 0 -/* 801F201C 48 00 2E 2D */ bl errYesNoSelect__12dMenu_save_cFUcUc -/* 801F2020 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 801F2024 41 82 00 74 */ beq lbl_801F2098 -/* 801F2028 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F202C 28 00 00 00 */ cmplwi r0, 0 -/* 801F2030 41 82 00 38 */ beq lbl_801F2068 -/* 801F2034 7F E3 FB 78 */ mr r3, r31 -/* 801F2038 38 80 03 B9 */ li r4, 0x3b9 -/* 801F203C 48 00 30 89 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F2040 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F2044 98 1F 01 B7 */ stb r0, 0x1b7(r31) -/* 801F2048 38 00 00 00 */ li r0, 0 -/* 801F204C 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F2050 7F E3 FB 78 */ mr r3, r31 -/* 801F2054 38 80 00 01 */ li r4, 1 -/* 801F2058 48 00 24 B9 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc -/* 801F205C 38 00 00 11 */ li r0, 0x11 -/* 801F2060 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2064 48 00 00 34 */ b lbl_801F2098 -lbl_801F2068: -/* 801F2068 7F E3 FB 78 */ mr r3, r31 -/* 801F206C 38 80 03 BC */ li r4, 0x3bc -/* 801F2070 48 00 30 55 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F2074 38 00 00 00 */ li r0, 0 -/* 801F2078 98 1F 00 9E */ stb r0, 0x9e(r31) -/* 801F207C 7F E3 FB 78 */ mr r3, r31 -/* 801F2080 38 80 0B C1 */ li r4, 0xbc1 -/* 801F2084 38 A0 0B B7 */ li r5, 0xbb7 -/* 801F2088 38 C0 00 00 */ li r6, 0 -/* 801F208C 48 00 36 B9 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -/* 801F2090 38 00 00 12 */ li r0, 0x12 -/* 801F2094 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F2098: -/* 801F2098 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F209C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F20A0 7C 08 03 A6 */ mtlr r0 -/* 801F20A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F20A8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardFormatWait__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardFormatWait__12dMenu_save_cFv.s deleted file mode 100644 index 8de74d70c0..0000000000 --- a/asm/d/menu/d_menu_save/memCardFormatWait__12dMenu_save_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801F232C: -/* 801F232C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2330 7C 08 02 A6 */ mflr r0 -/* 801F2334 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2338 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F233C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2340 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F2344 28 04 00 00 */ cmplwi r4, 0 -/* 801F2348 41 82 00 10 */ beq lbl_801F2358 -/* 801F234C 38 04 FF FF */ addi r0, r4, -1 -/* 801F2350 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F2354 48 00 00 3C */ b lbl_801F2390 -lbl_801F2358: -/* 801F2358 80 1F 21 98 */ lwz r0, 0x2198(r31) -/* 801F235C 2C 00 00 02 */ cmpwi r0, 2 -/* 801F2360 40 82 00 18 */ bne lbl_801F2378 -/* 801F2364 38 80 03 99 */ li r4, 0x399 -/* 801F2368 48 00 2D 5D */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F236C 38 00 00 1C */ li r0, 0x1c -/* 801F2370 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2374 48 00 00 1C */ b lbl_801F2390 -lbl_801F2378: -/* 801F2378 2C 00 00 01 */ cmpwi r0, 1 -/* 801F237C 40 82 00 14 */ bne lbl_801F2390 -/* 801F2380 38 80 03 9A */ li r4, 0x39a -/* 801F2384 48 00 2D 41 */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F2388 38 00 00 1C */ li r0, 0x1c -/* 801F238C 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F2390: -/* 801F2390 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2394 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2398 7C 08 03 A6 */ mtlr r0 -/* 801F239C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F23A0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardMakeGameFileWait__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardMakeGameFileWait__12dMenu_save_cFv.s deleted file mode 100644 index d6dbf59100..0000000000 --- a/asm/d/menu/d_menu_save/memCardMakeGameFileWait__12dMenu_save_cFv.s +++ /dev/null @@ -1,39 +0,0 @@ -lbl_801F260C: -/* 801F260C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2610 7C 08 02 A6 */ mflr r0 -/* 801F2614 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2618 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F261C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2620 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F2624 28 04 00 00 */ cmplwi r4, 0 -/* 801F2628 41 82 00 10 */ beq lbl_801F2638 -/* 801F262C 38 04 FF FF */ addi r0, r4, -1 -/* 801F2630 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F2634 48 00 00 50 */ b lbl_801F2684 -lbl_801F2638: -/* 801F2638 80 1F 21 98 */ lwz r0, 0x2198(r31) -/* 801F263C 2C 00 00 02 */ cmpwi r0, 2 -/* 801F2640 40 82 00 18 */ bne lbl_801F2658 -/* 801F2644 38 80 03 C6 */ li r4, 0x3c6 -/* 801F2648 48 00 2A 7D */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F264C 38 00 00 1C */ li r0, 0x1c -/* 801F2650 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F2654 48 00 00 30 */ b lbl_801F2684 -lbl_801F2658: -/* 801F2658 2C 00 00 01 */ cmpwi r0, 1 -/* 801F265C 40 82 00 28 */ bne lbl_801F2684 -/* 801F2660 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F2664 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F2668 88 04 0F 19 */ lbz r0, 0xf19(r4) -/* 801F266C 60 00 00 01 */ ori r0, r0, 1 -/* 801F2670 98 04 0F 19 */ stb r0, 0xf19(r4) -/* 801F2674 38 80 03 C7 */ li r4, 0x3c7 -/* 801F2678 48 00 2A 4D */ bl errorTxtSet__12dMenu_save_cFUs -/* 801F267C 38 00 00 1C */ li r0, 0x1c -/* 801F2680 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F2684: -/* 801F2684 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2688 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F268C 7C 08 03 A6 */ mtlr r0 -/* 801F2690 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2694 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/memCardMakeGameFile__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/memCardMakeGameFile__12dMenu_save_cFv.s deleted file mode 100644 index 8848af40e6..0000000000 --- a/asm/d/menu/d_menu_save/memCardMakeGameFile__12dMenu_save_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_801F25AC: -/* 801F25AC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F25B0 7C 08 02 A6 */ mflr r0 -/* 801F25B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F25B8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F25BC 7C 7F 1B 78 */ mr r31, r3 -/* 801F25C0 88 63 01 BD */ lbz r3, 0x1bd(r3) -/* 801F25C4 28 03 00 00 */ cmplwi r3, 0 -/* 801F25C8 41 82 00 0C */ beq lbl_801F25D4 -/* 801F25CC 38 03 FF FF */ addi r0, r3, -1 -/* 801F25D0 98 1F 01 BD */ stb r0, 0x1bd(r31) -lbl_801F25D4: -/* 801F25D4 3C 60 80 3F */ lis r3, g_mDoMemCd_control@ha /* 0x803EAF40@ha */ -/* 801F25D8 38 63 AF 40 */ addi r3, r3, g_mDoMemCd_control@l /* 0x803EAF40@l */ -/* 801F25DC 4B E2 47 05 */ bl SaveSync__15mDoMemCd_Ctrl_cFv -/* 801F25E0 90 7F 21 98 */ stw r3, 0x2198(r31) -/* 801F25E4 80 1F 21 98 */ lwz r0, 0x2198(r31) -/* 801F25E8 2C 00 00 00 */ cmpwi r0, 0 -/* 801F25EC 41 82 00 0C */ beq lbl_801F25F8 -/* 801F25F0 38 00 00 1B */ li r0, 0x1b -/* 801F25F4 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F25F8: -/* 801F25F8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F25FC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2600 7C 08 03 A6 */ mtlr r0 -/* 801F2604 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2608 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/messageChange__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/messageChange__12dMenu_save_cFv.s deleted file mode 100644 index b2335616a8..0000000000 --- a/asm/d/menu/d_menu_save/messageChange__12dMenu_save_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_801F31B4: -/* 801F31B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F31B8 7C 08 02 A6 */ mflr r0 -/* 801F31BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F31C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F31C4 7C 7F 1B 78 */ mr r31, r3 -/* 801F31C8 80 63 21 8C */ lwz r3, 0x218c(r3) -/* 801F31CC 28 03 00 00 */ cmplwi r3, 0 -/* 801F31D0 41 82 00 A8 */ beq lbl_801F3278 -/* 801F31D4 88 03 00 60 */ lbz r0, 0x60(r3) -/* 801F31D8 98 1F 21 9D */ stb r0, 0x219d(r31) -/* 801F31DC 80 7F 21 8C */ lwz r3, 0x218c(r31) -/* 801F31E0 88 03 00 60 */ lbz r0, 0x60(r3) -/* 801F31E4 28 00 00 00 */ cmplwi r0, 0 -/* 801F31E8 41 82 00 28 */ beq lbl_801F3210 -/* 801F31EC 28 00 00 03 */ cmplwi r0, 3 -/* 801F31F0 41 82 00 0C */ beq lbl_801F31FC -/* 801F31F4 28 00 00 04 */ cmplwi r0, 4 -/* 801F31F8 40 82 00 0C */ bne lbl_801F3204 -lbl_801F31FC: -/* 801F31FC 38 00 00 01 */ li r0, 1 -/* 801F3200 98 03 00 65 */ stb r0, 0x65(r3) -lbl_801F3204: -/* 801F3204 80 7F 21 8C */ lwz r3, 0x218c(r31) -/* 801F3208 48 04 A5 D1 */ bl move__17dMsgScrnExplain_cFv -/* 801F320C 48 00 00 6C */ b lbl_801F3278 -lbl_801F3210: -/* 801F3210 88 1F 21 90 */ lbz r0, 0x2190(r31) -/* 801F3214 28 00 00 01 */ cmplwi r0, 1 -/* 801F3218 40 82 00 34 */ bne lbl_801F324C -/* 801F321C A0 9F 21 92 */ lhz r4, 0x2192(r31) -/* 801F3220 38 A0 00 01 */ li r5, 1 -/* 801F3224 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F3228 7C 00 00 34 */ cntlzw r0, r0 -/* 801F322C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 801F3230 38 E0 00 FF */ li r7, 0xff -/* 801F3234 89 1F 21 9C */ lbz r8, 0x219c(r31) -/* 801F3238 48 04 B3 21 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -/* 801F323C 38 00 00 1E */ li r0, 0x1e -/* 801F3240 80 9F 21 8C */ lwz r4, 0x218c(r31) -/* 801F3244 B0 04 00 5E */ sth r0, 0x5e(r4) -/* 801F3248 48 00 00 1C */ b lbl_801F3264 -lbl_801F324C: -/* 801F324C A0 9F 21 92 */ lhz r4, 0x2192(r31) -/* 801F3250 38 A0 00 00 */ li r5, 0 -/* 801F3254 38 C0 00 00 */ li r6, 0 -/* 801F3258 38 E0 00 FF */ li r7, 0xff -/* 801F325C 39 00 00 01 */ li r8, 1 -/* 801F3260 48 04 B2 F9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb -lbl_801F3264: -/* 801F3264 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F3268 28 00 00 01 */ cmplwi r0, 1 -/* 801F326C 40 82 00 0C */ bne lbl_801F3278 -/* 801F3270 88 1F 21 94 */ lbz r0, 0x2194(r31) -/* 801F3274 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F3278: -/* 801F3278 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F327C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F3280 7C 08 03 A6 */ mtlr r0 -/* 801F3284 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F3288 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/modoruTxtDispAnmInit__12dMenu_save_cFUc.s b/asm/d/menu/d_menu_save/modoruTxtDispAnmInit__12dMenu_save_cFUc.s deleted file mode 100644 index 1903eb46d1..0000000000 --- a/asm/d/menu/d_menu_save/modoruTxtDispAnmInit__12dMenu_save_cFUc.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_801F60A4: -/* 801F60A4 98 83 01 A8 */ stb r4, 0x1a8(r3) -/* 801F60A8 54 80 06 3F */ clrlwi. r0, r4, 0x18 -/* 801F60AC 40 82 00 18 */ bne lbl_801F60C4 -/* 801F60B0 80 A3 01 A0 */ lwz r5, 0x1a0(r3) -/* 801F60B4 80 A5 00 04 */ lwz r5, 4(r5) -/* 801F60B8 88 05 00 B2 */ lbz r0, 0xb2(r5) -/* 801F60BC 28 00 00 00 */ cmplwi r0, 0 -/* 801F60C0 41 82 00 3C */ beq lbl_801F60FC -lbl_801F60C4: -/* 801F60C4 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801F60C8 28 00 00 01 */ cmplwi r0, 1 -/* 801F60CC 40 82 00 18 */ bne lbl_801F60E4 -/* 801F60D0 80 83 01 A0 */ lwz r4, 0x1a0(r3) -/* 801F60D4 80 84 00 04 */ lwz r4, 4(r4) -/* 801F60D8 88 04 00 B2 */ lbz r0, 0xb2(r4) -/* 801F60DC 28 00 00 FF */ cmplwi r0, 0xff -/* 801F60E0 41 82 00 1C */ beq lbl_801F60FC -lbl_801F60E4: -/* 801F60E4 38 00 00 00 */ li r0, 0 -/* 801F60E8 80 83 01 A0 */ lwz r4, 0x1a0(r3) -/* 801F60EC B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F60F0 80 63 01 94 */ lwz r3, 0x194(r3) -/* 801F60F4 B0 03 00 16 */ sth r0, 0x16(r3) -/* 801F60F8 4E 80 00 20 */ blr -lbl_801F60FC: -/* 801F60FC 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F6100 38 A4 E8 4C */ addi r5, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F6104 88 05 00 08 */ lbz r0, 8(r5) -/* 801F6108 80 83 01 A0 */ lwz r4, 0x1a0(r3) -/* 801F610C B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6110 88 05 00 08 */ lbz r0, 8(r5) -/* 801F6114 80 63 01 94 */ lwz r3, 0x194(r3) -/* 801F6118 B0 03 00 16 */ sth r0, 0x16(r3) -/* 801F611C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/modoruTxtDispAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/modoruTxtDispAnm__12dMenu_save_cFv.s deleted file mode 100644 index 8d7192d499..0000000000 --- a/asm/d/menu/d_menu_save/modoruTxtDispAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,60 +0,0 @@ -lbl_801F6120: -/* 801F6120 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F6124 7C 08 02 A6 */ mflr r0 -/* 801F6128 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F612C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6130 48 16 C0 AD */ bl _savegpr_29 -/* 801F6134 7C 7D 1B 78 */ mr r29, r3 -/* 801F6138 88 03 01 A8 */ lbz r0, 0x1a8(r3) -/* 801F613C 28 00 00 00 */ cmplwi r0, 0 -/* 801F6140 41 82 00 44 */ beq lbl_801F6184 -/* 801F6144 80 7D 01 A0 */ lwz r3, 0x1a0(r29) -/* 801F6148 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F614C 3B E4 E8 4C */ addi r31, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F6150 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F6154 38 A0 00 00 */ li r5, 0 -/* 801F6158 38 C0 00 FF */ li r6, 0xff -/* 801F615C 38 E0 00 00 */ li r7, 0 -/* 801F6160 48 05 F7 19 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F6164 7C 7E 1B 78 */ mr r30, r3 -/* 801F6168 80 7D 01 94 */ lwz r3, 0x194(r29) -/* 801F616C 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F6170 38 A0 00 80 */ li r5, 0x80 -/* 801F6174 38 C0 00 FF */ li r6, 0xff -/* 801F6178 38 E0 00 00 */ li r7, 0 -/* 801F617C 48 05 F6 FD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F6180 48 00 00 40 */ b lbl_801F61C0 -lbl_801F6184: -/* 801F6184 80 7D 01 A0 */ lwz r3, 0x1a0(r29) -/* 801F6188 3C 80 80 43 */ lis r4, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F618C 3B E4 E8 4C */ addi r31, r4, g_msHIO@l /* 0x8042E84C@l */ -/* 801F6190 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F6194 38 A0 00 FF */ li r5, 0xff -/* 801F6198 38 C0 00 00 */ li r6, 0 -/* 801F619C 38 E0 00 00 */ li r7, 0 -/* 801F61A0 48 05 F6 D9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F61A4 7C 7E 1B 78 */ mr r30, r3 -/* 801F61A8 80 7D 01 94 */ lwz r3, 0x194(r29) -/* 801F61AC 88 9F 00 08 */ lbz r4, 8(r31) -/* 801F61B0 38 A0 00 FF */ li r5, 0xff -/* 801F61B4 38 C0 00 80 */ li r6, 0x80 -/* 801F61B8 38 E0 00 00 */ li r7, 0 -/* 801F61BC 48 05 F6 BD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -lbl_801F61C0: -/* 801F61C0 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F61C4 28 00 00 01 */ cmplwi r0, 1 -/* 801F61C8 40 82 00 18 */ bne lbl_801F61E0 -/* 801F61CC 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F61D0 28 00 00 01 */ cmplwi r0, 1 -/* 801F61D4 40 82 00 0C */ bne lbl_801F61E0 -/* 801F61D8 38 60 00 01 */ li r3, 1 -/* 801F61DC 48 00 00 08 */ b lbl_801F61E4 -lbl_801F61E0: -/* 801F61E0 38 60 00 00 */ li r3, 0 -lbl_801F61E4: -/* 801F61E4 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F61E8 48 16 C0 41 */ bl _restgpr_29 -/* 801F61EC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F61F0 7C 08 03 A6 */ mtlr r0 -/* 801F61F4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F61F8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/msgWindowClose__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/msgWindowClose__12dMenu_save_cFv.s deleted file mode 100644 index 47c764f630..0000000000 --- a/asm/d/menu/d_menu_save/msgWindowClose__12dMenu_save_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801F4DAC: -/* 801F4DAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F4DB0 7C 08 02 A6 */ mflr r0 -/* 801F4DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F4DB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F4DBC 93 C1 00 08 */ stw r30, 8(r1) -/* 801F4DC0 7C 7E 1B 78 */ mr r30, r3 -/* 801F4DC4 48 00 11 C1 */ bl errorMoveAnm__12dMenu_save_cFv -/* 801F4DC8 7C 7F 1B 78 */ mr r31, r3 -/* 801F4DCC 38 60 00 01 */ li r3, 1 -/* 801F4DD0 88 1E 00 9C */ lbz r0, 0x9c(r30) -/* 801F4DD4 28 00 00 00 */ cmplwi r0, 0 -/* 801F4DD8 41 82 00 0C */ beq lbl_801F4DE4 -/* 801F4DDC 7F C3 F3 78 */ mr r3, r30 -/* 801F4DE0 48 00 0A E9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -lbl_801F4DE4: -/* 801F4DE4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F4DE8 28 00 00 01 */ cmplwi r0, 1 -/* 801F4DEC 40 82 00 44 */ bne lbl_801F4E30 -/* 801F4DF0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F4DF4 28 00 00 01 */ cmplwi r0, 1 -/* 801F4DF8 40 82 00 38 */ bne lbl_801F4E30 -/* 801F4DFC 38 00 00 00 */ li r0, 0 -/* 801F4E00 98 1E 00 9E */ stb r0, 0x9e(r30) -/* 801F4E04 38 7E 01 C4 */ addi r3, r30, 0x1c4 -/* 801F4E08 48 16 D2 11 */ bl __ptmf_test -/* 801F4E0C 2C 03 00 00 */ cmpwi r3, 0 -/* 801F4E10 41 82 00 18 */ beq lbl_801F4E28 -/* 801F4E14 7F C3 F3 78 */ mr r3, r30 -/* 801F4E18 39 9E 01 C4 */ addi r12, r30, 0x1c4 -/* 801F4E1C 48 16 D2 69 */ bl __ptmf_scall -/* 801F4E20 60 00 00 00 */ nop -/* 801F4E24 48 00 00 0C */ b lbl_801F4E30 -lbl_801F4E28: -/* 801F4E28 88 1E 01 B4 */ lbz r0, 0x1b4(r30) -/* 801F4E2C 98 1E 01 B2 */ stb r0, 0x1b2(r30) -lbl_801F4E30: -/* 801F4E30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F4E34 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F4E38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F4E3C 7C 08 03 A6 */ mtlr r0 -/* 801F4E40 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F4E44 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/msgWindowInitOpen__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/msgWindowInitOpen__12dMenu_save_cFv.s deleted file mode 100644 index 2e684c9a37..0000000000 --- a/asm/d/menu/d_menu_save/msgWindowInitOpen__12dMenu_save_cFv.s +++ /dev/null @@ -1,110 +0,0 @@ -lbl_801F4B84: -/* 801F4B84 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F4B88 7C 08 02 A6 */ mflr r0 -/* 801F4B8C 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F4B90 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4B94 48 16 D6 3D */ bl _savegpr_26 -/* 801F4B98 7C 7F 1B 78 */ mr r31, r3 -/* 801F4B9C 3B A0 00 01 */ li r29, 1 -/* 801F4BA0 88 03 01 7A */ lbz r0, 0x17a(r3) -/* 801F4BA4 28 00 00 00 */ cmplwi r0, 0 -/* 801F4BA8 40 82 00 0C */ bne lbl_801F4BB4 -/* 801F4BAC 4B FF FD 7D */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F4BB0 7C 7D 1B 78 */ mr r29, r3 -lbl_801F4BB4: -/* 801F4BB4 3B 80 00 01 */ li r28, 1 -/* 801F4BB8 3B 60 00 01 */ li r27, 1 -/* 801F4BBC 3B 40 00 01 */ li r26, 1 -/* 801F4BC0 88 1F 00 64 */ lbz r0, 0x64(r31) -/* 801F4BC4 28 00 00 00 */ cmplwi r0, 0 -/* 801F4BC8 40 82 00 10 */ bne lbl_801F4BD8 -/* 801F4BCC 88 1F 00 65 */ lbz r0, 0x65(r31) -/* 801F4BD0 28 00 00 00 */ cmplwi r0, 0 -/* 801F4BD4 41 82 00 10 */ beq lbl_801F4BE4 -lbl_801F4BD8: -/* 801F4BD8 7F E3 FB 78 */ mr r3, r31 -/* 801F4BDC 48 00 07 F9 */ bl selectDataBaseMoveAnm__12dMenu_save_cFv -/* 801F4BE0 7C 7C 1B 78 */ mr r28, r3 -lbl_801F4BE4: -/* 801F4BE4 88 1F 00 9C */ lbz r0, 0x9c(r31) -/* 801F4BE8 28 00 00 00 */ cmplwi r0, 0 -/* 801F4BEC 40 82 00 10 */ bne lbl_801F4BFC -/* 801F4BF0 88 1F 00 9D */ lbz r0, 0x9d(r31) -/* 801F4BF4 28 00 00 00 */ cmplwi r0, 0 -/* 801F4BF8 41 82 00 10 */ beq lbl_801F4C08 -lbl_801F4BFC: -/* 801F4BFC 7F E3 FB 78 */ mr r3, r31 -/* 801F4C00 48 00 0C C9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F4C04 7C 7B 1B 78 */ mr r27, r3 -lbl_801F4C08: -/* 801F4C08 88 1F 00 D2 */ lbz r0, 0xd2(r31) -/* 801F4C0C 28 00 00 00 */ cmplwi r0, 0 -/* 801F4C10 40 82 00 10 */ bne lbl_801F4C20 -/* 801F4C14 88 1F 00 D3 */ lbz r0, 0xd3(r31) -/* 801F4C18 28 00 00 00 */ cmplwi r0, 0 -/* 801F4C1C 41 82 00 10 */ beq lbl_801F4C2C -lbl_801F4C20: -/* 801F4C20 7F E3 FB 78 */ mr r3, r31 -/* 801F4C24 48 00 13 61 */ bl errorMoveAnm__12dMenu_save_cFv -/* 801F4C28 7C 7A 1B 78 */ mr r26, r3 -lbl_801F4C2C: -/* 801F4C2C 7F E3 FB 78 */ mr r3, r31 -/* 801F4C30 48 00 14 F1 */ bl modoruTxtDispAnm__12dMenu_save_cFv -/* 801F4C34 7C 7E 1B 78 */ mr r30, r3 -/* 801F4C38 7F E3 FB 78 */ mr r3, r31 -/* 801F4C3C 48 00 16 3D */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F4C40 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801F4C44 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C48 40 82 00 B0 */ bne lbl_801F4CF8 -/* 801F4C4C 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 801F4C50 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C54 40 82 00 A4 */ bne lbl_801F4CF8 -/* 801F4C58 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 801F4C5C 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C60 40 82 00 98 */ bne lbl_801F4CF8 -/* 801F4C64 57 40 06 3E */ clrlwi r0, r26, 0x18 -/* 801F4C68 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C6C 40 82 00 8C */ bne lbl_801F4CF8 -/* 801F4C70 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F4C74 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C78 40 82 00 80 */ bne lbl_801F4CF8 -/* 801F4C7C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F4C80 28 00 00 01 */ cmplwi r0, 1 -/* 801F4C84 40 82 00 74 */ bne lbl_801F4CF8 -/* 801F4C88 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F4C8C 81 83 00 00 */ lwz r12, 0(r3) -/* 801F4C90 81 8C 00 54 */ lwz r12, 0x54(r12) -/* 801F4C94 7D 89 03 A6 */ mtctr r12 -/* 801F4C98 4E 80 04 21 */ bctrl -/* 801F4C9C 7F E3 FB 78 */ mr r3, r31 -/* 801F4CA0 38 80 0B 21 */ li r4, 0xb21 -/* 801F4CA4 38 A0 0B 2B */ li r5, 0xb2b -/* 801F4CA8 48 00 12 4D */ bl errorMoveAnmInitSet__12dMenu_save_cFii -/* 801F4CAC 88 1F 00 9E */ lbz r0, 0x9e(r31) -/* 801F4CB0 28 00 00 00 */ cmplwi r0, 0 -/* 801F4CB4 41 82 00 28 */ beq lbl_801F4CDC -/* 801F4CB8 7F E3 FB 78 */ mr r3, r31 -/* 801F4CBC 38 80 0B B7 */ li r4, 0xbb7 -/* 801F4CC0 38 A0 0B C1 */ li r5, 0xbc1 -/* 801F4CC4 38 C0 00 00 */ li r6, 0 -/* 801F4CC8 48 00 0A 7D */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -/* 801F4CCC 7F E3 FB 78 */ mr r3, r31 -/* 801F4CD0 38 80 00 01 */ li r4, 1 -/* 801F4CD4 48 00 15 29 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc -/* 801F4CD8 48 00 00 10 */ b lbl_801F4CE8 -lbl_801F4CDC: -/* 801F4CDC 7F E3 FB 78 */ mr r3, r31 -/* 801F4CE0 38 80 00 00 */ li r4, 0 -/* 801F4CE4 48 00 15 19 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc -lbl_801F4CE8: -/* 801F4CE8 38 00 00 01 */ li r0, 1 -/* 801F4CEC 98 1F 01 7A */ stb r0, 0x17a(r31) -/* 801F4CF0 38 00 00 3A */ li r0, 0x3a -/* 801F4CF4 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F4CF8: -/* 801F4CF8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4CFC 48 16 D5 21 */ bl _restgpr_26 -/* 801F4D00 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F4D04 7C 08 03 A6 */ mtlr r0 -/* 801F4D08 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F4D0C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/msgWindowOpen__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/msgWindowOpen__12dMenu_save_cFv.s deleted file mode 100644 index d38ce8d523..0000000000 --- a/asm/d/menu/d_menu_save/msgWindowOpen__12dMenu_save_cFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_801F4D10: -/* 801F4D10 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F4D14 7C 08 02 A6 */ mflr r0 -/* 801F4D18 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F4D1C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4D20 48 16 D4 BD */ bl _savegpr_29 -/* 801F4D24 7C 7D 1B 78 */ mr r29, r3 -/* 801F4D28 48 00 12 5D */ bl errorMoveAnm__12dMenu_save_cFv -/* 801F4D2C 7C 7F 1B 78 */ mr r31, r3 -/* 801F4D30 3B C0 00 01 */ li r30, 1 -/* 801F4D34 88 1D 00 9E */ lbz r0, 0x9e(r29) -/* 801F4D38 28 00 00 00 */ cmplwi r0, 0 -/* 801F4D3C 41 82 00 10 */ beq lbl_801F4D4C -/* 801F4D40 7F A3 EB 78 */ mr r3, r29 -/* 801F4D44 48 00 0B 85 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F4D48 7C 7E 1B 78 */ mr r30, r3 -lbl_801F4D4C: -/* 801F4D4C 7F A3 EB 78 */ mr r3, r29 -/* 801F4D50 48 00 15 29 */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F4D54 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F4D58 28 00 00 01 */ cmplwi r0, 1 -/* 801F4D5C 40 82 00 38 */ bne lbl_801F4D94 -/* 801F4D60 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F4D64 28 00 00 01 */ cmplwi r0, 1 -/* 801F4D68 40 82 00 2C */ bne lbl_801F4D94 -/* 801F4D6C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F4D70 28 00 00 01 */ cmplwi r0, 1 -/* 801F4D74 40 82 00 20 */ bne lbl_801F4D94 -/* 801F4D78 88 1D 00 9E */ lbz r0, 0x9e(r29) -/* 801F4D7C 28 00 00 00 */ cmplwi r0, 0 -/* 801F4D80 41 82 00 0C */ beq lbl_801F4D8C -/* 801F4D84 7F A3 EB 78 */ mr r3, r29 -/* 801F4D88 48 00 0F FD */ bl yesnoCursorShow__12dMenu_save_cFv -lbl_801F4D8C: -/* 801F4D8C 88 1D 01 B4 */ lbz r0, 0x1b4(r29) -/* 801F4D90 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F4D94: -/* 801F4D94 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4D98 48 16 D4 91 */ bl _restgpr_29 -/* 801F4D9C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F4DA0 7C 08 03 A6 */ mtlr r0 -/* 801F4DA4 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F4DA8 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/openSaveSelect2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/openSaveSelect2__12dMenu_save_cFv.s deleted file mode 100644 index e7dcff6676..0000000000 --- a/asm/d/menu/d_menu_save/openSaveSelect2__12dMenu_save_cFv.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_801F36B4: -/* 801F36B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F36B8 7C 08 02 A6 */ mflr r0 -/* 801F36BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F36C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F36C4 93 C1 00 08 */ stw r30, 8(r1) -/* 801F36C8 7C 7F 1B 78 */ mr r31, r3 -/* 801F36CC 48 00 12 5D */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F36D0 7C 7E 1B 78 */ mr r30, r3 -/* 801F36D4 7F E3 FB 78 */ mr r3, r31 -/* 801F36D8 48 00 1C FD */ bl selectDataBaseMoveAnm__12dMenu_save_cFv -/* 801F36DC 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F36E0 28 00 00 01 */ cmplwi r0, 1 -/* 801F36E4 40 82 00 A4 */ bne lbl_801F3788 -/* 801F36E8 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F36EC 28 00 00 01 */ cmplwi r0, 1 -/* 801F36F0 40 82 00 98 */ bne lbl_801F3788 -/* 801F36F4 7F E3 FB 78 */ mr r3, r31 -/* 801F36F8 38 80 00 01 */ li r4, 1 -/* 801F36FC 48 00 29 A9 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc -/* 801F3700 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F3704 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F3708 88 03 0F 18 */ lbz r0, 0xf18(r3) -/* 801F370C 98 1F 00 54 */ stb r0, 0x54(r31) -/* 801F3710 88 1F 00 54 */ lbz r0, 0x54(r31) -/* 801F3714 98 1F 00 55 */ stb r0, 0x55(r31) -/* 801F3718 38 80 00 00 */ li r4, 0 -/* 801F371C 88 1F 00 54 */ lbz r0, 0x54(r31) -/* 801F3720 54 00 10 3A */ slwi r0, r0, 2 -/* 801F3724 7C 7F 02 14 */ add r3, r31, r0 -/* 801F3728 80 63 00 F8 */ lwz r3, 0xf8(r3) -/* 801F372C B0 83 00 16 */ sth r4, 0x16(r3) -/* 801F3730 88 1F 00 54 */ lbz r0, 0x54(r31) -/* 801F3734 54 00 10 3A */ slwi r0, r0, 2 -/* 801F3738 7C 7F 02 14 */ add r3, r31, r0 -/* 801F373C 80 63 00 68 */ lwz r3, 0x68(r3) -/* 801F3740 80 63 00 04 */ lwz r3, 4(r3) -/* 801F3744 80 9F 00 40 */ lwz r4, 0x40(r31) -/* 801F3748 81 83 00 00 */ lwz r12, 0(r3) -/* 801F374C 81 8C 00 60 */ lwz r12, 0x60(r12) -/* 801F3750 7D 89 03 A6 */ mtctr r12 -/* 801F3754 4E 80 04 21 */ bctrl -/* 801F3758 88 1F 00 54 */ lbz r0, 0x54(r31) -/* 801F375C 54 04 10 3A */ slwi r4, r0, 2 -/* 801F3760 3C 60 80 3C */ lis r3, SelStartFrameTbl@ha /* 0x803BDF84@ha */ -/* 801F3764 38 63 DF 84 */ addi r3, r3, SelStartFrameTbl@l /* 0x803BDF84@l */ -/* 801F3768 7C 03 20 2E */ lwzx r0, r3, r4 -/* 801F376C 7C 7F 22 14 */ add r3, r31, r4 -/* 801F3770 90 03 00 74 */ stw r0, 0x74(r3) -/* 801F3774 7F E3 FB 78 */ mr r3, r31 -/* 801F3778 38 80 00 01 */ li r4, 1 -/* 801F377C 48 00 2A 81 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc -/* 801F3780 38 00 00 30 */ li r0, 0x30 -/* 801F3784 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F3788: -/* 801F3788 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F378C 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F3790 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F3794 7C 08 03 A6 */ mtlr r0 -/* 801F3798 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F379C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/restartInit__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/restartInit__12dMenu_save_cFv.s deleted file mode 100644 index 83340bff68..0000000000 --- a/asm/d/menu/d_menu_save/restartInit__12dMenu_save_cFv.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_801F30B8: -/* 801F30B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F30BC 7C 08 02 A6 */ mflr r0 -/* 801F30C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F30C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F30C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F30CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F30D0 3B E3 07 F0 */ addi r31, r3, 0x7f0 -/* 801F30D4 7F E3 FB 78 */ mr r3, r31 -/* 801F30D8 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801F30DC 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801F30E0 A0 84 01 C4 */ lhz r4, 0x1c4(r4) -/* 801F30E4 4B E4 18 D9 */ bl isEventBit__11dSv_event_cCFUs -/* 801F30E8 2C 03 00 00 */ cmpwi r3, 0 -/* 801F30EC 40 82 00 2C */ bne lbl_801F3118 -/* 801F30F0 7F E3 FB 78 */ mr r3, r31 -/* 801F30F4 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801F30F8 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801F30FC A0 84 01 C0 */ lhz r4, 0x1c0(r4) -/* 801F3100 4B E4 18 A5 */ bl offEventBit__11dSv_event_cFUs -/* 801F3104 7F E3 FB 78 */ mr r3, r31 -/* 801F3108 3C 80 80 3A */ lis r4, saveBitLabels__16dSv_event_flag_c@ha /* 0x803A7288@ha */ -/* 801F310C 38 84 72 88 */ addi r4, r4, saveBitLabels__16dSv_event_flag_c@l /* 0x803A7288@l */ -/* 801F3110 A0 84 01 C2 */ lhz r4, 0x1c2(r4) -/* 801F3114 4B E4 18 91 */ bl offEventBit__11dSv_event_cFUs -lbl_801F3118: -/* 801F3118 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F311C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F3120 38 63 00 CC */ addi r3, r3, 0xcc -/* 801F3124 38 80 00 48 */ li r4, 0x48 -/* 801F3128 4B E4 0D A1 */ bl isFirstBit__21dSv_player_get_item_cCFUc -/* 801F312C 2C 03 00 00 */ cmpwi r3, 0 -/* 801F3130 41 82 00 54 */ beq lbl_801F3184 -/* 801F3134 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F3138 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F313C 3B E3 00 9C */ addi r31, r3, 0x9c -/* 801F3140 7F E3 FB 78 */ mr r3, r31 -/* 801F3144 38 80 00 01 */ li r4, 1 -/* 801F3148 38 A0 00 01 */ li r5, 1 -/* 801F314C 4B E3 FE E5 */ bl getItem__17dSv_player_item_cCFib -/* 801F3150 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F3154 28 00 00 FF */ cmplwi r0, 0xff -/* 801F3158 40 82 00 2C */ bne lbl_801F3184 -/* 801F315C 7F E3 FB 78 */ mr r3, r31 -/* 801F3160 38 80 00 01 */ li r4, 1 -/* 801F3164 38 A0 00 48 */ li r5, 0x48 -/* 801F3168 4B E3 FE 51 */ bl setItem__17dSv_player_item_cFiUc -/* 801F316C 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F3170 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801F3174 A0 03 00 B6 */ lhz r0, 0xb6(r3) -/* 801F3178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 801F317C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 801F3180 B0 03 00 08 */ sth r0, 8(r3) -lbl_801F3184: -/* 801F3184 3C 60 80 43 */ lis r3, g_meter2_info@ha /* 0x80430188@ha */ -/* 801F3188 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ -/* 801F318C 88 83 00 DD */ lbz r4, 0xdd(r3) -/* 801F3190 28 04 00 00 */ cmplwi r4, 0 -/* 801F3194 41 82 00 08 */ beq lbl_801F319C -/* 801F3198 48 02 AC 81 */ bl setMiniGameItem__13dMeter2Info_cFUc -lbl_801F319C: -/* 801F319C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F31A0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F31A4 7C 08 03 A6 */ mtlr r0 -/* 801F31A8 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F31AC 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/retryQuestion0__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/retryQuestion0__12dMenu_save_cFv.s deleted file mode 100644 index 75e58de19c..0000000000 --- a/asm/d/menu/d_menu_save/retryQuestion0__12dMenu_save_cFv.s +++ /dev/null @@ -1,28 +0,0 @@ -lbl_801F2F4C: -/* 801F2F4C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2F50 7C 08 02 A6 */ mflr r0 -/* 801F2F54 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2F58 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2F5C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2F60 80 6D 8D E8 */ lwz r3, mAudioMgrPtr__10Z2AudioMgr(r13) -/* 801F2F64 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 801F2F68 3C 80 01 00 */ lis r4, 0x0100 /* 0x01000013@ha */ -/* 801F2F6C 38 84 00 13 */ addi r4, r4, 0x0013 /* 0x01000013@l */ -/* 801F2F70 48 0C 0F 3D */ bl checkBgmIDPlaying__8Z2SeqMgrFUl -/* 801F2F74 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F2F78 28 00 00 01 */ cmplwi r0, 1 -/* 801F2F7C 41 82 00 24 */ beq lbl_801F2FA0 -/* 801F2F80 38 00 00 01 */ li r0, 1 -/* 801F2F84 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F2F88 7F E3 FB 78 */ mr r3, r31 -/* 801F2F8C 38 80 04 BC */ li r4, 0x4bc -/* 801F2F90 38 A0 00 00 */ li r5, 0 -/* 801F2F94 48 00 05 29 */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F2F98 38 00 00 2C */ li r0, 0x2c -/* 801F2F9C 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F2FA0: -/* 801F2FA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2FA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2FA8 7C 08 03 A6 */ mtlr r0 -/* 801F2FAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2FB0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/retryQuestion1__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/retryQuestion1__12dMenu_save_cFv.s deleted file mode 100644 index a7ca376e5f..0000000000 --- a/asm/d/menu/d_menu_save/retryQuestion1__12dMenu_save_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_801F2FB4: -/* 801F2FB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2FB8 7C 08 02 A6 */ mflr r0 -/* 801F2FBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2FC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2FC4 7C 7F 1B 78 */ mr r31, r3 -/* 801F2FC8 48 00 02 C5 */ bl YesNoSelect__12dMenu_save_cFv -/* 801F2FCC 2C 03 00 00 */ cmpwi r3, 0 -/* 801F2FD0 41 82 00 5C */ beq lbl_801F302C -/* 801F2FD4 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F2FD8 28 00 00 01 */ cmplwi r0, 1 -/* 801F2FDC 40 82 00 28 */ bne lbl_801F3004 -/* 801F2FE0 38 00 00 01 */ li r0, 1 -/* 801F2FE4 98 1F 01 BB */ stb r0, 0x1bb(r31) -/* 801F2FE8 7F E3 FB 78 */ mr r3, r31 -/* 801F2FEC 48 00 00 CD */ bl restartInit__12dMenu_save_cFv -/* 801F2FF0 38 00 00 03 */ li r0, 3 -/* 801F2FF4 98 1F 01 BA */ stb r0, 0x1ba(r31) -/* 801F2FF8 38 00 00 29 */ li r0, 0x29 -/* 801F2FFC 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F3000 48 00 00 2C */ b lbl_801F302C -lbl_801F3004: -/* 801F3004 38 00 00 01 */ li r0, 1 -/* 801F3008 98 1F 21 90 */ stb r0, 0x2190(r31) -/* 801F300C 38 00 00 00 */ li r0, 0 -/* 801F3010 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F3014 7F E3 FB 78 */ mr r3, r31 -/* 801F3018 38 80 04 BF */ li r4, 0x4bf -/* 801F301C 38 A0 00 00 */ li r5, 0 -/* 801F3020 48 00 04 9D */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F3024 38 00 00 2D */ li r0, 0x2d -/* 801F3028 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F302C: -/* 801F302C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F3030 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F3034 7C 08 03 A6 */ mtlr r0 -/* 801F3038 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F303C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/retryQuestion2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/retryQuestion2__12dMenu_save_cFv.s deleted file mode 100644 index 4871a2fac2..0000000000 --- a/asm/d/menu/d_menu_save/retryQuestion2__12dMenu_save_cFv.s +++ /dev/null @@ -1,33 +0,0 @@ -lbl_801F3040: -/* 801F3040 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F3044 7C 08 02 A6 */ mflr r0 -/* 801F3048 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F304C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F3050 7C 7F 1B 78 */ mr r31, r3 -/* 801F3054 48 00 02 39 */ bl YesNoSelect__12dMenu_save_cFv -/* 801F3058 2C 03 00 00 */ cmpwi r3, 0 -/* 801F305C 41 82 00 48 */ beq lbl_801F30A4 -/* 801F3060 88 1F 01 B6 */ lbz r0, 0x1b6(r31) -/* 801F3064 28 00 00 01 */ cmplwi r0, 1 -/* 801F3068 40 82 00 18 */ bne lbl_801F3080 -/* 801F306C 38 00 00 0F */ li r0, 0xf -/* 801F3070 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F3074 38 00 00 24 */ li r0, 0x24 -/* 801F3078 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F307C 48 00 00 28 */ b lbl_801F30A4 -lbl_801F3080: -/* 801F3080 38 00 00 01 */ li r0, 1 -/* 801F3084 98 1F 21 90 */ stb r0, 0x2190(r31) -/* 801F3088 98 1F 01 B6 */ stb r0, 0x1b6(r31) -/* 801F308C 7F E3 FB 78 */ mr r3, r31 -/* 801F3090 38 80 04 BC */ li r4, 0x4bc -/* 801F3094 38 A0 00 00 */ li r5, 0 -/* 801F3098 48 00 04 25 */ bl msgTxtSet__12dMenu_save_cFUsb -/* 801F309C 38 00 00 2C */ li r0, 0x2c -/* 801F30A0 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F30A4: -/* 801F30A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F30A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F30AC 7C 08 03 A6 */ mtlr r0 -/* 801F30B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F30B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveEnd__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveEnd__12dMenu_save_cFv.s deleted file mode 100644 index 94eac10c91..0000000000 --- a/asm/d/menu/d_menu_save/saveEnd__12dMenu_save_cFv.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_801F2DD4: -/* 801F2DD4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F2DD8 7C 08 02 A6 */ mflr r0 -/* 801F2DDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F2DE0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F2DE4 93 C1 00 08 */ stw r30, 8(r1) -/* 801F2DE8 7C 7E 1B 78 */ mr r30, r3 -/* 801F2DEC 48 00 1B 3D */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F2DF0 7C 7F 1B 78 */ mr r31, r3 -/* 801F2DF4 7F C3 F3 78 */ mr r3, r30 -/* 801F2DF8 48 00 34 81 */ bl ketteiTxtDispAnm__12dMenu_save_cFv -/* 801F2DFC 80 9E 00 30 */ lwz r4, 0x30(r30) -/* 801F2E00 88 84 00 3D */ lbz r4, 0x3d(r4) -/* 801F2E04 30 04 FF FF */ addic r0, r4, -1 -/* 801F2E08 7C 00 21 10 */ subfe r0, r0, r4 -/* 801F2E0C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801F2E10 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F2E14 28 00 00 01 */ cmplwi r0, 1 -/* 801F2E18 40 82 00 58 */ bne lbl_801F2E70 -/* 801F2E1C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F2E20 28 00 00 01 */ cmplwi r0, 1 -/* 801F2E24 40 82 00 4C */ bne lbl_801F2E70 -/* 801F2E28 28 04 00 01 */ cmplwi r4, 1 -/* 801F2E2C 40 82 00 44 */ bne lbl_801F2E70 -/* 801F2E30 88 1E 01 BC */ lbz r0, 0x1bc(r30) -/* 801F2E34 28 00 00 04 */ cmplwi r0, 4 -/* 801F2E38 40 82 00 18 */ bne lbl_801F2E50 -/* 801F2E3C 38 00 00 04 */ li r0, 4 -/* 801F2E40 98 1E 01 BA */ stb r0, 0x1ba(r30) -/* 801F2E44 7F C3 F3 78 */ mr r3, r30 -/* 801F2E48 4B FF ED B1 */ bl closeSelect2__12dMenu_save_cFv -/* 801F2E4C 48 00 00 24 */ b lbl_801F2E70 -lbl_801F2E50: -/* 801F2E50 38 00 00 01 */ li r0, 1 -/* 801F2E54 98 1E 01 BB */ stb r0, 0x1bb(r30) -/* 801F2E58 7F C3 F3 78 */ mr r3, r30 -/* 801F2E5C 48 00 02 5D */ bl restartInit__12dMenu_save_cFv -/* 801F2E60 38 00 00 03 */ li r0, 3 -/* 801F2E64 98 1E 01 BA */ stb r0, 0x1ba(r30) -/* 801F2E68 38 00 00 29 */ li r0, 0x29 -/* 801F2E6C 98 1E 01 B2 */ stb r0, 0x1b2(r30) -lbl_801F2E70: -/* 801F2E70 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F2E74 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F2E78 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F2E7C 7C 08 03 A6 */ mtlr r0 -/* 801F2E80 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F2E84 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveGuide__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveGuide__12dMenu_save_cFv.s deleted file mode 100644 index 4bc8ecefbb..0000000000 --- a/asm/d/menu/d_menu_save/saveGuide__12dMenu_save_cFv.s +++ /dev/null @@ -1,12 +0,0 @@ -lbl_801F16F4: -/* 801F16F4 80 83 21 8C */ lwz r4, 0x218c(r3) -/* 801F16F8 88 04 00 60 */ lbz r0, 0x60(r4) -/* 801F16FC 28 00 00 00 */ cmplwi r0, 0 -/* 801F1700 4C 82 00 20 */ bnelr -/* 801F1704 38 00 00 01 */ li r0, 1 -/* 801F1708 98 03 01 BB */ stb r0, 0x1bb(r3) -/* 801F170C 38 00 00 03 */ li r0, 3 -/* 801F1710 98 03 01 BA */ stb r0, 0x1ba(r3) -/* 801F1714 38 00 00 29 */ li r0, 0x29 -/* 801F1718 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F171C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveQuestion21__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveQuestion21__12dMenu_save_cFv.s deleted file mode 100644 index 3f803f8268..0000000000 --- a/asm/d/menu/d_menu_save/saveQuestion21__12dMenu_save_cFv.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_801F1620: -/* 801F1620 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F1624 28 04 00 00 */ cmplwi r4, 0 -/* 801F1628 41 82 00 10 */ beq lbl_801F1638 -/* 801F162C 38 04 FF FF */ addi r0, r4, -1 -/* 801F1630 98 03 01 BD */ stb r0, 0x1bd(r3) -/* 801F1634 4E 80 00 20 */ blr -lbl_801F1638: -/* 801F1638 38 00 00 03 */ li r0, 3 -/* 801F163C 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F1640 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveQuestion2__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveQuestion2__12dMenu_save_cFv.s deleted file mode 100644 index 9bce406e71..0000000000 --- a/asm/d/menu/d_menu_save/saveQuestion2__12dMenu_save_cFv.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_801F1558: -/* 801F1558 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F155C 7C 08 02 A6 */ mflr r0 -/* 801F1560 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1564 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1568 7C 7F 1B 78 */ mr r31, r3 -/* 801F156C 80 63 21 8C */ lwz r3, 0x218c(r3) -/* 801F1570 28 03 00 00 */ cmplwi r3, 0 -/* 801F1574 41 82 00 98 */ beq lbl_801F160C -/* 801F1578 88 03 00 60 */ lbz r0, 0x60(r3) -/* 801F157C 28 00 00 00 */ cmplwi r0, 0 -/* 801F1580 40 82 00 8C */ bne lbl_801F160C -/* 801F1584 88 1F 01 BC */ lbz r0, 0x1bc(r31) -/* 801F1588 28 00 00 04 */ cmplwi r0, 4 -/* 801F158C 40 82 00 4C */ bne lbl_801F15D8 -/* 801F1590 3C 60 80 43 */ lis r3, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F1594 38 63 E8 4C */ addi r3, r3, g_msHIO@l /* 0x8042E84C@l */ -/* 801F1598 88 03 00 0B */ lbz r0, 0xb(r3) -/* 801F159C 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F15A0 88 9F 01 BD */ lbz r4, 0x1bd(r31) -/* 801F15A4 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F15A8 80 63 00 04 */ lwz r3, 4(r3) -/* 801F15AC 28 03 00 00 */ cmplwi r3, 0 -/* 801F15B0 41 82 00 14 */ beq lbl_801F15C4 -/* 801F15B4 81 83 00 00 */ lwz r12, 0(r3) -/* 801F15B8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801F15BC 7D 89 03 A6 */ mtctr r12 -/* 801F15C0 4E 80 04 21 */ bctrl -lbl_801F15C4: -/* 801F15C4 38 00 00 01 */ li r0, 1 -/* 801F15C8 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F15CC 38 00 00 02 */ li r0, 2 -/* 801F15D0 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F15D4 48 00 00 38 */ b lbl_801F160C -lbl_801F15D8: -/* 801F15D8 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F15DC 80 63 00 04 */ lwz r3, 4(r3) -/* 801F15E0 28 03 00 00 */ cmplwi r3, 0 -/* 801F15E4 41 82 00 18 */ beq lbl_801F15FC -/* 801F15E8 38 80 00 01 */ li r4, 1 -/* 801F15EC 81 83 00 00 */ lwz r12, 0(r3) -/* 801F15F0 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 801F15F4 7D 89 03 A6 */ mtctr r12 -/* 801F15F8 4E 80 04 21 */ bctrl -lbl_801F15FC: -/* 801F15FC 38 00 00 01 */ li r0, 1 -/* 801F1600 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F1604 38 00 00 03 */ li r0, 3 -/* 801F1608 98 1F 01 B2 */ stb r0, 0x1b2(r31) -lbl_801F160C: -/* 801F160C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F1610 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F1614 7C 08 03 A6 */ mtlr r0 -/* 801F1618 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F161C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveQuestion3__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveQuestion3__12dMenu_save_cFv.s deleted file mode 100644 index f13c2e5867..0000000000 --- a/asm/d/menu/d_menu_save/saveQuestion3__12dMenu_save_cFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_801F1644: -/* 801F1644 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F1648 7C 08 02 A6 */ mflr r0 -/* 801F164C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F1650 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F1654 7C 7F 1B 78 */ mr r31, r3 -/* 801F1658 38 00 00 01 */ li r0, 1 -/* 801F165C 98 03 01 B0 */ stb r0, 0x1b0(r3) -/* 801F1660 3C 60 80 43 */ lis r3, g_msHIO@ha /* 0x8042E84C@ha */ -/* 801F1664 38 63 E8 4C */ addi r3, r3, g_msHIO@l /* 0x8042E84C@l */ -/* 801F1668 88 03 00 0B */ lbz r0, 0xb(r3) -/* 801F166C 98 1F 01 BD */ stb r0, 0x1bd(r31) -/* 801F1670 88 9F 01 BD */ lbz r4, 0x1bd(r31) -/* 801F1674 80 6D 8C 40 */ lwz r3, sManager__10JFWDisplay(r13) -/* 801F1678 80 63 00 04 */ lwz r3, 4(r3) -/* 801F167C 28 03 00 00 */ cmplwi r3, 0 -/* 801F1680 41 82 00 14 */ beq lbl_801F1694 -/* 801F1684 81 83 00 00 */ lwz r12, 0(r3) -/* 801F1688 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 801F168C 7D 89 03 A6 */ mtctr r12 -/* 801F1690 4E 80 04 21 */ bctrl -lbl_801F1694: -/* 801F1694 38 00 00 00 */ li r0, 0 -/* 801F1698 98 1F 21 A0 */ stb r0, 0x21a0(r31) -/* 801F169C 38 00 00 04 */ li r0, 4 -/* 801F16A0 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F16A4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F16A8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F16AC 7C 08 03 A6 */ mtlr r0 -/* 801F16B0 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F16B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveQuestion4__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveQuestion4__12dMenu_save_cFv.s deleted file mode 100644 index 90d7f1601d..0000000000 --- a/asm/d/menu/d_menu_save/saveQuestion4__12dMenu_save_cFv.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_801F16B8: -/* 801F16B8 80 8D 86 F8 */ lwz r4, mResetData__6mDoRst(r13) -/* 801F16BC 80 04 00 00 */ lwz r0, 0(r4) -/* 801F16C0 2C 00 00 00 */ cmpwi r0, 0 -/* 801F16C4 4C 82 00 20 */ bnelr -/* 801F16C8 88 83 01 BD */ lbz r4, 0x1bd(r3) -/* 801F16CC 28 04 00 00 */ cmplwi r4, 0 -/* 801F16D0 41 82 00 10 */ beq lbl_801F16E0 -/* 801F16D4 38 04 FF FF */ addi r0, r4, -1 -/* 801F16D8 98 03 01 BD */ stb r0, 0x1bd(r3) -/* 801F16DC 4E 80 00 20 */ blr -lbl_801F16E0: -/* 801F16E0 38 00 00 00 */ li r0, 0 -/* 801F16E4 98 03 01 BF */ stb r0, 0x1bf(r3) -/* 801F16E8 38 00 00 06 */ li r0, 6 -/* 801F16EC 98 03 01 B2 */ stb r0, 0x1b2(r3) -/* 801F16F0 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveSelectOpenAnmSet__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveSelectOpenAnmSet__12dMenu_save_cFv.s deleted file mode 100644 index 561af463b5..0000000000 --- a/asm/d/menu/d_menu_save/saveSelectOpenAnmSet__12dMenu_save_cFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801F54C0: -/* 801F54C0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F54C4 7C 08 02 A6 */ mflr r0 -/* 801F54C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F54CC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F54D0 7C 7F 1B 78 */ mr r31, r3 -/* 801F54D4 48 00 13 1D */ bl setSaveData__12dMenu_save_cFv -/* 801F54D8 88 1F 00 64 */ lbz r0, 0x64(r31) -/* 801F54DC 28 00 00 00 */ cmplwi r0, 0 -/* 801F54E0 40 82 00 14 */ bne lbl_801F54F4 -/* 801F54E4 7F E3 FB 78 */ mr r3, r31 -/* 801F54E8 38 80 00 01 */ li r4, 1 -/* 801F54EC 38 A0 00 21 */ li r5, 0x21 -/* 801F54F0 4B FF FE 4D */ bl selectDataBaseMoveAnmInitSet__12dMenu_save_cFii -lbl_801F54F4: -/* 801F54F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F54F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F54FC 7C 08 03 A6 */ mtlr r0 -/* 801F5500 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5504 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveSelectOpenInit__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveSelectOpenInit__12dMenu_save_cFv.s deleted file mode 100644 index 3e648d7857..0000000000 --- a/asm/d/menu/d_menu_save/saveSelectOpenInit__12dMenu_save_cFv.s +++ /dev/null @@ -1,56 +0,0 @@ -lbl_801F5278: -/* 801F5278 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F527C 7C 08 02 A6 */ mflr r0 -/* 801F5280 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F5284 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F5288 7C 7F 1B 78 */ mr r31, r3 -/* 801F528C 88 03 00 64 */ lbz r0, 0x64(r3) -/* 801F5290 28 00 00 00 */ cmplwi r0, 0 -/* 801F5294 40 82 00 10 */ bne lbl_801F52A4 -/* 801F5298 88 1F 00 65 */ lbz r0, 0x65(r31) -/* 801F529C 28 00 00 00 */ cmplwi r0, 0 -/* 801F52A0 41 82 00 14 */ beq lbl_801F52B4 -lbl_801F52A4: -/* 801F52A4 7F E3 FB 78 */ mr r3, r31 -/* 801F52A8 38 80 00 21 */ li r4, 0x21 -/* 801F52AC 38 A0 00 01 */ li r5, 1 -/* 801F52B0 48 00 00 8D */ bl selectDataBaseMoveAnmInitSet__12dMenu_save_cFii -lbl_801F52B4: -/* 801F52B4 88 1F 00 D2 */ lbz r0, 0xd2(r31) -/* 801F52B8 28 00 00 00 */ cmplwi r0, 0 -/* 801F52BC 40 82 00 10 */ bne lbl_801F52CC -/* 801F52C0 88 1F 00 D3 */ lbz r0, 0xd3(r31) -/* 801F52C4 28 00 00 00 */ cmplwi r0, 0 -/* 801F52C8 41 82 00 14 */ beq lbl_801F52DC -lbl_801F52CC: -/* 801F52CC 7F E3 FB 78 */ mr r3, r31 -/* 801F52D0 38 80 0B 2B */ li r4, 0xb2b -/* 801F52D4 38 A0 0B 21 */ li r5, 0xb21 -/* 801F52D8 48 00 0C 1D */ bl errorMoveAnmInitSet__12dMenu_save_cFii -lbl_801F52DC: -/* 801F52DC 88 1F 00 9C */ lbz r0, 0x9c(r31) -/* 801F52E0 28 00 00 00 */ cmplwi r0, 0 -/* 801F52E4 40 82 00 08 */ bne lbl_801F52EC -/* 801F52E8 41 82 00 18 */ beq lbl_801F5300 -lbl_801F52EC: -/* 801F52EC 7F E3 FB 78 */ mr r3, r31 -/* 801F52F0 38 80 08 33 */ li r4, 0x833 -/* 801F52F4 38 A0 08 29 */ li r5, 0x829 -/* 801F52F8 38 C0 00 00 */ li r6, 0 -/* 801F52FC 48 00 04 49 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc -lbl_801F5300: -/* 801F5300 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F5304 4B F9 CE 5D */ bl init__15dFile_warning_cFv -/* 801F5308 7F E3 FB 78 */ mr r3, r31 -/* 801F530C 3C 80 00 01 */ lis r4, 0x0001 /* 0x0000FFFF@ha */ -/* 801F5310 38 84 FF FF */ addi r4, r4, 0xFFFF /* 0x0000FFFF@l */ -/* 801F5314 4B FF F5 49 */ bl headerTxtSet__12dMenu_save_cFUs -/* 801F5318 38 00 00 00 */ li r0, 0 -/* 801F531C 98 1F 01 7A */ stb r0, 0x17a(r31) -/* 801F5320 38 00 00 2E */ li r0, 0x2e -/* 801F5324 98 1F 01 B2 */ stb r0, 0x1b2(r31) -/* 801F5328 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F532C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F5330 7C 08 03 A6 */ mtlr r0 -/* 801F5334 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F5338 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/saveYesNoCancelMove__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/saveYesNoCancelMove__12dMenu_save_cFv.s deleted file mode 100644 index f577cff66f..0000000000 --- a/asm/d/menu/d_menu_save/saveYesNoCancelMove__12dMenu_save_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_801F47DC: -/* 801F47DC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F47E0 7C 08 02 A6 */ mflr r0 -/* 801F47E4 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F47E8 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F47EC 48 16 D9 F1 */ bl _savegpr_29 -/* 801F47F0 7C 7D 1B 78 */ mr r29, r3 -/* 801F47F4 48 00 01 35 */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F47F8 7C 7E 1B 78 */ mr r30, r3 -/* 801F47FC 7F A3 EB 78 */ mr r3, r29 -/* 801F4800 48 00 10 C9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F4804 7C 7F 1B 78 */ mr r31, r3 -/* 801F4808 7F A3 EB 78 */ mr r3, r29 -/* 801F480C 48 00 0D F5 */ bl selectDataMoveAnm__12dMenu_save_cFv -/* 801F4810 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F4814 28 00 00 01 */ cmplwi r0, 1 -/* 801F4818 40 82 00 2C */ bne lbl_801F4844 -/* 801F481C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F4820 28 00 00 01 */ cmplwi r0, 1 -/* 801F4824 40 82 00 20 */ bne lbl_801F4844 -/* 801F4828 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F482C 28 00 00 01 */ cmplwi r0, 1 -/* 801F4830 40 82 00 14 */ bne lbl_801F4844 -/* 801F4834 7F A3 EB 78 */ mr r3, r29 -/* 801F4838 48 00 1C 21 */ bl selFileCursorShow__12dMenu_save_cFv -/* 801F483C 38 00 00 31 */ li r0, 0x31 -/* 801F4840 98 1D 01 B2 */ stb r0, 0x1b2(r29) -lbl_801F4844: -/* 801F4844 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F4848 48 16 D9 E1 */ bl _restgpr_29 -/* 801F484C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F4850 7C 08 03 A6 */ mtlr r0 -/* 801F4854 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F4858 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/selectDataOpenMove__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/selectDataOpenMove__12dMenu_save_cFv.s deleted file mode 100644 index f0be43fb10..0000000000 --- a/asm/d/menu/d_menu_save/selectDataOpenMove__12dMenu_save_cFv.s +++ /dev/null @@ -1,41 +0,0 @@ -lbl_801F3BE0: -/* 801F3BE0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F3BE4 7C 08 02 A6 */ mflr r0 -/* 801F3BE8 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F3BEC 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3BF0 48 16 E5 E9 */ bl _savegpr_28 -/* 801F3BF4 7C 7C 1B 78 */ mr r28, r3 -/* 801F3BF8 48 00 0D 31 */ bl headerTxtChangeAnm__12dMenu_save_cFv -/* 801F3BFC 7C 7D 1B 78 */ mr r29, r3 -/* 801F3C00 7F 83 E3 78 */ mr r3, r28 -/* 801F3C04 48 00 19 FD */ bl selectDataMoveAnm__12dMenu_save_cFv -/* 801F3C08 7C 7E 1B 78 */ mr r30, r3 -/* 801F3C0C 7F 83 E3 78 */ mr r3, r28 -/* 801F3C10 48 00 1C B9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv -/* 801F3C14 7C 7F 1B 78 */ mr r31, r3 -/* 801F3C18 7F 83 E3 78 */ mr r3, r28 -/* 801F3C1C 88 9C 00 54 */ lbz r4, 0x54(r28) -/* 801F3C20 48 00 27 71 */ bl selectWakuAlpahAnm__12dMenu_save_cFUc -/* 801F3C24 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801F3C28 28 00 00 01 */ cmplwi r0, 1 -/* 801F3C2C 40 82 00 38 */ bne lbl_801F3C64 -/* 801F3C30 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F3C34 28 00 00 01 */ cmplwi r0, 1 -/* 801F3C38 40 82 00 2C */ bne lbl_801F3C64 -/* 801F3C3C 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F3C40 28 00 00 01 */ cmplwi r0, 1 -/* 801F3C44 40 82 00 20 */ bne lbl_801F3C64 -/* 801F3C48 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F3C4C 28 00 00 01 */ cmplwi r0, 1 -/* 801F3C50 40 82 00 14 */ bne lbl_801F3C64 -/* 801F3C54 7F 83 E3 78 */ mr r3, r28 -/* 801F3C58 48 00 21 2D */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F3C5C 38 00 00 34 */ li r0, 0x34 -/* 801F3C60 98 1C 01 B2 */ stb r0, 0x1b2(r28) -lbl_801F3C64: -/* 801F3C64 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F3C68 48 16 E5 BD */ bl _restgpr_28 -/* 801F3C6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F3C70 7C 08 03 A6 */ mtlr r0 -/* 801F3C74 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F3C78 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s b/asm/d/menu/d_menu_save/selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s deleted file mode 100644 index 004226efcd..0000000000 --- a/asm/d/menu/d_menu_save/selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s +++ /dev/null @@ -1,16 +0,0 @@ -lbl_801F6354: -/* 801F6354 38 00 00 00 */ li r0, 0 -/* 801F6358 54 89 06 3E */ clrlwi r9, r4, 0x18 -/* 801F635C 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 801F6360 7D 03 22 14 */ add r8, r3, r4 -/* 801F6364 80 88 00 D4 */ lwz r4, 0xd4(r8) -/* 801F6368 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F636C 80 88 00 E0 */ lwz r4, 0xe0(r8) -/* 801F6370 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6374 80 88 00 EC */ lwz r4, 0xec(r8) -/* 801F6378 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F637C 7C 63 4A 14 */ add r3, r3, r9 -/* 801F6380 98 A3 01 04 */ stb r5, 0x104(r3) -/* 801F6384 98 C3 01 07 */ stb r6, 0x107(r3) -/* 801F6388 98 E3 01 0A */ stb r7, 0x10a(r3) -/* 801F638C 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/selectWakuAlpahAnm__12dMenu_save_cFUc.s b/asm/d/menu/d_menu_save/selectWakuAlpahAnm__12dMenu_save_cFUc.s deleted file mode 100644 index eb3b53be4b..0000000000 --- a/asm/d/menu/d_menu_save/selectWakuAlpahAnm__12dMenu_save_cFUc.s +++ /dev/null @@ -1,52 +0,0 @@ -lbl_801F6390: -/* 801F6390 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 801F6394 7C 08 02 A6 */ mflr r0 -/* 801F6398 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F639C 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F63A0 48 16 BE 31 */ bl _savegpr_26 -/* 801F63A4 7C 7A 1B 78 */ mr r26, r3 -/* 801F63A8 3B 60 00 00 */ li r27, 0 -/* 801F63AC 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801F63B0 54 9C 15 BA */ rlwinm r28, r4, 2, 0x16, 0x1d -/* 801F63B4 7C 7A E2 14 */ add r3, r26, r28 -/* 801F63B8 80 63 00 D4 */ lwz r3, 0xd4(r3) -/* 801F63BC 7F BA 02 14 */ add r29, r26, r0 -/* 801F63C0 88 9D 01 0A */ lbz r4, 0x10a(r29) -/* 801F63C4 88 BD 01 04 */ lbz r5, 0x104(r29) -/* 801F63C8 88 DD 01 07 */ lbz r6, 0x107(r29) -/* 801F63CC 38 E0 00 00 */ li r7, 0 -/* 801F63D0 48 05 F4 A9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F63D4 7C 7E 1B 78 */ mr r30, r3 -/* 801F63D8 7C 7A E2 14 */ add r3, r26, r28 -/* 801F63DC 80 63 00 E0 */ lwz r3, 0xe0(r3) -/* 801F63E0 88 9D 01 0A */ lbz r4, 0x10a(r29) -/* 801F63E4 88 BD 01 04 */ lbz r5, 0x104(r29) -/* 801F63E8 88 DD 01 07 */ lbz r6, 0x107(r29) -/* 801F63EC 38 E0 00 00 */ li r7, 0 -/* 801F63F0 48 05 F4 89 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F63F4 7C 7F 1B 78 */ mr r31, r3 -/* 801F63F8 7C 7A E2 14 */ add r3, r26, r28 -/* 801F63FC 80 63 00 EC */ lwz r3, 0xec(r3) -/* 801F6400 88 9D 01 0A */ lbz r4, 0x10a(r29) -/* 801F6404 88 BD 01 04 */ lbz r5, 0x104(r29) -/* 801F6408 88 DD 01 07 */ lbz r6, 0x107(r29) -/* 801F640C 38 E0 00 00 */ li r7, 0 -/* 801F6410 48 05 F4 69 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F6414 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F6418 28 00 00 01 */ cmplwi r0, 1 -/* 801F641C 40 82 00 20 */ bne lbl_801F643C -/* 801F6420 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F6424 28 00 00 01 */ cmplwi r0, 1 -/* 801F6428 40 82 00 14 */ bne lbl_801F643C -/* 801F642C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F6430 28 00 00 01 */ cmplwi r0, 1 -/* 801F6434 40 82 00 08 */ bne lbl_801F643C -/* 801F6438 3B 60 00 01 */ li r27, 1 -lbl_801F643C: -/* 801F643C 7F 63 DB 78 */ mr r3, r27 -/* 801F6440 39 61 00 20 */ addi r11, r1, 0x20 -/* 801F6444 48 16 BD D9 */ bl _restgpr_26 -/* 801F6448 80 01 00 24 */ lwz r0, 0x24(r1) -/* 801F644C 7C 08 03 A6 */ mtlr r0 -/* 801F6450 38 21 00 20 */ addi r1, r1, 0x20 -/* 801F6454 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/yesNoCursorMoveAnm__12dMenu_save_cFv.s b/asm/d/menu/d_menu_save/yesNoCursorMoveAnm__12dMenu_save_cFv.s deleted file mode 100644 index 58ac27ad26..0000000000 --- a/asm/d/menu/d_menu_save/yesNoCursorMoveAnm__12dMenu_save_cFv.s +++ /dev/null @@ -1,30 +0,0 @@ -lbl_801F46B4: -/* 801F46B4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 801F46B8 7C 08 02 A6 */ mflr r0 -/* 801F46BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F46C0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801F46C4 93 C1 00 08 */ stw r30, 8(r1) -/* 801F46C8 7C 7E 1B 78 */ mr r30, r3 -/* 801F46CC 38 80 00 00 */ li r4, 0 -/* 801F46D0 48 00 14 15 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc -/* 801F46D4 7C 7F 1B 78 */ mr r31, r3 -/* 801F46D8 7F C3 F3 78 */ mr r3, r30 -/* 801F46DC 88 9E 01 B7 */ lbz r4, 0x1b7(r30) -/* 801F46E0 48 00 1F 75 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc -/* 801F46E4 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 801F46E8 28 00 00 01 */ cmplwi r0, 1 -/* 801F46EC 40 82 00 20 */ bne lbl_801F470C -/* 801F46F0 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F46F4 28 00 00 01 */ cmplwi r0, 1 -/* 801F46F8 40 82 00 14 */ bne lbl_801F470C -/* 801F46FC 7F C3 F3 78 */ mr r3, r30 -/* 801F4700 48 00 16 85 */ bl yesnoCursorShow__12dMenu_save_cFv -/* 801F4704 38 00 00 34 */ li r0, 0x34 -/* 801F4708 98 1E 01 B2 */ stb r0, 0x1b2(r30) -lbl_801F470C: -/* 801F470C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 801F4710 83 C1 00 08 */ lwz r30, 8(r1) -/* 801F4714 80 01 00 14 */ lwz r0, 0x14(r1) -/* 801F4718 7C 08 03 A6 */ mtlr r0 -/* 801F471C 38 21 00 10 */ addi r1, r1, 0x10 -/* 801F4720 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s b/asm/d/menu/d_menu_save/yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s deleted file mode 100644 index 20e3df45a2..0000000000 --- a/asm/d/menu/d_menu_save/yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_801F6608: -/* 801F6608 54 89 06 3E */ clrlwi r9, r4, 0x18 -/* 801F660C 28 09 00 FF */ cmplwi r9, 0xff -/* 801F6610 4D 82 00 20 */ beqlr -/* 801F6614 38 00 00 00 */ li r0, 0 -/* 801F6618 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d -/* 801F661C 7D 03 22 14 */ add r8, r3, r4 -/* 801F6620 80 88 01 18 */ lwz r4, 0x118(r8) -/* 801F6624 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6628 80 88 01 20 */ lwz r4, 0x120(r8) -/* 801F662C B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6630 80 88 01 28 */ lwz r4, 0x128(r8) -/* 801F6634 B0 04 00 16 */ sth r0, 0x16(r4) -/* 801F6638 7C 63 4A 14 */ add r3, r3, r9 -/* 801F663C 98 A3 01 30 */ stb r5, 0x130(r3) -/* 801F6640 98 C3 01 32 */ stb r6, 0x132(r3) -/* 801F6644 98 E3 01 34 */ stb r7, 0x134(r3) -/* 801F6648 80 68 01 38 */ lwz r3, 0x138(r8) -/* 801F664C B0 03 00 6A */ sth r0, 0x6a(r3) -/* 801F6650 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_save/yesnoWakuAlpahAnm__12dMenu_save_cFUc.s b/asm/d/menu/d_menu_save/yesnoWakuAlpahAnm__12dMenu_save_cFUc.s deleted file mode 100644 index fa0e87ecb3..0000000000 --- a/asm/d/menu/d_menu_save/yesnoWakuAlpahAnm__12dMenu_save_cFUc.s +++ /dev/null @@ -1,93 +0,0 @@ -lbl_801F6654: -/* 801F6654 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 801F6658 7C 08 02 A6 */ mflr r0 -/* 801F665C 90 01 00 54 */ stw r0, 0x54(r1) -/* 801F6660 39 61 00 50 */ addi r11, r1, 0x50 -/* 801F6664 48 16 BB 69 */ bl _savegpr_25 -/* 801F6668 7C 79 1B 78 */ mr r25, r3 -/* 801F666C 54 80 06 3E */ clrlwi r0, r4, 0x18 -/* 801F6670 28 00 00 FF */ cmplwi r0, 0xff -/* 801F6674 40 82 00 0C */ bne lbl_801F6680 -/* 801F6678 38 60 00 01 */ li r3, 1 -/* 801F667C 48 00 01 24 */ b lbl_801F67A0 -lbl_801F6680: -/* 801F6680 3B E0 00 00 */ li r31, 0 -/* 801F6684 54 9A 15 BA */ rlwinm r26, r4, 2, 0x16, 0x1d -/* 801F6688 7C 79 D2 14 */ add r3, r25, r26 -/* 801F668C 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801F6690 7F 79 02 14 */ add r27, r25, r0 -/* 801F6694 88 9B 01 34 */ lbz r4, 0x134(r27) -/* 801F6698 88 BB 01 30 */ lbz r5, 0x130(r27) -/* 801F669C 88 DB 01 32 */ lbz r6, 0x132(r27) -/* 801F66A0 38 E0 00 00 */ li r7, 0 -/* 801F66A4 48 05 F1 D5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F66A8 7C 7C 1B 78 */ mr r28, r3 -/* 801F66AC 7C 79 D2 14 */ add r3, r25, r26 -/* 801F66B0 80 63 01 20 */ lwz r3, 0x120(r3) -/* 801F66B4 88 9B 01 34 */ lbz r4, 0x134(r27) -/* 801F66B8 88 BB 01 30 */ lbz r5, 0x130(r27) -/* 801F66BC 88 DB 01 32 */ lbz r6, 0x132(r27) -/* 801F66C0 38 E0 00 00 */ li r7, 0 -/* 801F66C4 48 05 F1 B5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F66C8 7C 7D 1B 78 */ mr r29, r3 -/* 801F66CC 7C 79 D2 14 */ add r3, r25, r26 -/* 801F66D0 80 63 01 28 */ lwz r3, 0x128(r3) -/* 801F66D4 88 9B 01 34 */ lbz r4, 0x134(r27) -/* 801F66D8 88 BB 01 30 */ lbz r5, 0x130(r27) -/* 801F66DC 88 DB 01 32 */ lbz r6, 0x132(r27) -/* 801F66E0 38 E0 00 00 */ li r7, 0 -/* 801F66E4 48 05 F1 95 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc -/* 801F66E8 7C 7E 1B 78 */ mr r30, r3 -/* 801F66EC 38 00 00 96 */ li r0, 0x96 -/* 801F66F0 98 01 00 08 */ stb r0, 8(r1) -/* 801F66F4 98 01 00 09 */ stb r0, 9(r1) -/* 801F66F8 98 01 00 0A */ stb r0, 0xa(r1) -/* 801F66FC 38 60 00 FF */ li r3, 0xff -/* 801F6700 98 61 00 0B */ stb r3, 0xb(r1) -/* 801F6704 80 01 00 08 */ lwz r0, 8(r1) -/* 801F6708 90 01 00 0C */ stw r0, 0xc(r1) -/* 801F670C 98 61 00 10 */ stb r3, 0x10(r1) -/* 801F6710 98 61 00 11 */ stb r3, 0x11(r1) -/* 801F6714 98 61 00 12 */ stb r3, 0x12(r1) -/* 801F6718 98 61 00 13 */ stb r3, 0x13(r1) -/* 801F671C 80 01 00 10 */ lwz r0, 0x10(r1) -/* 801F6720 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F6724 7C 99 D2 14 */ add r4, r25, r26 -/* 801F6728 80 64 01 38 */ lwz r3, 0x138(r4) -/* 801F672C 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 801F6730 90 01 00 18 */ stw r0, 0x18(r1) -/* 801F6734 90 01 00 1C */ stw r0, 0x1c(r1) -/* 801F6738 80 64 01 38 */ lwz r3, 0x138(r4) -/* 801F673C 80 03 00 5C */ lwz r0, 0x5c(r3) -/* 801F6740 90 01 00 20 */ stw r0, 0x20(r1) -/* 801F6744 90 01 00 24 */ stw r0, 0x24(r1) -/* 801F6748 80 64 01 38 */ lwz r3, 0x138(r4) -/* 801F674C 88 9B 01 34 */ lbz r4, 0x134(r27) -/* 801F6750 38 A1 00 24 */ addi r5, r1, 0x24 -/* 801F6754 38 C1 00 1C */ addi r6, r1, 0x1c -/* 801F6758 38 E1 00 14 */ addi r7, r1, 0x14 -/* 801F675C 39 01 00 0C */ addi r8, r1, 0xc -/* 801F6760 39 20 00 00 */ li r9, 0 -/* 801F6764 48 05 E1 59 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc -/* 801F6768 57 80 06 3E */ clrlwi r0, r28, 0x18 -/* 801F676C 28 00 00 01 */ cmplwi r0, 1 -/* 801F6770 40 82 00 2C */ bne lbl_801F679C -/* 801F6774 57 A0 06 3E */ clrlwi r0, r29, 0x18 -/* 801F6778 28 00 00 01 */ cmplwi r0, 1 -/* 801F677C 40 82 00 20 */ bne lbl_801F679C -/* 801F6780 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 801F6784 28 00 00 01 */ cmplwi r0, 1 -/* 801F6788 40 82 00 14 */ bne lbl_801F679C -/* 801F678C 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 801F6790 28 00 00 01 */ cmplwi r0, 1 -/* 801F6794 40 82 00 08 */ bne lbl_801F679C -/* 801F6798 3B E0 00 01 */ li r31, 1 -lbl_801F679C: -/* 801F679C 7F E3 FB 78 */ mr r3, r31 -lbl_801F67A0: -/* 801F67A0 39 61 00 50 */ addi r11, r1, 0x50 -/* 801F67A4 48 16 BA 75 */ bl _restgpr_25 -/* 801F67A8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 801F67AC 7C 08 03 A6 */ mtlr r0 -/* 801F67B0 38 21 00 50 */ addi r1, r1, 0x50 -/* 801F67B4 4E 80 00 20 */ blr diff --git a/asm/d/menu/d_menu_window/key_wait_proc__5dMw_cFv.s b/asm/d/menu/d_menu_window/key_wait_proc__5dMw_cFv.s index 90a519d63a..65dfa2dc0f 100644 --- a/asm/d/menu/d_menu_window/key_wait_proc__5dMw_cFv.s +++ b/asm/d/menu/d_menu_window/key_wait_proc__5dMw_cFv.s @@ -88,7 +88,7 @@ lbl_801FAB0C: /* 801FAB7C 4B E2 3A 2D */ bl fopOvlpM_IsDoingReq__Fv /* 801FAB80 2C 03 00 00 */ cmpwi r3, 0 /* 801FAB84 40 82 04 40 */ bne lbl_801FAFC4 -/* 801FAB88 88 0D 86 66 */ lbz r0, struct_80450BE4+0x2(r13) +/* 801FAB88 88 0D 86 66 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 801FAB8C 28 00 00 00 */ cmplwi r0, 0 /* 801FAB90 40 82 04 34 */ bne lbl_801FAFC4 /* 801FAB94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/d/meter/d_meter_map/_move__11dMeterMap_cFUl.s b/asm/d/meter/d_meter_map/_move__11dMeterMap_cFUl.s index 6f4b58e2fc..8356eb7798 100644 --- a/asm/d/meter/d_meter_map/_move__11dMeterMap_cFUl.s +++ b/asm/d/meter/d_meter_map/_move__11dMeterMap_cFUl.s @@ -43,7 +43,7 @@ lbl_8020DD6C: /* 8020DD84 38 63 01 88 */ addi r3, r3, g_meter2_info@l /* 0x80430188@l */ /* 8020DD88 98 03 00 C1 */ stb r0, 0xc1(r3) lbl_8020DD8C: -/* 8020DD8C 8B AD 87 E4 */ lbz r29, struct_80450D64+0x0(r13) +/* 8020DD8C 8B AD 87 E4 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8020DD90 7F BD 07 74 */ extsb r29, r29 /* 8020DD94 93 FE 00 14 */ stw r31, 0x14(r30) /* 8020DD98 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s b/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s index 363badac75..fc8cab55b9 100644 --- a/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s +++ b/asm/d/meter/d_meter_map/getMapDispSizeTypeNo__11dMeterMap_cFv.s @@ -5,7 +5,7 @@ lbl_8020D528: /* 8020D534 39 61 00 20 */ addi r11, r1, 0x20 /* 8020D538 48 15 4C A5 */ bl _savegpr_29 /* 8020D53C 3B A0 00 07 */ li r29, 7 -/* 8020D540 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8020D540 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8020D544 7C 84 07 74 */ extsb r4, r4 /* 8020D548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8020D54C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s b/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s index 6d4aaaf737..4e0fe1ca67 100644 --- a/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s +++ b/asm/d/msg/d_msg_class/messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz.s @@ -13,7 +13,7 @@ lbl_8022CB10: /* 8022CB3C 88 03 04 CB */ lbz r0, 0x4cb(r3) /* 8022CB40 28 00 00 00 */ cmplwi r0, 0 /* 8022CB44 41 82 00 44 */ beq lbl_8022CB88 -/* 8022CB48 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) +/* 8022CB48 88 6D 87 E4 */ lbz r3, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8022CB4C 7C 63 07 75 */ extsb. r3, r3 /* 8022CB50 41 82 00 24 */ beq lbl_8022CB74 /* 8022CB54 4B E0 05 19 */ bl dComIfGp_getReverb__Fi @@ -31,7 +31,7 @@ lbl_8022CB74: /* 8022CB80 48 09 FE 99 */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CB84 48 00 00 48 */ b lbl_8022CBCC lbl_8022CB88: -/* 8022CB88 88 6D 87 E4 */ lbz r3, struct_80450D64+0x0(r13) +/* 8022CB88 88 6D 87 E4 */ lbz r3, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8022CB8C 7C 63 07 75 */ extsb. r3, r3 /* 8022CB90 41 82 00 24 */ beq lbl_8022CBB4 /* 8022CB94 4B E0 04 D9 */ bl dComIfGp_getReverb__Fi diff --git a/asm/d/msg/d_msg_flow/eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s b/asm/d/msg/d_msg_flow/eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s index 959a45c3c2..348db497fe 100644 --- a/asm/d/msg/d_msg_flow/eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s +++ b/asm/d/msg/d_msg_flow/eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c.s @@ -72,7 +72,7 @@ lbl_8024AED8: /* 8024AEF8 A0 03 31 20 */ lhz r0, 0x3120(r3) /* 8024AEFC 28 00 FF FF */ cmplwi r0, 0xffff /* 8024AF00 40 82 00 2C */ bne lbl_8024AF2C -/* 8024AF04 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 8024AF04 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8024AF08 7C 84 07 74 */ extsb r4, r4 /* 8024AF0C 38 65 4E C4 */ addi r3, r5, 0x4ec4 /* 8024AF10 4B DD 94 75 */ bl getStatusRoomDt__20dStage_roomControl_cFi diff --git a/asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s b/asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s deleted file mode 100644 index bc320a48f1..0000000000 --- a/asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80249CA0: -/* 80249CA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249CA4 7C 08 02 A6 */ mflr r0 -/* 80249CA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249CAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80249CB0 93 C1 00 08 */ stw r30, 8(r1) -/* 80249CB4 7C 7E 1B 78 */ mr r30, r3 -/* 80249CB8 7C 9F 23 78 */ mr r31, r4 -/* 80249CBC 4B FF F6 F9 */ bl __ct__16dMsgStringBase_cFv -/* 80249CC0 3C 60 80 3C */ lis r3, __vt__12dMsgString_c@ha /* 0x803C1498@ha */ -/* 80249CC4 38 03 14 98 */ addi r0, r3, __vt__12dMsgString_c@l /* 0x803C1498@l */ -/* 80249CC8 90 1E 00 00 */ stw r0, 0(r30) -/* 80249CCC 9B FE 00 28 */ stb r31, 0x28(r30) -/* 80249CD0 38 60 02 44 */ li r3, 0x244 -/* 80249CD4 48 08 4F 79 */ bl __nw__FUl -/* 80249CD8 7C 60 1B 79 */ or. r0, r3, r3 -/* 80249CDC 41 82 00 10 */ beq lbl_80249CEC -/* 80249CE0 88 9E 00 28 */ lbz r4, 0x28(r30) -/* 80249CE4 4B FD BF B1 */ bl __ct__10COutFont_cFUc -/* 80249CE8 7C 60 1B 78 */ mr r0, r3 -lbl_80249CEC: -/* 80249CEC 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80249CF0 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 80249CF4 81 83 00 00 */ lwz r12, 0(r3) -/* 80249CF8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80249CFC 7D 89 03 A6 */ mtctr r12 -/* 80249D00 4E 80 04 21 */ bctrl -/* 80249D04 7F C3 F3 78 */ mr r3, r30 -/* 80249D08 4B FF F9 F9 */ bl getResource__16dMsgStringBase_cFv -/* 80249D0C 7F C3 F3 78 */ mr r3, r30 -/* 80249D10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80249D14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80249D18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249D1C 7C 08 03 A6 */ mtlr r0 -/* 80249D20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249D24 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s b/asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s deleted file mode 100644 index 291a912c08..0000000000 --- a/asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80249C20: -/* 80249C20 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249C24 7C 08 02 A6 */ mflr r0 -/* 80249C28 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249C2C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80249C30 7C 7F 1B 78 */ mr r31, r3 -/* 80249C34 4B FF F7 81 */ bl __ct__16dMsgStringBase_cFv -/* 80249C38 3C 60 80 3C */ lis r3, __vt__12dMsgString_c@ha /* 0x803C1498@ha */ -/* 80249C3C 38 03 14 98 */ addi r0, r3, __vt__12dMsgString_c@l /* 0x803C1498@l */ -/* 80249C40 90 1F 00 00 */ stw r0, 0(r31) -/* 80249C44 38 00 00 00 */ li r0, 0 -/* 80249C48 98 1F 00 28 */ stb r0, 0x28(r31) -/* 80249C4C 38 60 02 44 */ li r3, 0x244 -/* 80249C50 48 08 4F FD */ bl __nw__FUl -/* 80249C54 7C 60 1B 79 */ or. r0, r3, r3 -/* 80249C58 41 82 00 10 */ beq lbl_80249C68 -/* 80249C5C 88 9F 00 28 */ lbz r4, 0x28(r31) -/* 80249C60 4B FD C0 35 */ bl __ct__10COutFont_cFUc -/* 80249C64 7C 60 1B 78 */ mr r0, r3 -lbl_80249C68: -/* 80249C68 90 1F 00 24 */ stw r0, 0x24(r31) -/* 80249C6C 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 80249C70 81 83 00 00 */ lwz r12, 0(r3) -/* 80249C74 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80249C78 7D 89 03 A6 */ mtctr r12 -/* 80249C7C 4E 80 04 21 */ bctrl -/* 80249C80 7F E3 FB 78 */ mr r3, r31 -/* 80249C84 4B FF FA 7D */ bl getResource__16dMsgStringBase_cFv -/* 80249C88 7F E3 FB 78 */ mr r3, r31 -/* 80249C8C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80249C90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249C94 7C 08 03 A6 */ mtlr r0 -/* 80249C98 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249C9C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s b/asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s deleted file mode 100644 index 0bd0245d72..0000000000 --- a/asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80249D28: -/* 80249D28 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249D2C 7C 08 02 A6 */ mflr r0 -/* 80249D30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249D34 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80249D38 93 C1 00 08 */ stw r30, 8(r1) -/* 80249D3C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80249D40 7C 9F 23 78 */ mr r31, r4 -/* 80249D44 41 82 00 54 */ beq lbl_80249D98 -/* 80249D48 3C 60 80 3C */ lis r3, __vt__12dMsgString_c@ha /* 0x803C1498@ha */ -/* 80249D4C 38 03 14 98 */ addi r0, r3, __vt__12dMsgString_c@l /* 0x803C1498@l */ -/* 80249D50 90 1E 00 00 */ stw r0, 0(r30) -/* 80249D54 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 80249D58 28 03 00 00 */ cmplwi r3, 0 -/* 80249D5C 41 82 00 18 */ beq lbl_80249D74 -/* 80249D60 38 80 00 01 */ li r4, 1 -/* 80249D64 81 83 00 00 */ lwz r12, 0(r3) -/* 80249D68 81 8C 00 08 */ lwz r12, 8(r12) -/* 80249D6C 7D 89 03 A6 */ mtctr r12 -/* 80249D70 4E 80 04 21 */ bctrl -lbl_80249D74: -/* 80249D74 38 00 00 00 */ li r0, 0 -/* 80249D78 90 1E 00 24 */ stw r0, 0x24(r30) -/* 80249D7C 7F C3 F3 78 */ mr r3, r30 -/* 80249D80 38 80 00 00 */ li r4, 0 -/* 80249D84 4B FF F7 A5 */ bl __dt__16dMsgStringBase_cFv -/* 80249D88 7F E0 07 35 */ extsh. r0, r31 -/* 80249D8C 40 81 00 0C */ ble lbl_80249D98 -/* 80249D90 7F C3 F3 78 */ mr r3, r30 -/* 80249D94 48 08 4F A9 */ bl __dl__FPv -lbl_80249D98: -/* 80249D98 7F C3 F3 78 */ mr r3, r30 -/* 80249D9C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80249DA0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80249DA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249DA8 7C 08 03 A6 */ mtlr r0 -/* 80249DAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249DB0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s b/asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s deleted file mode 100644 index d9813493ba..0000000000 --- a/asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80249ED0: -/* 80249ED0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249ED4 7C 08 02 A6 */ mflr r0 -/* 80249ED8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249EDC 80 63 00 24 */ lwz r3, 0x24(r3) -/* 80249EE0 81 83 00 00 */ lwz r12, 0(r3) -/* 80249EE4 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80249EE8 7D 89 03 A6 */ mtctr r12 -/* 80249EEC 4E 80 04 21 */ bctrl -/* 80249EF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249EF4 7C 08 03 A6 */ mtlr r0 -/* 80249EF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249EFC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s b/asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s deleted file mode 100644 index a056af1181..0000000000 --- a/asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s +++ /dev/null @@ -1,61 +0,0 @@ -lbl_80249DE4: -/* 80249DE4 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80249DE8 7C 08 02 A6 */ mflr r0 -/* 80249DEC 90 01 00 54 */ stw r0, 0x54(r1) -/* 80249DF0 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80249DF4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80249DF8 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 80249DFC F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 80249E00 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80249E04 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80249E08 7C 7E 1B 78 */ mr r30, r3 -/* 80249E0C 7C 9F 23 78 */ mr r31, r4 -/* 80249E10 FF C0 08 90 */ fmr f30, f1 -/* 80249E14 38 61 00 08 */ addi r3, r1, 8 -/* 80249E18 38 A0 00 00 */ li r5, 0 -/* 80249E1C 48 0A DB 8D */ bl getGlbVtx__7J2DPaneCFUc -/* 80249E20 80 61 00 08 */ lwz r3, 8(r1) -/* 80249E24 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80249E28 90 61 00 14 */ stw r3, 0x14(r1) -/* 80249E2C 90 01 00 18 */ stw r0, 0x18(r1) -/* 80249E30 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80249E34 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80249E38 C3 E1 00 18 */ lfs f31, 0x18(r1) -/* 80249E3C C0 02 B3 7C */ lfs f0, lit_3778(r2) -/* 80249E40 FC 00 F0 00 */ fcmpu cr0, f0, f30 -/* 80249E44 40 82 00 28 */ bne lbl_80249E6C -/* 80249E48 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 80249E4C C8 22 B3 88 */ lfd f1, lit_3781(r2) -/* 80249E50 90 01 00 24 */ stw r0, 0x24(r1) -/* 80249E54 3C 00 43 30 */ lis r0, 0x4330 -/* 80249E58 90 01 00 20 */ stw r0, 0x20(r1) -/* 80249E5C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80249E60 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80249E64 C0 02 B3 78 */ lfs f0, lit_3777(r2) -/* 80249E68 EF C1 00 24 */ fdivs f30, f1, f0 -lbl_80249E6C: -/* 80249E6C 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 80249E70 FC 20 F0 90 */ fmr f1, f30 -/* 80249E74 81 83 00 00 */ lwz r12, 0(r3) -/* 80249E78 81 8C 00 20 */ lwz r12, 0x20(r12) -/* 80249E7C 7D 89 03 A6 */ mtctr r12 -/* 80249E80 4E 80 04 21 */ bctrl -/* 80249E84 80 7E 00 24 */ lwz r3, 0x24(r30) -/* 80249E88 7F E4 FB 78 */ mr r4, r31 -/* 80249E8C C0 21 00 14 */ lfs f1, 0x14(r1) -/* 80249E90 FC 40 F8 90 */ fmr f2, f31 -/* 80249E94 C0 62 B3 80 */ lfs f3, lit_3779(r2) -/* 80249E98 81 83 00 00 */ lwz r12, 0(r3) -/* 80249E9C 81 8C 00 14 */ lwz r12, 0x14(r12) -/* 80249EA0 7D 89 03 A6 */ mtctr r12 -/* 80249EA4 4E 80 04 21 */ bctrl -/* 80249EA8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 80249EAC CB E1 00 40 */ lfd f31, 0x40(r1) -/* 80249EB0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 80249EB4 CB C1 00 30 */ lfd f30, 0x30(r1) -/* 80249EB8 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 80249EBC 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 80249EC0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80249EC4 7C 08 03 A6 */ mtlr r0 -/* 80249EC8 38 21 00 50 */ addi r1, r1, 0x50 -/* 80249ECC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s b/asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s deleted file mode 100644 index 234a5db94c..0000000000 --- a/asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s +++ /dev/null @@ -1,13 +0,0 @@ -lbl_80249DB4: -/* 80249DB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80249DB8 7C 08 02 A6 */ mflr r0 -/* 80249DBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249DC0 80 63 00 24 */ lwz r3, 0x24(r3) -/* 80249DC4 81 83 00 00 */ lwz r12, 0(r3) -/* 80249DC8 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80249DCC 7D 89 03 A6 */ mtctr r12 -/* 80249DD0 4E 80 04 21 */ bctrl -/* 80249DD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80249DD8 7C 08 03 A6 */ mtlr r0 -/* 80249DDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 80249DE0 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s b/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s index a1c64218d5..ad1e071b17 100644 --- a/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s +++ b/asm/d/ovlp/d_ovlp_fade2/dOvlpFd2_Draw__FP10dOvlpFd2_c.s @@ -57,7 +57,7 @@ lbl_80252D54: /* 80252DE4 4B E0 39 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80252DE8: /* 80252DE8 38 00 00 00 */ li r0, 0 -/* 80252DEC 98 0D 86 64 */ stb r0, struct_80450BE4+0x0(r13) +/* 80252DEC 98 0D 86 64 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) /* 80252DF0 38 60 00 01 */ li r3, 1 /* 80252DF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80252DF8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s b/asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s deleted file mode 100644 index 05a2b20ebd..0000000000 --- a/asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s +++ /dev/null @@ -1,20 +0,0 @@ -lbl_80255388: -/* 80255388 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025538C 7C 08 02 A6 */ mflr r0 -/* 80255390 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255394 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255398 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8025539C 41 82 00 1C */ beq lbl_802553B8 -/* 802553A0 3C A0 80 3C */ lis r5, __vt__10JSUIosBase@ha /* 0x803C2DF8@ha */ -/* 802553A4 38 05 2D F8 */ addi r0, r5, __vt__10JSUIosBase@l /* 0x803C2DF8@l */ -/* 802553A8 90 1F 00 00 */ stw r0, 0(r31) -/* 802553AC 7C 80 07 35 */ extsh. r0, r4 -/* 802553B0 40 81 00 08 */ ble lbl_802553B8 -/* 802553B4 48 07 99 89 */ bl __dl__FPv -lbl_802553B8: -/* 802553B8 7F E3 FB 78 */ mr r3, r31 -/* 802553BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802553C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802553C4 7C 08 03 A6 */ mtlr r0 -/* 802553C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802553CC 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s b/asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s deleted file mode 100644 index e92437e6ba..0000000000 --- a/asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_802552B8: -/* 802552B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802552BC 7C 08 02 A6 */ mflr r0 -/* 802552C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802552C4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802552C8 93 C1 00 08 */ stw r30, 8(r1) -/* 802552CC 7C 7E 1B 79 */ or. r30, r3, r3 -/* 802552D0 7C 9F 23 78 */ mr r31, r4 -/* 802552D4 41 82 00 38 */ beq lbl_8025530C -/* 802552D8 3C 80 80 3D */ lis r4, __vt__20JSUMemoryInputStream@ha /* 0x803CC4F0@ha */ -/* 802552DC 38 04 C4 F0 */ addi r0, r4, __vt__20JSUMemoryInputStream@l /* 0x803CC4F0@l */ -/* 802552E0 90 1E 00 00 */ stw r0, 0(r30) -/* 802552E4 41 82 00 18 */ beq lbl_802552FC -/* 802552E8 3C 80 80 3D */ lis r4, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 802552EC 38 04 C4 B0 */ addi r0, r4, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 802552F0 90 1E 00 00 */ stw r0, 0(r30) -/* 802552F4 38 80 00 00 */ li r4, 0 -/* 802552F8 48 08 6F 45 */ bl __dt__14JSUInputStreamFv -lbl_802552FC: -/* 802552FC 7F E0 07 35 */ extsh. r0, r31 -/* 80255300 40 81 00 0C */ ble lbl_8025530C -/* 80255304 7F C3 F3 78 */ mr r3, r30 -/* 80255308 48 07 9A 35 */ bl __dl__FPv -lbl_8025530C: -/* 8025530C 7F C3 F3 78 */ mr r3, r30 -/* 80255310 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255314 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255318 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025531C 7C 08 03 A6 */ mtlr r0 -/* 80255320 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255324 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s b/asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s deleted file mode 100644 index 0220f97ebc..0000000000 --- a/asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s +++ /dev/null @@ -1,26 +0,0 @@ -lbl_80255328: -/* 80255328 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025532C 7C 08 02 A6 */ mflr r0 -/* 80255330 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255334 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255338 93 C1 00 08 */ stw r30, 8(r1) -/* 8025533C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80255340 7C 9F 23 78 */ mr r31, r4 -/* 80255344 41 82 00 28 */ beq lbl_8025536C -/* 80255348 3C 80 80 3D */ lis r4, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 8025534C 38 04 C4 B0 */ addi r0, r4, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 80255350 90 1E 00 00 */ stw r0, 0(r30) -/* 80255354 38 80 00 00 */ li r4, 0 -/* 80255358 48 08 6E E5 */ bl __dt__14JSUInputStreamFv -/* 8025535C 7F E0 07 35 */ extsh. r0, r31 -/* 80255360 40 81 00 0C */ ble lbl_8025536C -/* 80255364 7F C3 F3 78 */ mr r3, r30 -/* 80255368 48 07 99 D5 */ bl __dl__FPv -lbl_8025536C: -/* 8025536C 7F C3 F3 78 */ mr r3, r30 -/* 80255370 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255374 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255378 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025537C 7C 08 03 A6 */ mtlr r0 -/* 80255380 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255384 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/__sinit_d_pane_class_cpp.s b/asm/d/pane/d_pane_class/__sinit_d_pane_class_cpp.s deleted file mode 100644 index deed0dfe63..0000000000 --- a/asm/d/pane/d_pane_class/__sinit_d_pane_class_cpp.s +++ /dev/null @@ -1,8 +0,0 @@ -lbl_802553D0: -/* 802553D0 C0 02 B4 88 */ lfs f0, lit_3858(r2) -/* 802553D4 3C 60 80 43 */ lis r3, static_mBounds@ha /* 0x80430748@ha */ -/* 802553D8 D4 03 07 48 */ stfsu f0, static_mBounds@l(r3) /* 0x80430748@l */ -/* 802553DC D0 03 00 04 */ stfs f0, 4(r3) -/* 802553E0 D0 03 00 08 */ stfs f0, 8(r3) -/* 802553E4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 802553E8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/childPaneGetSize__8CPaneMgrFP7J2DPane.s b/asm/d/pane/d_pane_class/childPaneGetSize__8CPaneMgrFP7J2DPane.s deleted file mode 100644 index 4c219081fe..0000000000 --- a/asm/d/pane/d_pane_class/childPaneGetSize__8CPaneMgrFP7J2DPane.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80254018: -/* 80254018 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8025401C 7C 08 02 A6 */ mflr r0 -/* 80254020 90 01 00 44 */ stw r0, 0x44(r1) -/* 80254024 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80254028 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8025402C 7C 7F 1B 78 */ mr r31, r3 -/* 80254030 7C 9E 23 79 */ or. r30, r4, r4 -/* 80254034 41 82 00 E8 */ beq lbl_8025411C -/* 80254038 7F C3 F3 78 */ mr r3, r30 -/* 8025403C 48 0A 30 C5 */ bl getBounds__7J2DPaneFv -/* 80254040 C0 03 00 00 */ lfs f0, 0(r3) -/* 80254044 FC 00 00 1E */ fctiwz f0, f0 -/* 80254048 D8 01 00 08 */ stfd f0, 8(r1) -/* 8025404C 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80254050 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80254054 B0 03 00 00 */ sth r0, 0(r3) -/* 80254058 7F C3 F3 78 */ mr r3, r30 -/* 8025405C 48 0A 30 A5 */ bl getBounds__7J2DPaneFv -/* 80254060 C0 03 00 04 */ lfs f0, 4(r3) -/* 80254064 FC 00 00 1E */ fctiwz f0, f0 -/* 80254068 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 8025406C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80254070 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80254074 B0 03 00 02 */ sth r0, 2(r3) -/* 80254078 C0 3E 00 28 */ lfs f1, 0x28(r30) -/* 8025407C C0 1E 00 20 */ lfs f0, 0x20(r30) -/* 80254080 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80254084 FC 00 00 1E */ fctiwz f0, f0 -/* 80254088 D8 01 00 18 */ stfd f0, 0x18(r1) -/* 8025408C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80254090 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80254094 B0 03 00 04 */ sth r0, 4(r3) -/* 80254098 C0 3E 00 2C */ lfs f1, 0x2c(r30) -/* 8025409C C0 1E 00 24 */ lfs f0, 0x24(r30) -/* 802540A0 EC 01 00 28 */ fsubs f0, f1, f0 -/* 802540A4 FC 00 00 1E */ fctiwz f0, f0 -/* 802540A8 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802540AC 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802540B0 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802540B4 B0 03 00 06 */ sth r0, 6(r3) -/* 802540B8 C0 1E 00 C4 */ lfs f0, 0xc4(r30) -/* 802540BC FC 00 00 1E */ fctiwz f0, f0 -/* 802540C0 D8 01 00 28 */ stfd f0, 0x28(r1) -/* 802540C4 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 802540C8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802540CC B0 03 00 08 */ sth r0, 8(r3) -/* 802540D0 C0 1E 00 C8 */ lfs f0, 0xc8(r30) -/* 802540D4 FC 00 00 1E */ fctiwz f0, f0 -/* 802540D8 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 802540DC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802540E0 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802540E4 B0 03 00 0A */ sth r0, 0xa(r3) -/* 802540E8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802540EC 38 03 00 0C */ addi r0, r3, 0xc -/* 802540F0 90 1F 00 20 */ stw r0, 0x20(r31) -/* 802540F4 7F C3 F3 78 */ mr r3, r30 -/* 802540F8 48 0A 39 95 */ bl getFirstChildPane__7J2DPaneFv -/* 802540FC 7C 64 1B 78 */ mr r4, r3 -/* 80254100 7F E3 FB 78 */ mr r3, r31 -/* 80254104 4B FF FF 15 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane -/* 80254108 7F C3 F3 78 */ mr r3, r30 -/* 8025410C 48 0A 39 B9 */ bl getNextChildPane__7J2DPaneFv -/* 80254110 7C 64 1B 78 */ mr r4, r3 -/* 80254114 7F E3 FB 78 */ mr r3, r31 -/* 80254118 4B FF FF 01 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane -lbl_8025411C: -/* 8025411C 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80254120 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80254124 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80254128 7C 08 03 A6 */ mtlr r0 -/* 8025412C 38 21 00 40 */ addi r1, r1, 0x40 -/* 80254130 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/childPaneSetSize__8CPaneMgrFP7J2DPaneff.s b/asm/d/pane/d_pane_class/childPaneSetSize__8CPaneMgrFP7J2DPaneff.s deleted file mode 100644 index fdc8a95737..0000000000 --- a/asm/d/pane/d_pane_class/childPaneSetSize__8CPaneMgrFP7J2DPaneff.s +++ /dev/null @@ -1,112 +0,0 @@ -lbl_80254134: -/* 80254134 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80254138 7C 08 02 A6 */ mflr r0 -/* 8025413C 90 01 00 54 */ stw r0, 0x54(r1) -/* 80254140 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80254144 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 /* qr0 */ -/* 80254148 DB C1 00 30 */ stfd f30, 0x30(r1) -/* 8025414C F3 C1 00 38 */ psq_st f30, 56(r1), 0, 0 /* qr0 */ -/* 80254150 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 80254154 93 C1 00 28 */ stw r30, 0x28(r1) -/* 80254158 7C 7E 1B 78 */ mr r30, r3 -/* 8025415C 7C 9F 23 79 */ or. r31, r4, r4 -/* 80254160 FF C0 08 90 */ fmr f30, f1 -/* 80254164 FF E0 10 90 */ fmr f31, f2 -/* 80254168 41 82 01 58 */ beq lbl_802542C0 -/* 8025416C 80 BE 00 20 */ lwz r5, 0x20(r30) -/* 80254170 7F E3 FB 78 */ mr r3, r31 -/* 80254174 A8 05 00 00 */ lha r0, 0(r5) -/* 80254178 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 8025417C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254180 90 01 00 0C */ stw r0, 0xc(r1) -/* 80254184 3C 80 43 30 */ lis r4, 0x4330 -/* 80254188 90 81 00 08 */ stw r4, 8(r1) -/* 8025418C C8 01 00 08 */ lfd f0, 8(r1) -/* 80254190 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254194 EC 20 07 B2 */ fmuls f1, f0, f30 -/* 80254198 A8 05 00 02 */ lha r0, 2(r5) -/* 8025419C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802541A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802541A4 90 81 00 10 */ stw r4, 0x10(r1) -/* 802541A8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802541AC EC 00 10 28 */ fsubs f0, f0, f2 -/* 802541B0 EC 40 07 F2 */ fmuls f2, f0, f31 -/* 802541B4 81 9F 00 00 */ lwz r12, 0(r31) -/* 802541B8 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802541BC 7D 89 03 A6 */ mtctr r12 -/* 802541C0 4E 80 04 21 */ bctrl -/* 802541C4 80 BE 00 20 */ lwz r5, 0x20(r30) -/* 802541C8 7F E3 FB 78 */ mr r3, r31 -/* 802541CC A8 05 00 04 */ lha r0, 4(r5) -/* 802541D0 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 802541D4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802541D8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802541DC 3C 80 43 30 */ lis r4, 0x4330 -/* 802541E0 90 81 00 18 */ stw r4, 0x18(r1) -/* 802541E4 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 802541E8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802541EC EC 20 07 B2 */ fmuls f1, f0, f30 -/* 802541F0 A8 05 00 06 */ lha r0, 6(r5) -/* 802541F4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802541F8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802541FC 90 81 00 20 */ stw r4, 0x20(r1) -/* 80254200 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80254204 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254208 EC 40 07 F2 */ fmuls f2, f0, f31 -/* 8025420C 81 9F 00 00 */ lwz r12, 0(r31) -/* 80254210 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 80254214 7D 89 03 A6 */ mtctr r12 -/* 80254218 4E 80 04 21 */ bctrl -/* 8025421C C0 02 B4 88 */ lfs f0, lit_3858(r2) -/* 80254220 C0 7F 00 C0 */ lfs f3, 0xc0(r31) -/* 80254224 FC 00 18 00 */ fcmpu cr0, f0, f3 -/* 80254228 41 82 00 54 */ beq lbl_8025427C -/* 8025422C 80 BE 00 20 */ lwz r5, 0x20(r30) -/* 80254230 7F E3 FB 78 */ mr r3, r31 -/* 80254234 A8 05 00 08 */ lha r0, 8(r5) -/* 80254238 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 8025423C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254240 90 01 00 24 */ stw r0, 0x24(r1) -/* 80254244 3C 80 43 30 */ lis r4, 0x4330 -/* 80254248 90 81 00 20 */ stw r4, 0x20(r1) -/* 8025424C C8 01 00 20 */ lfd f0, 0x20(r1) -/* 80254250 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254254 EC 20 07 B2 */ fmuls f1, f0, f30 -/* 80254258 A8 05 00 0A */ lha r0, 0xa(r5) -/* 8025425C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254260 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80254264 90 81 00 18 */ stw r4, 0x18(r1) -/* 80254268 C8 01 00 18 */ lfd f0, 0x18(r1) -/* 8025426C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254270 EC 40 07 F2 */ fmuls f2, f0, f31 -/* 80254274 38 80 00 7A */ li r4, 0x7a -/* 80254278 48 0A 2F 65 */ bl rotate__7J2DPaneFff13J2DRotateAxisf -lbl_8025427C: -/* 8025427C 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80254280 38 03 00 0C */ addi r0, r3, 0xc -/* 80254284 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80254288 7F E3 FB 78 */ mr r3, r31 -/* 8025428C 48 0A 38 01 */ bl getFirstChildPane__7J2DPaneFv -/* 80254290 7C 64 1B 78 */ mr r4, r3 -/* 80254294 7F C3 F3 78 */ mr r3, r30 -/* 80254298 FC 20 F0 90 */ fmr f1, f30 -/* 8025429C FC 40 F8 90 */ fmr f2, f31 -/* 802542A0 4B FF FE 95 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff -/* 802542A4 7F E3 FB 78 */ mr r3, r31 -/* 802542A8 48 0A 38 1D */ bl getNextChildPane__7J2DPaneFv -/* 802542AC 7C 64 1B 78 */ mr r4, r3 -/* 802542B0 7F C3 F3 78 */ mr r3, r30 -/* 802542B4 FC 20 F0 90 */ fmr f1, f30 -/* 802542B8 FC 40 F8 90 */ fmr f2, f31 -/* 802542BC 4B FF FE 79 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff -lbl_802542C0: -/* 802542C0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* qr0 */ -/* 802542C4 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802542C8 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 /* qr0 */ -/* 802542CC CB C1 00 30 */ lfd f30, 0x30(r1) -/* 802542D0 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 802542D4 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 802542D8 80 01 00 54 */ lwz r0, 0x54(r1) -/* 802542DC 7C 08 03 A6 */ mtlr r0 -/* 802542E0 38 21 00 50 */ addi r1, r1, 0x50 -/* 802542E4 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s b/asm/d/pane/d_pane_class/dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s deleted file mode 100644 index 4079c779eb..0000000000 --- a/asm/d/pane/d_pane_class/dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s +++ /dev/null @@ -1,82 +0,0 @@ -lbl_80255184: -/* 80255184 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80255188 7C 08 02 A6 */ mflr r0 -/* 8025518C 90 01 00 44 */ stw r0, 0x44(r1) -/* 80255190 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255194 48 10 D0 39 */ bl _savegpr_25 -/* 80255198 7C 79 1B 78 */ mr r25, r3 -/* 8025519C 7C 9A 23 78 */ mr r26, r4 -/* 802551A0 7C BD 2B 78 */ mr r29, r5 -/* 802551A4 7C DB 33 78 */ mr r27, r6 -/* 802551A8 7C FE 3B 78 */ mr r30, r7 -/* 802551AC 7D 1F 43 79 */ or. r31, r8, r8 -/* 802551B0 40 82 00 0C */ bne lbl_802551BC -/* 802551B4 38 60 00 00 */ li r3, 0 -/* 802551B8 48 00 00 E8 */ b lbl_802552A0 -lbl_802551BC: -/* 802551BC 7F E3 FB 78 */ mr r3, r31 -/* 802551C0 7F 64 DB 78 */ mr r4, r27 -/* 802551C4 4B DD D5 75 */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc -/* 802551C8 7C 7C 1B 79 */ or. r28, r3, r3 -/* 802551CC 40 82 00 0C */ bne lbl_802551D8 -/* 802551D0 38 60 00 00 */ li r3, 0 -/* 802551D4 48 00 00 CC */ b lbl_802552A0 -lbl_802551D8: -/* 802551D8 7F 43 D3 78 */ mr r3, r26 -/* 802551DC 7F 84 E3 78 */ mr r4, r28 -/* 802551E0 38 A0 00 20 */ li r5, 0x20 -/* 802551E4 48 07 92 F1 */ bl alloc__7JKRHeapFUli -/* 802551E8 90 79 00 00 */ stw r3, 0(r25) -/* 802551EC 7F E3 FB 78 */ mr r3, r31 -/* 802551F0 80 99 00 00 */ lwz r4, 0(r25) -/* 802551F4 7F 85 E3 78 */ mr r5, r28 -/* 802551F8 7F 66 DB 78 */ mr r6, r27 -/* 802551FC 81 9F 00 00 */ lwz r12, 0(r31) -/* 80255200 81 8C 00 1C */ lwz r12, 0x1c(r12) -/* 80255204 7D 89 03 A6 */ mtctr r12 -/* 80255208 4E 80 04 21 */ bctrl -/* 8025520C 7C 65 1B 79 */ or. r5, r3, r3 -/* 80255210 41 82 00 8C */ beq lbl_8025529C -/* 80255214 80 99 00 00 */ lwz r4, 0(r25) -/* 80255218 38 61 00 08 */ addi r3, r1, 8 -/* 8025521C 3C C0 80 3C */ lis r6, __vt__10JSUIosBase@ha /* 0x803C2DF8@ha */ -/* 80255220 38 06 2D F8 */ addi r0, r6, __vt__10JSUIosBase@l /* 0x803C2DF8@l */ -/* 80255224 90 01 00 08 */ stw r0, 8(r1) -/* 80255228 38 00 00 00 */ li r0, 0 -/* 8025522C 98 01 00 0C */ stb r0, 0xc(r1) -/* 80255230 3C C0 80 3D */ lis r6, __vt__14JSUInputStream@ha /* 0x803CC4D4@ha */ -/* 80255234 38 06 C4 D4 */ addi r0, r6, __vt__14JSUInputStream@l /* 0x803CC4D4@l */ -/* 80255238 90 01 00 08 */ stw r0, 8(r1) -/* 8025523C 3C C0 80 3D */ lis r6, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 80255240 38 06 C4 B0 */ addi r0, r6, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 80255244 90 01 00 08 */ stw r0, 8(r1) -/* 80255248 3C C0 80 3D */ lis r6, __vt__20JSUMemoryInputStream@ha /* 0x803CC4F0@ha */ -/* 8025524C 38 06 C4 F0 */ addi r0, r6, __vt__20JSUMemoryInputStream@l /* 0x803CC4F0@l */ -/* 80255250 90 01 00 08 */ stw r0, 8(r1) -/* 80255254 48 08 72 CD */ bl setBuffer__20JSUMemoryInputStreamFPCvl -/* 80255258 7F A3 EB 78 */ mr r3, r29 -/* 8025525C 38 81 00 08 */ addi r4, r1, 8 -/* 80255260 7F C5 F3 78 */ mr r5, r30 -/* 80255264 7F E6 FB 78 */ mr r6, r31 -/* 80255268 48 0A 34 E1 */ bl setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive -/* 8025526C 7C 7D 1B 78 */ mr r29, r3 -/* 80255270 3C 60 80 3D */ lis r3, __vt__20JSUMemoryInputStream@ha /* 0x803CC4F0@ha */ -/* 80255274 38 03 C4 F0 */ addi r0, r3, __vt__20JSUMemoryInputStream@l /* 0x803CC4F0@l */ -/* 80255278 90 01 00 08 */ stw r0, 8(r1) -/* 8025527C 3C 60 80 3D */ lis r3, __vt__20JSURandomInputStream@ha /* 0x803CC4B0@ha */ -/* 80255280 38 03 C4 B0 */ addi r0, r3, __vt__20JSURandomInputStream@l /* 0x803CC4B0@l */ -/* 80255284 90 01 00 08 */ stw r0, 8(r1) -/* 80255288 38 61 00 08 */ addi r3, r1, 8 -/* 8025528C 38 80 00 00 */ li r4, 0 -/* 80255290 48 08 6F AD */ bl __dt__14JSUInputStreamFv -/* 80255294 7F A3 EB 78 */ mr r3, r29 -/* 80255298 48 00 00 08 */ b lbl_802552A0 -lbl_8025529C: -/* 8025529C 38 60 00 00 */ li r3, 0 -lbl_802552A0: -/* 802552A0 39 61 00 40 */ addi r11, r1, 0x40 -/* 802552A4 48 10 CF 75 */ bl _restgpr_25 -/* 802552A8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802552AC 7C 08 03 A6 */ mtlr r0 -/* 802552B0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802552B4 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/func_802548BC.s b/asm/d/pane/d_pane_class/func_802548BC.s deleted file mode 100644 index 6305a220ae..0000000000 --- a/asm/d/pane/d_pane_class/func_802548BC.s +++ /dev/null @@ -1,263 +0,0 @@ -lbl_802548BC: -/* 802548BC 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 802548C0 7C 08 02 A6 */ mflr r0 -/* 802548C4 90 01 00 54 */ stw r0, 0x54(r1) -/* 802548C8 39 61 00 50 */ addi r11, r1, 0x50 -/* 802548CC 48 10 D9 09 */ bl _savegpr_27 -/* 802548D0 7C 7B 1B 78 */ mr r27, r3 -/* 802548D4 7C BC 2B 78 */ mr r28, r5 -/* 802548D8 7C DD 33 78 */ mr r29, r6 -/* 802548DC 7C FE 3B 78 */ mr r30, r7 -/* 802548E0 7D 1F 43 78 */ mr r31, r8 -/* 802548E4 A8 C3 00 6A */ lha r6, 0x6a(r3) -/* 802548E8 7C 85 07 34 */ extsh r5, r4 -/* 802548EC 38 05 FF FF */ addi r0, r5, -1 -/* 802548F0 7C 06 00 00 */ cmpw r6, r0 -/* 802548F4 40 80 03 58 */ bge lbl_80254C4C -/* 802548F8 38 06 00 01 */ addi r0, r6, 1 -/* 802548FC B0 1B 00 6A */ sth r0, 0x6a(r27) -/* 80254900 A8 BB 00 6A */ lha r5, 0x6a(r27) -/* 80254904 7D 26 4B 78 */ mr r6, r9 -/* 80254908 48 00 0D 51 */ bl rateCalc__13CPaneMgrAlphaFssUc -/* 8025490C 38 00 FF FF */ li r0, -1 -/* 80254910 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80254914 90 01 00 18 */ stw r0, 0x18(r1) -/* 80254918 88 1C 00 00 */ lbz r0, 0(r28) -/* 8025491C 88 9D 00 00 */ lbz r4, 0(r29) -/* 80254920 7C 00 20 40 */ cmplw r0, r4 -/* 80254924 41 82 00 4C */ beq lbl_80254970 -/* 80254928 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 8025492C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80254930 3C 60 43 30 */ lis r3, 0x4330 -/* 80254934 90 61 00 20 */ stw r3, 0x20(r1) -/* 80254938 C8 01 00 20 */ lfd f0, 0x20(r1) -/* 8025493C EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254940 7C 00 20 50 */ subf r0, r0, r4 -/* 80254944 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254948 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025494C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254950 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254954 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254958 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025495C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254960 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254964 FC 00 00 1E */ fctiwz f0, f0 -/* 80254968 D8 01 00 30 */ stfd f0, 0x30(r1) -/* 8025496C 80 81 00 34 */ lwz r4, 0x34(r1) -lbl_80254970: -/* 80254970 98 81 00 1C */ stb r4, 0x1c(r1) -/* 80254974 88 1C 00 01 */ lbz r0, 1(r28) -/* 80254978 88 9D 00 01 */ lbz r4, 1(r29) -/* 8025497C 7C 00 20 40 */ cmplw r0, r4 -/* 80254980 41 82 00 54 */ beq lbl_802549D4 -/* 80254984 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254988 90 01 00 34 */ stw r0, 0x34(r1) -/* 8025498C 3C 60 43 30 */ lis r3, 0x4330 -/* 80254990 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254994 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254998 EC 60 10 28 */ fsubs f3, f0, f2 -/* 8025499C 7C 00 20 50 */ subf r0, r0, r4 -/* 802549A0 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 802549A4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802549A8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 802549AC 90 61 00 28 */ stw r3, 0x28(r1) -/* 802549B0 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 802549B4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802549B8 EC 01 00 32 */ fmuls f0, f1, f0 -/* 802549BC EC 03 00 2A */ fadds f0, f3, f0 -/* 802549C0 FC 00 00 1E */ fctiwz f0, f0 -/* 802549C4 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 802549C8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802549CC 98 01 00 1D */ stb r0, 0x1d(r1) -/* 802549D0 48 00 00 08 */ b lbl_802549D8 -lbl_802549D4: -/* 802549D4 98 81 00 1D */ stb r4, 0x1d(r1) -lbl_802549D8: -/* 802549D8 88 1C 00 02 */ lbz r0, 2(r28) -/* 802549DC 88 9D 00 02 */ lbz r4, 2(r29) -/* 802549E0 7C 00 20 40 */ cmplw r0, r4 -/* 802549E4 41 82 00 54 */ beq lbl_80254A38 -/* 802549E8 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 802549EC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802549F0 3C 60 43 30 */ lis r3, 0x4330 -/* 802549F4 90 61 00 30 */ stw r3, 0x30(r1) -/* 802549F8 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 802549FC EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254A00 7C 00 20 50 */ subf r0, r0, r4 -/* 80254A04 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254A08 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254A0C 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254A10 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254A14 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254A18 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254A1C EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254A20 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254A24 FC 00 00 1E */ fctiwz f0, f0 -/* 80254A28 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254A2C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80254A30 98 01 00 1E */ stb r0, 0x1e(r1) -/* 80254A34 48 00 00 08 */ b lbl_80254A3C -lbl_80254A38: -/* 80254A38 98 81 00 1E */ stb r4, 0x1e(r1) -lbl_80254A3C: -/* 80254A3C 88 1C 00 03 */ lbz r0, 3(r28) -/* 80254A40 88 9D 00 03 */ lbz r4, 3(r29) -/* 80254A44 7C 00 20 40 */ cmplw r0, r4 -/* 80254A48 41 82 00 54 */ beq lbl_80254A9C -/* 80254A4C C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254A50 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254A54 3C 60 43 30 */ lis r3, 0x4330 -/* 80254A58 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254A5C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254A60 EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254A64 7C 00 20 50 */ subf r0, r0, r4 -/* 80254A68 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254A6C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254A70 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254A74 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254A78 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254A7C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254A80 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254A84 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254A88 FC 00 00 1E */ fctiwz f0, f0 -/* 80254A8C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254A90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80254A94 98 01 00 1F */ stb r0, 0x1f(r1) -/* 80254A98 48 00 00 08 */ b lbl_80254AA0 -lbl_80254A9C: -/* 80254A9C 98 81 00 1F */ stb r4, 0x1f(r1) -lbl_80254AA0: -/* 80254AA0 88 1E 00 00 */ lbz r0, 0(r30) -/* 80254AA4 88 9F 00 00 */ lbz r4, 0(r31) -/* 80254AA8 7C 00 20 40 */ cmplw r0, r4 -/* 80254AAC 41 82 00 4C */ beq lbl_80254AF8 -/* 80254AB0 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254AB4 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254AB8 3C 60 43 30 */ lis r3, 0x4330 -/* 80254ABC 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254AC0 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254AC4 EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254AC8 7C 00 20 50 */ subf r0, r0, r4 -/* 80254ACC C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254AD0 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254AD4 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254AD8 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254ADC C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254AE0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254AE4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254AE8 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254AEC FC 00 00 1E */ fctiwz f0, f0 -/* 80254AF0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254AF4 80 81 00 24 */ lwz r4, 0x24(r1) -lbl_80254AF8: -/* 80254AF8 98 81 00 18 */ stb r4, 0x18(r1) -/* 80254AFC 88 1E 00 01 */ lbz r0, 1(r30) -/* 80254B00 88 9F 00 01 */ lbz r4, 1(r31) -/* 80254B04 7C 00 20 40 */ cmplw r0, r4 -/* 80254B08 41 82 00 54 */ beq lbl_80254B5C -/* 80254B0C C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254B10 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254B14 3C 60 43 30 */ lis r3, 0x4330 -/* 80254B18 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254B1C C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254B20 EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254B24 7C 00 20 50 */ subf r0, r0, r4 -/* 80254B28 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254B2C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254B30 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254B34 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254B38 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254B3C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254B40 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254B44 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254B48 FC 00 00 1E */ fctiwz f0, f0 -/* 80254B4C D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254B50 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80254B54 98 01 00 19 */ stb r0, 0x19(r1) -/* 80254B58 48 00 00 08 */ b lbl_80254B60 -lbl_80254B5C: -/* 80254B5C 98 81 00 19 */ stb r4, 0x19(r1) -lbl_80254B60: -/* 80254B60 88 1E 00 02 */ lbz r0, 2(r30) -/* 80254B64 88 9F 00 02 */ lbz r4, 2(r31) -/* 80254B68 7C 00 20 40 */ cmplw r0, r4 -/* 80254B6C 41 82 00 54 */ beq lbl_80254BC0 -/* 80254B70 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254B74 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254B78 3C 60 43 30 */ lis r3, 0x4330 -/* 80254B7C 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254B80 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254B84 EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254B88 7C 00 20 50 */ subf r0, r0, r4 -/* 80254B8C C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254B90 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254B94 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254B98 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254B9C C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254BA0 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254BA4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254BA8 EC 03 00 2A */ fadds f0, f3, f0 -/* 80254BAC FC 00 00 1E */ fctiwz f0, f0 -/* 80254BB0 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254BB4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80254BB8 98 01 00 1A */ stb r0, 0x1a(r1) -/* 80254BBC 48 00 00 08 */ b lbl_80254BC4 -lbl_80254BC0: -/* 80254BC0 98 81 00 1A */ stb r4, 0x1a(r1) -lbl_80254BC4: -/* 80254BC4 88 1E 00 03 */ lbz r0, 3(r30) -/* 80254BC8 88 9F 00 03 */ lbz r4, 3(r31) -/* 80254BCC 7C 00 20 40 */ cmplw r0, r4 -/* 80254BD0 41 82 00 54 */ beq lbl_80254C24 -/* 80254BD4 C8 42 B4 A0 */ lfd f2, lit_4349(r2) -/* 80254BD8 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254BDC 3C 60 43 30 */ lis r3, 0x4330 -/* 80254BE0 90 61 00 30 */ stw r3, 0x30(r1) -/* 80254BE4 C8 01 00 30 */ lfd f0, 0x30(r1) -/* 80254BE8 EC 60 10 28 */ fsubs f3, f0, f2 -/* 80254BEC 7C 00 20 50 */ subf r0, r0, r4 -/* 80254BF0 C8 42 B4 90 */ lfd f2, lit_3860(r2) -/* 80254BF4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80254BF8 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80254BFC 90 61 00 28 */ stw r3, 0x28(r1) -/* 80254C00 C8 01 00 28 */ lfd f0, 0x28(r1) -/* 80254C04 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80254C08 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80254C0C EC 03 00 2A */ fadds f0, f3, f0 -/* 80254C10 FC 00 00 1E */ fctiwz f0, f0 -/* 80254C14 D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80254C18 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80254C1C 98 01 00 1B */ stb r0, 0x1b(r1) -/* 80254C20 48 00 00 08 */ b lbl_80254C28 -lbl_80254C24: -/* 80254C24 98 81 00 1B */ stb r4, 0x1b(r1) -lbl_80254C28: -/* 80254C28 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80254C2C 90 01 00 10 */ stw r0, 0x10(r1) -/* 80254C30 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80254C34 90 01 00 14 */ stw r0, 0x14(r1) -/* 80254C38 7F 63 DB 78 */ mr r3, r27 -/* 80254C3C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80254C40 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80254C44 4B FF F8 15 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80254C48 48 00 00 2C */ b lbl_80254C74 -lbl_80254C4C: -/* 80254C4C B0 9B 00 6A */ sth r4, 0x6a(r27) -/* 80254C50 80 1F 00 00 */ lwz r0, 0(r31) -/* 80254C54 90 01 00 08 */ stw r0, 8(r1) -/* 80254C58 80 1D 00 00 */ lwz r0, 0(r29) -/* 80254C5C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80254C60 38 81 00 0C */ addi r4, r1, 0xc -/* 80254C64 38 A1 00 08 */ addi r5, r1, 8 -/* 80254C68 4B FF F7 F1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor -/* 80254C6C 38 60 00 01 */ li r3, 1 -/* 80254C70 48 00 00 08 */ b lbl_80254C78 -lbl_80254C74: -/* 80254C74 38 60 00 00 */ li r3, 0 -lbl_80254C78: -/* 80254C78 39 61 00 50 */ addi r11, r1, 0x50 -/* 80254C7C 48 10 D5 A5 */ bl _restgpr_27 -/* 80254C80 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80254C84 7C 08 03 A6 */ mtlr r0 -/* 80254C88 38 21 00 50 */ addi r1, r1, 0x50 -/* 80254C8C 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/getBounds__8CPaneMgrFP7J2DPane.s b/asm/d/pane/d_pane_class/getBounds__8CPaneMgrFP7J2DPane.s deleted file mode 100644 index cc04d1fdb7..0000000000 --- a/asm/d/pane/d_pane_class/getBounds__8CPaneMgrFP7J2DPane.s +++ /dev/null @@ -1,78 +0,0 @@ -lbl_80254FB8: -/* 80254FB8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80254FBC 7C 08 02 A6 */ mflr r0 -/* 80254FC0 90 01 00 44 */ stw r0, 0x44(r1) -/* 80254FC4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 80254FC8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* qr0 */ -/* 80254FCC 39 61 00 30 */ addi r11, r1, 0x30 -/* 80254FD0 48 10 D2 0D */ bl _savegpr_29 -/* 80254FD4 7C 7D 1B 78 */ mr r29, r3 -/* 80254FD8 7C 9E 23 78 */ mr r30, r4 -/* 80254FDC 7F C3 F3 78 */ mr r3, r30 -/* 80254FE0 48 0A 21 21 */ bl getBounds__7J2DPaneFv -/* 80254FE4 C0 03 00 00 */ lfs f0, 0(r3) -/* 80254FE8 D0 01 00 08 */ stfs f0, 8(r1) -/* 80254FEC C0 03 00 04 */ lfs f0, 4(r3) -/* 80254FF0 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80254FF4 C0 03 00 08 */ lfs f0, 8(r3) -/* 80254FF8 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80254FFC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 80255000 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80255004 7F C3 F3 78 */ mr r3, r30 -/* 80255008 48 0A 2A F5 */ bl getParentPane__7J2DPaneFv -/* 8025500C 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80255010 41 82 00 54 */ beq lbl_80255064 -/* 80255014 7F A3 EB 78 */ mr r3, r29 -/* 80255018 7F E4 FB 78 */ mr r4, r31 -/* 8025501C 4B FF FF 9D */ bl getBounds__8CPaneMgrFP7J2DPane -/* 80255020 C3 E3 00 04 */ lfs f31, 4(r3) -/* 80255024 7F A3 EB 78 */ mr r3, r29 -/* 80255028 7F E4 FB 78 */ mr r4, r31 -/* 8025502C 4B FF FF 8D */ bl getBounds__8CPaneMgrFP7J2DPane -/* 80255030 C0 23 00 00 */ lfs f1, 0(r3) -/* 80255034 C0 01 00 08 */ lfs f0, 8(r1) -/* 80255038 EC 00 08 2A */ fadds f0, f0, f1 -/* 8025503C D0 01 00 08 */ stfs f0, 8(r1) -/* 80255040 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80255044 EC 00 F8 2A */ fadds f0, f0, f31 -/* 80255048 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8025504C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80255050 EC 00 08 2A */ fadds f0, f0, f1 -/* 80255054 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80255058 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8025505C EC 00 F8 2A */ fadds f0, f0, f31 -/* 80255060 D0 01 00 14 */ stfs f0, 0x14(r1) -lbl_80255064: -/* 80255064 C0 1E 00 D4 */ lfs f0, 0xd4(r30) -/* 80255068 FC 20 00 50 */ fneg f1, f0 -/* 8025506C C0 1E 00 D8 */ lfs f0, 0xd8(r30) -/* 80255070 FC 40 00 50 */ fneg f2, f0 -/* 80255074 C0 01 00 08 */ lfs f0, 8(r1) -/* 80255078 EC 00 08 2A */ fadds f0, f0, f1 -/* 8025507C D0 01 00 08 */ stfs f0, 8(r1) -/* 80255080 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 80255084 EC 00 10 2A */ fadds f0, f0, f2 -/* 80255088 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8025508C C0 01 00 10 */ lfs f0, 0x10(r1) -/* 80255090 EC 00 08 2A */ fadds f0, f0, f1 -/* 80255094 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80255098 C0 01 00 14 */ lfs f0, 0x14(r1) -/* 8025509C EC 00 10 2A */ fadds f0, f0, f2 -/* 802550A0 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 802550A4 3C 60 80 43 */ lis r3, static_mBounds@ha /* 0x80430748@ha */ -/* 802550A8 80 81 00 08 */ lwz r4, 8(r1) -/* 802550AC 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802550B0 94 83 07 48 */ stwu r4, static_mBounds@l(r3) /* 0x80430748@l */ -/* 802550B4 90 03 00 04 */ stw r0, 4(r3) -/* 802550B8 80 81 00 10 */ lwz r4, 0x10(r1) -/* 802550BC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802550C0 90 83 00 08 */ stw r4, 8(r3) -/* 802550C4 90 03 00 0C */ stw r0, 0xc(r3) -/* 802550C8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* qr0 */ -/* 802550CC CB E1 00 30 */ lfd f31, 0x30(r1) -/* 802550D0 39 61 00 30 */ addi r11, r1, 0x30 -/* 802550D4 48 10 D1 55 */ bl _restgpr_29 -/* 802550D8 80 01 00 44 */ lwz r0, 0x44(r1) -/* 802550DC 7C 08 03 A6 */ mtlr r0 -/* 802550E0 38 21 00 40 */ addi r1, r1, 0x40 -/* 802550E4 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s b/asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s deleted file mode 100644 index 32eb160ba0..0000000000 --- a/asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80254EBC: -/* 80254EBC 94 21 FF 70 */ stwu r1, -0x90(r1) -/* 80254EC0 7C 08 02 A6 */ mflr r0 -/* 80254EC4 90 01 00 94 */ stw r0, 0x94(r1) -/* 80254EC8 39 61 00 90 */ addi r11, r1, 0x90 -/* 80254ECC 48 10 D3 0D */ bl _savegpr_28 -/* 80254ED0 7C 7C 1B 78 */ mr r28, r3 -/* 80254ED4 7C 9D 23 78 */ mr r29, r4 -/* 80254ED8 7C BE 2B 78 */ mr r30, r5 -/* 80254EDC 7C DF 33 78 */ mr r31, r6 -/* 80254EE0 38 61 00 14 */ addi r3, r1, 0x14 -/* 80254EE4 38 C1 00 44 */ addi r6, r1, 0x44 -/* 80254EE8 38 E0 00 00 */ li r7, 0 -/* 80254EEC 7F E8 FB 78 */ mr r8, r31 -/* 80254EF0 39 20 00 00 */ li r9, 0 -/* 80254EF4 4B FF FD 9D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs -/* 80254EF8 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80254EFC 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80254F00 90 61 00 2C */ stw r3, 0x2c(r1) -/* 80254F04 90 01 00 30 */ stw r0, 0x30(r1) -/* 80254F08 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80254F0C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80254F10 38 61 00 08 */ addi r3, r1, 8 -/* 80254F14 7F A4 EB 78 */ mr r4, r29 -/* 80254F18 7F C5 F3 78 */ mr r5, r30 -/* 80254F1C 38 C1 00 44 */ addi r6, r1, 0x44 -/* 80254F20 38 E0 00 03 */ li r7, 3 -/* 80254F24 7F E8 FB 78 */ mr r8, r31 -/* 80254F28 39 20 00 00 */ li r9, 0 -/* 80254F2C 4B FF FD 65 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs -/* 80254F30 80 61 00 08 */ lwz r3, 8(r1) -/* 80254F34 80 01 00 0C */ lwz r0, 0xc(r1) -/* 80254F38 90 61 00 20 */ stw r3, 0x20(r1) -/* 80254F3C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80254F40 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80254F44 90 01 00 28 */ stw r0, 0x28(r1) -/* 80254F48 C0 42 B4 98 */ lfs f2, lit_4046(r2) -/* 80254F4C C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 80254F50 C0 01 00 20 */ lfs f0, 0x20(r1) -/* 80254F54 EC 01 00 2A */ fadds f0, f1, f0 -/* 80254F58 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80254F5C D0 01 00 38 */ stfs f0, 0x38(r1) -/* 80254F60 C0 21 00 30 */ lfs f1, 0x30(r1) -/* 80254F64 C0 01 00 24 */ lfs f0, 0x24(r1) -/* 80254F68 EC 01 00 2A */ fadds f0, f1, f0 -/* 80254F6C EC 02 00 32 */ fmuls f0, f2, f0 -/* 80254F70 D0 01 00 3C */ stfs f0, 0x3c(r1) -/* 80254F74 C0 21 00 34 */ lfs f1, 0x34(r1) -/* 80254F78 C0 01 00 28 */ lfs f0, 0x28(r1) -/* 80254F7C EC 01 00 2A */ fadds f0, f1, f0 -/* 80254F80 EC 02 00 32 */ fmuls f0, f2, f0 -/* 80254F84 D0 01 00 40 */ stfs f0, 0x40(r1) -/* 80254F88 80 61 00 38 */ lwz r3, 0x38(r1) -/* 80254F8C 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80254F90 90 7C 00 00 */ stw r3, 0(r28) -/* 80254F94 90 1C 00 04 */ stw r0, 4(r28) -/* 80254F98 80 01 00 40 */ lwz r0, 0x40(r1) -/* 80254F9C 90 1C 00 08 */ stw r0, 8(r28) -/* 80254FA0 39 61 00 90 */ addi r11, r1, 0x90 -/* 80254FA4 48 10 D2 81 */ bl _restgpr_28 -/* 80254FA8 80 01 00 94 */ lwz r0, 0x94(r1) -/* 80254FAC 7C 08 03 A6 */ mtlr r0 -/* 80254FB0 38 21 00 90 */ addi r1, r1, 0x90 -/* 80254FB4 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s b/asm/d/pane/d_pane_class/getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s deleted file mode 100644 index c1fe7f5128..0000000000 --- a/asm/d/pane/d_pane_class/getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s +++ /dev/null @@ -1,148 +0,0 @@ -lbl_80254C90: -/* 80254C90 94 21 FE A0 */ stwu r1, -0x160(r1) -/* 80254C94 7C 08 02 A6 */ mflr r0 -/* 80254C98 90 01 01 64 */ stw r0, 0x164(r1) -/* 80254C9C 39 61 01 60 */ addi r11, r1, 0x160 -/* 80254CA0 48 10 D5 29 */ bl _savegpr_24 -/* 80254CA4 7C 7F 1B 78 */ mr r31, r3 -/* 80254CA8 7C 98 23 78 */ mr r24, r4 -/* 80254CAC 7C B9 2B 78 */ mr r25, r5 -/* 80254CB0 7C DA 33 78 */ mr r26, r6 -/* 80254CB4 7C FB 3B 78 */ mr r27, r7 -/* 80254CB8 7D 1C 43 78 */ mr r28, r8 -/* 80254CBC 7D 3D 4B 78 */ mr r29, r9 -/* 80254CC0 7F 23 CB 78 */ mr r3, r25 -/* 80254CC4 48 0A 2E 39 */ bl getParentPane__7J2DPaneFv -/* 80254CC8 7C 7E 1B 78 */ mr r30, r3 -/* 80254CCC 38 61 00 60 */ addi r3, r1, 0x60 -/* 80254CD0 C0 22 B4 88 */ lfs f1, lit_3858(r2) -/* 80254CD4 FC 40 08 90 */ fmr f2, f1 -/* 80254CD8 C0 62 B4 A8 */ lfs f3, lit_4473(r2) -/* 80254CDC C0 82 B4 AC */ lfs f4, lit_4474(r2) -/* 80254CE0 C0 A2 B4 B0 */ lfs f5, lit_4475(r2) -/* 80254CE4 C0 C2 B4 B4 */ lfs f6, lit_4476(r2) -/* 80254CE8 48 09 49 E9 */ bl __ct__13J2DOrthoGraphFffffff -/* 80254CEC C0 02 B4 88 */ lfs f0, lit_3858(r2) -/* 80254CF0 D0 01 00 08 */ stfs f0, 8(r1) -/* 80254CF4 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 80254CF8 C0 02 B4 A8 */ lfs f0, lit_4473(r2) -/* 80254CFC D0 01 00 10 */ stfs f0, 0x10(r1) -/* 80254D00 C0 02 B4 AC */ lfs f0, lit_4474(r2) -/* 80254D04 D0 01 00 14 */ stfs f0, 0x14(r1) -/* 80254D08 38 61 00 60 */ addi r3, r1, 0x60 -/* 80254D0C 38 81 00 08 */ addi r4, r1, 8 -/* 80254D10 C0 22 B4 B0 */ lfs f1, lit_4475(r2) -/* 80254D14 C0 42 B4 B4 */ lfs f2, lit_4476(r2) -/* 80254D18 48 09 4A F5 */ bl func_802E980C -/* 80254D1C 28 1E 00 00 */ cmplwi r30, 0 -/* 80254D20 41 82 00 44 */ beq lbl_80254D64 -/* 80254D24 38 61 00 18 */ addi r3, r1, 0x18 -/* 80254D28 7F 04 C3 78 */ mr r4, r24 -/* 80254D2C 7F C5 F3 78 */ mr r5, r30 -/* 80254D30 7F 46 D3 78 */ mr r6, r26 -/* 80254D34 7F 67 DB 78 */ mr r7, r27 -/* 80254D38 7F 88 E3 78 */ mr r8, r28 -/* 80254D3C 7F A9 07 34 */ extsh r9, r29 -/* 80254D40 4B FF FF 51 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs -/* 80254D44 7F 43 D3 78 */ mr r3, r26 -/* 80254D48 38 81 00 30 */ addi r4, r1, 0x30 -/* 80254D4C 48 0F 17 65 */ bl PSMTXCopy -/* 80254D50 38 61 00 30 */ addi r3, r1, 0x30 -/* 80254D54 38 99 00 50 */ addi r4, r25, 0x50 -/* 80254D58 7F 45 D3 78 */ mr r5, r26 -/* 80254D5C 48 0F 17 89 */ bl PSMTXConcat -/* 80254D60 48 00 00 24 */ b lbl_80254D84 -lbl_80254D64: -/* 80254D64 7F 23 CB 78 */ mr r3, r25 -/* 80254D68 81 99 00 00 */ lwz r12, 0(r25) -/* 80254D6C 81 8C 00 2C */ lwz r12, 0x2c(r12) -/* 80254D70 7D 89 03 A6 */ mtctr r12 -/* 80254D74 4E 80 04 21 */ bctrl -/* 80254D78 38 79 00 50 */ addi r3, r25, 0x50 -/* 80254D7C 7F 44 D3 78 */ mr r4, r26 -/* 80254D80 48 0F 17 31 */ bl PSMTXCopy -lbl_80254D84: -/* 80254D84 57 60 06 3E */ clrlwi r0, r27, 0x18 -/* 80254D88 28 00 00 04 */ cmplwi r0, 4 -/* 80254D8C 41 80 00 48 */ blt lbl_80254DD4 -/* 80254D90 C0 02 B4 88 */ lfs f0, lit_3858(r2) -/* 80254D94 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80254D98 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80254D9C D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80254DA0 80 61 00 24 */ lwz r3, 0x24(r1) -/* 80254DA4 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80254DA8 90 7F 00 00 */ stw r3, 0(r31) -/* 80254DAC 90 1F 00 04 */ stw r0, 4(r31) -/* 80254DB0 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80254DB4 90 1F 00 08 */ stw r0, 8(r31) -/* 80254DB8 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 80254DBC 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 80254DC0 90 01 00 60 */ stw r0, 0x60(r1) -/* 80254DC4 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 80254DC8 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 80254DCC 90 01 00 60 */ stw r0, 0x60(r1) -/* 80254DD0 48 00 00 D4 */ b lbl_80254EA4 -lbl_80254DD4: -/* 80254DD4 7F 03 C3 78 */ mr r3, r24 -/* 80254DD8 7F 24 CB 78 */ mr r4, r25 -/* 80254DDC 48 00 01 DD */ bl getBounds__8CPaneMgrFP7J2DPane -/* 80254DE0 C0 03 00 00 */ lfs f0, 0(r3) -/* 80254DE4 C0 23 00 04 */ lfs f1, 4(r3) -/* 80254DE8 C0 63 00 08 */ lfs f3, 8(r3) -/* 80254DEC C0 83 00 0C */ lfs f4, 0xc(r3) -/* 80254DF0 57 63 06 3E */ clrlwi r3, r27, 0x18 -/* 80254DF4 57 60 07 FF */ clrlwi. r0, r27, 0x1f -/* 80254DF8 41 82 00 08 */ beq lbl_80254E00 -/* 80254DFC 48 00 00 08 */ b lbl_80254E04 -lbl_80254E00: -/* 80254E00 FC 60 00 90 */ fmr f3, f0 -lbl_80254E04: -/* 80254E04 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e -/* 80254E08 41 82 00 08 */ beq lbl_80254E10 -/* 80254E0C 48 00 00 08 */ b lbl_80254E14 -lbl_80254E10: -/* 80254E10 FC 80 08 90 */ fmr f4, f1 -lbl_80254E14: -/* 80254E14 C0 5A 00 0C */ lfs f2, 0xc(r26) -/* 80254E18 C0 1A 00 00 */ lfs f0, 0(r26) -/* 80254E1C EC 23 00 32 */ fmuls f1, f3, f0 -/* 80254E20 C0 1A 00 04 */ lfs f0, 4(r26) -/* 80254E24 EC 04 00 32 */ fmuls f0, f4, f0 -/* 80254E28 EC 01 00 2A */ fadds f0, f1, f0 -/* 80254E2C EC 02 00 2A */ fadds f0, f2, f0 -/* 80254E30 D0 01 00 24 */ stfs f0, 0x24(r1) -/* 80254E34 C0 5A 00 1C */ lfs f2, 0x1c(r26) -/* 80254E38 C0 1A 00 10 */ lfs f0, 0x10(r26) -/* 80254E3C EC 23 00 32 */ fmuls f1, f3, f0 -/* 80254E40 C0 1A 00 14 */ lfs f0, 0x14(r26) -/* 80254E44 EC 04 00 32 */ fmuls f0, f4, f0 -/* 80254E48 EC 01 00 2A */ fadds f0, f1, f0 -/* 80254E4C EC 02 00 2A */ fadds f0, f2, f0 -/* 80254E50 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 80254E54 C0 5A 00 2C */ lfs f2, 0x2c(r26) -/* 80254E58 C0 1A 00 20 */ lfs f0, 0x20(r26) -/* 80254E5C EC 23 00 32 */ fmuls f1, f3, f0 -/* 80254E60 C0 1A 00 24 */ lfs f0, 0x24(r26) -/* 80254E64 EC 04 00 32 */ fmuls f0, f4, f0 -/* 80254E68 EC 01 00 2A */ fadds f0, f1, f0 -/* 80254E6C EC 02 00 2A */ fadds f0, f2, f0 -/* 80254E70 D0 01 00 2C */ stfs f0, 0x2c(r1) -/* 80254E74 80 61 00 24 */ lwz r3, 0x24(r1) -/* 80254E78 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80254E7C 90 7F 00 00 */ stw r3, 0(r31) -/* 80254E80 90 1F 00 04 */ stw r0, 4(r31) -/* 80254E84 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80254E88 90 1F 00 08 */ stw r0, 8(r31) -/* 80254E8C 3C 60 80 3D */ lis r3, __vt__13J2DOrthoGraph@ha /* 0x803CC9E0@ha */ -/* 80254E90 38 03 C9 E0 */ addi r0, r3, __vt__13J2DOrthoGraph@l /* 0x803CC9E0@l */ -/* 80254E94 90 01 00 60 */ stw r0, 0x60(r1) -/* 80254E98 3C 60 80 3D */ lis r3, __vt__14J2DGrafContext@ha /* 0x803CC9B8@ha */ -/* 80254E9C 38 03 C9 B8 */ addi r0, r3, __vt__14J2DGrafContext@l /* 0x803CC9B8@l */ -/* 80254EA0 90 01 00 60 */ stw r0, 0x60(r1) -lbl_80254EA4: -/* 80254EA4 39 61 01 60 */ addi r11, r1, 0x160 -/* 80254EA8 48 10 D3 6D */ bl _restgpr_24 -/* 80254EAC 80 01 01 64 */ lwz r0, 0x164(r1) -/* 80254EB0 7C 08 03 A6 */ mtlr r0 -/* 80254EB4 38 21 01 60 */ addi r1, r1, 0x160 -/* 80254EB8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s b/asm/d/pane/d_pane_class/initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s deleted file mode 100644 index 5245d8d592..0000000000 --- a/asm/d/pane/d_pane_class/initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s +++ /dev/null @@ -1,268 +0,0 @@ -lbl_80253C08: -/* 80253C08 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80253C0C 7C 08 02 A6 */ mflr r0 -/* 80253C10 90 01 00 44 */ stw r0, 0x44(r1) -/* 80253C14 93 E1 00 3C */ stw r31, 0x3c(r1) -/* 80253C18 93 C1 00 38 */ stw r30, 0x38(r1) -/* 80253C1C 7C 7E 1B 78 */ mr r30, r3 -/* 80253C20 7C 9F 23 78 */ mr r31, r4 -/* 80253C24 93 E3 00 04 */ stw r31, 4(r3) -/* 80253C28 28 05 00 00 */ cmplwi r5, 0 -/* 80253C2C 41 82 00 0C */ beq lbl_80253C38 -/* 80253C30 90 BE 00 08 */ stw r5, 8(r30) -/* 80253C34 48 00 00 0C */ b lbl_80253C40 -lbl_80253C38: -/* 80253C38 4B DB B5 B5 */ bl mDoExt_getCurrentHeap__Fv -/* 80253C3C 90 7E 00 08 */ stw r3, 8(r30) -lbl_80253C40: -/* 80253C40 38 00 00 00 */ li r0, 0 -/* 80253C44 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80253C48 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80253C4C 90 1E 00 1C */ stw r0, 0x1c(r30) -/* 80253C50 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80253C54 B0 1E 00 14 */ sth r0, 0x14(r30) -/* 80253C58 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 80253C5C 28 00 00 00 */ cmplwi r0, 0 -/* 80253C60 41 82 00 94 */ beq lbl_80253CF4 -/* 80253C64 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253C68 48 0A 3E 25 */ bl getFirstChildPane__7J2DPaneFv -/* 80253C6C 7C 64 1B 78 */ mr r4, r3 -/* 80253C70 7F C3 F3 78 */ mr r3, r30 -/* 80253C74 48 00 1D ED */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane -/* 80253C78 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 80253C7C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80253C80 41 82 00 38 */ beq lbl_80253CB8 -/* 80253C84 80 7E 00 08 */ lwz r3, 8(r30) -/* 80253C88 A8 1E 00 14 */ lha r0, 0x14(r30) -/* 80253C8C 1C 80 00 0C */ mulli r4, r0, 0xc -/* 80253C90 38 A0 00 20 */ li r5, 0x20 -/* 80253C94 48 07 A8 41 */ bl alloc__7JKRHeapFUli -/* 80253C98 90 7E 00 1C */ stw r3, 0x1c(r30) -/* 80253C9C 80 1E 00 1C */ lwz r0, 0x1c(r30) -/* 80253CA0 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80253CA4 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253CA8 48 0A 3D E5 */ bl getFirstChildPane__7J2DPaneFv -/* 80253CAC 7C 64 1B 78 */ mr r4, r3 -/* 80253CB0 7F C3 F3 78 */ mr r3, r30 -/* 80253CB4 48 00 03 65 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane -lbl_80253CB8: -/* 80253CB8 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 80253CBC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80253CC0 41 82 00 34 */ beq lbl_80253CF4 -/* 80253CC4 80 7E 00 08 */ lwz r3, 8(r30) -/* 80253CC8 A8 9E 00 14 */ lha r4, 0x14(r30) -/* 80253CCC 38 A0 00 20 */ li r5, 0x20 -/* 80253CD0 48 07 A8 05 */ bl alloc__7JKRHeapFUli -/* 80253CD4 90 7E 00 0C */ stw r3, 0xc(r30) -/* 80253CD8 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 80253CDC 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80253CE0 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253CE4 48 0A 3D A9 */ bl getFirstChildPane__7J2DPaneFv -/* 80253CE8 7C 64 1B 78 */ mr r4, r3 -/* 80253CEC 7F C3 F3 78 */ mr r3, r30 -/* 80253CF0 48 00 1D DD */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane -lbl_80253CF4: -/* 80253CF4 7F E3 FB 78 */ mr r3, r31 -/* 80253CF8 48 0A 34 09 */ bl getBounds__7J2DPaneFv -/* 80253CFC C0 03 00 00 */ lfs f0, 0(r3) -/* 80253D00 D0 1E 00 24 */ stfs f0, 0x24(r30) -/* 80253D04 7F E3 FB 78 */ mr r3, r31 -/* 80253D08 48 0A 33 F9 */ bl getBounds__7J2DPaneFv -/* 80253D0C C0 03 00 04 */ lfs f0, 4(r3) -/* 80253D10 D0 1E 00 28 */ stfs f0, 0x28(r30) -/* 80253D14 7F C3 F3 78 */ mr r3, r30 -/* 80253D18 48 00 05 D1 */ bl getGlobalPosX__8CPaneMgrFv -/* 80253D1C D0 3E 00 2C */ stfs f1, 0x2c(r30) -/* 80253D20 7F C3 F3 78 */ mr r3, r30 -/* 80253D24 48 00 06 41 */ bl getGlobalPosY__8CPaneMgrFv -/* 80253D28 D0 3E 00 30 */ stfs f1, 0x30(r30) -/* 80253D2C C0 3F 00 28 */ lfs f1, 0x28(r31) -/* 80253D30 C0 1F 00 20 */ lfs f0, 0x20(r31) -/* 80253D34 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80253D38 D0 1E 00 34 */ stfs f0, 0x34(r30) -/* 80253D3C C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 80253D40 C0 1F 00 24 */ lfs f0, 0x24(r31) -/* 80253D44 EC 01 00 28 */ fsubs f0, f1, f0 -/* 80253D48 D0 1E 00 38 */ stfs f0, 0x38(r30) -/* 80253D4C 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253D50 C0 03 00 CC */ lfs f0, 0xcc(r3) -/* 80253D54 D0 1E 00 3C */ stfs f0, 0x3c(r30) -/* 80253D58 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253D5C C0 03 00 D0 */ lfs f0, 0xd0(r3) -/* 80253D60 D0 1E 00 40 */ stfs f0, 0x40(r30) -/* 80253D64 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253D68 C0 03 00 D4 */ lfs f0, 0xd4(r3) -/* 80253D6C D0 1E 00 44 */ stfs f0, 0x44(r30) -/* 80253D70 80 7E 00 04 */ lwz r3, 4(r30) -/* 80253D74 C0 03 00 D8 */ lfs f0, 0xd8(r3) -/* 80253D78 D0 1E 00 48 */ stfs f0, 0x48(r30) -/* 80253D7C C0 1F 00 C0 */ lfs f0, 0xc0(r31) -/* 80253D80 D0 1E 00 4C */ stfs f0, 0x4c(r30) -/* 80253D84 C0 1F 00 C4 */ lfs f0, 0xc4(r31) -/* 80253D88 D0 1E 00 50 */ stfs f0, 0x50(r30) -/* 80253D8C C0 1F 00 C8 */ lfs f0, 0xc8(r31) -/* 80253D90 D0 1E 00 54 */ stfs f0, 0x54(r30) -/* 80253D94 80 7F 00 08 */ lwz r3, 8(r31) -/* 80253D98 3C 03 AF BF */ addis r0, r3, 0xafbf -/* 80253D9C 28 00 4E 32 */ cmplwi r0, 0x4e32 -/* 80253DA0 40 82 00 10 */ bne lbl_80253DB0 -/* 80253DA4 38 00 00 FF */ li r0, 0xff -/* 80253DA8 98 1E 00 18 */ stb r0, 0x18(r30) -/* 80253DAC 48 00 00 0C */ b lbl_80253DB8 -lbl_80253DB0: -/* 80253DB0 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 80253DB4 98 1E 00 18 */ stb r0, 0x18(r30) -lbl_80253DB8: -/* 80253DB8 38 00 00 00 */ li r0, 0 -/* 80253DBC B0 1E 00 60 */ sth r0, 0x60(r30) -/* 80253DC0 B0 1E 00 62 */ sth r0, 0x62(r30) -/* 80253DC4 B0 1E 00 64 */ sth r0, 0x64(r30) -/* 80253DC8 B0 1E 00 66 */ sth r0, 0x66(r30) -/* 80253DCC B0 1E 00 68 */ sth r0, 0x68(r30) -/* 80253DD0 B0 1E 00 6A */ sth r0, 0x6a(r30) -/* 80253DD4 B0 1E 00 16 */ sth r0, 0x16(r30) -/* 80253DD8 80 9E 00 04 */ lwz r4, 4(r30) -/* 80253DDC 80 C4 00 08 */ lwz r6, 8(r4) -/* 80253DE0 3C A0 54 42 */ lis r5, 0x5442 /* 0x54425833@ha */ -/* 80253DE4 38 05 58 33 */ addi r0, r5, 0x5833 /* 0x54425833@l */ -/* 80253DE8 7C 06 00 00 */ cmpw r6, r0 -/* 80253DEC 40 80 00 34 */ bge lbl_80253E20 -/* 80253DF0 3C 60 50 49 */ lis r3, 0x5049 /* 0x50494333@ha */ -/* 80253DF4 38 03 43 33 */ addi r0, r3, 0x4333 /* 0x50494333@l */ -/* 80253DF8 7C 06 00 00 */ cmpw r6, r0 -/* 80253DFC 40 80 00 14 */ bge lbl_80253E10 -/* 80253E00 38 03 43 31 */ addi r0, r3, 0x4331 -/* 80253E04 7C 06 00 00 */ cmpw r6, r0 -/* 80253E08 40 80 00 B8 */ bge lbl_80253EC0 -/* 80253E0C 48 00 01 B4 */ b lbl_80253FC0 -lbl_80253E10: -/* 80253E10 38 05 58 31 */ addi r0, r5, 0x5831 -/* 80253E14 7C 06 00 00 */ cmpw r6, r0 -/* 80253E18 40 80 01 28 */ bge lbl_80253F40 -/* 80253E1C 48 00 01 A4 */ b lbl_80253FC0 -lbl_80253E20: -/* 80253E20 3C 60 57 49 */ lis r3, 0x5749 /* 0x57494E33@ha */ -/* 80253E24 38 03 4E 33 */ addi r0, r3, 0x4E33 /* 0x57494E33@l */ -/* 80253E28 7C 06 00 00 */ cmpw r6, r0 -/* 80253E2C 40 80 01 94 */ bge lbl_80253FC0 -/* 80253E30 38 03 4E 31 */ addi r0, r3, 0x4e31 -/* 80253E34 7C 06 00 00 */ cmpw r6, r0 -/* 80253E38 40 80 00 08 */ bge lbl_80253E40 -/* 80253E3C 48 00 01 84 */ b lbl_80253FC0 -lbl_80253E40: -/* 80253E40 38 61 00 30 */ addi r3, r1, 0x30 -/* 80253E44 81 84 00 00 */ lwz r12, 0(r4) -/* 80253E48 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 80253E4C 7D 89 03 A6 */ mtctr r12 -/* 80253E50 4E 80 04 21 */ bctrl -/* 80253E54 80 01 00 30 */ lwz r0, 0x30(r1) -/* 80253E58 90 01 00 34 */ stw r0, 0x34(r1) -/* 80253E5C 88 01 00 34 */ lbz r0, 0x34(r1) -/* 80253E60 98 1E 00 58 */ stb r0, 0x58(r30) -/* 80253E64 88 01 00 35 */ lbz r0, 0x35(r1) -/* 80253E68 98 1E 00 59 */ stb r0, 0x59(r30) -/* 80253E6C 88 01 00 36 */ lbz r0, 0x36(r1) -/* 80253E70 98 1E 00 5A */ stb r0, 0x5a(r30) -/* 80253E74 88 01 00 37 */ lbz r0, 0x37(r1) -/* 80253E78 98 1E 00 5B */ stb r0, 0x5b(r30) -/* 80253E7C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80253E80 80 9E 00 04 */ lwz r4, 4(r30) -/* 80253E84 81 84 00 00 */ lwz r12, 0(r4) -/* 80253E88 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 80253E8C 7D 89 03 A6 */ mtctr r12 -/* 80253E90 4E 80 04 21 */ bctrl -/* 80253E94 80 01 00 28 */ lwz r0, 0x28(r1) -/* 80253E98 90 01 00 2C */ stw r0, 0x2c(r1) -/* 80253E9C 88 01 00 2C */ lbz r0, 0x2c(r1) -/* 80253EA0 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 80253EA4 88 01 00 2D */ lbz r0, 0x2d(r1) -/* 80253EA8 98 1E 00 5D */ stb r0, 0x5d(r30) -/* 80253EAC 88 01 00 2E */ lbz r0, 0x2e(r1) -/* 80253EB0 98 1E 00 5E */ stb r0, 0x5e(r30) -/* 80253EB4 88 01 00 2F */ lbz r0, 0x2f(r1) -/* 80253EB8 98 1E 00 5F */ stb r0, 0x5f(r30) -/* 80253EBC 48 00 01 2C */ b lbl_80253FE8 -lbl_80253EC0: -/* 80253EC0 38 61 00 20 */ addi r3, r1, 0x20 -/* 80253EC4 81 84 00 00 */ lwz r12, 0(r4) -/* 80253EC8 81 8C 01 38 */ lwz r12, 0x138(r12) -/* 80253ECC 7D 89 03 A6 */ mtctr r12 -/* 80253ED0 4E 80 04 21 */ bctrl -/* 80253ED4 80 01 00 20 */ lwz r0, 0x20(r1) -/* 80253ED8 90 01 00 24 */ stw r0, 0x24(r1) -/* 80253EDC 88 01 00 24 */ lbz r0, 0x24(r1) -/* 80253EE0 98 1E 00 58 */ stb r0, 0x58(r30) -/* 80253EE4 88 01 00 25 */ lbz r0, 0x25(r1) -/* 80253EE8 98 1E 00 59 */ stb r0, 0x59(r30) -/* 80253EEC 88 01 00 26 */ lbz r0, 0x26(r1) -/* 80253EF0 98 1E 00 5A */ stb r0, 0x5a(r30) -/* 80253EF4 88 01 00 27 */ lbz r0, 0x27(r1) -/* 80253EF8 98 1E 00 5B */ stb r0, 0x5b(r30) -/* 80253EFC 38 61 00 18 */ addi r3, r1, 0x18 -/* 80253F00 80 9E 00 04 */ lwz r4, 4(r30) -/* 80253F04 81 84 00 00 */ lwz r12, 0(r4) -/* 80253F08 81 8C 01 34 */ lwz r12, 0x134(r12) -/* 80253F0C 7D 89 03 A6 */ mtctr r12 -/* 80253F10 4E 80 04 21 */ bctrl -/* 80253F14 80 01 00 18 */ lwz r0, 0x18(r1) -/* 80253F18 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80253F1C 88 01 00 1C */ lbz r0, 0x1c(r1) -/* 80253F20 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 80253F24 88 01 00 1D */ lbz r0, 0x1d(r1) -/* 80253F28 98 1E 00 5D */ stb r0, 0x5d(r30) -/* 80253F2C 88 01 00 1E */ lbz r0, 0x1e(r1) -/* 80253F30 98 1E 00 5E */ stb r0, 0x5e(r30) -/* 80253F34 88 01 00 1F */ lbz r0, 0x1f(r1) -/* 80253F38 98 1E 00 5F */ stb r0, 0x5f(r30) -/* 80253F3C 48 00 00 AC */ b lbl_80253FE8 -lbl_80253F40: -/* 80253F40 38 61 00 10 */ addi r3, r1, 0x10 -/* 80253F44 81 84 00 00 */ lwz r12, 0(r4) -/* 80253F48 81 8C 00 B4 */ lwz r12, 0xb4(r12) -/* 80253F4C 7D 89 03 A6 */ mtctr r12 -/* 80253F50 4E 80 04 21 */ bctrl -/* 80253F54 80 01 00 10 */ lwz r0, 0x10(r1) -/* 80253F58 90 01 00 14 */ stw r0, 0x14(r1) -/* 80253F5C 88 01 00 14 */ lbz r0, 0x14(r1) -/* 80253F60 98 1E 00 58 */ stb r0, 0x58(r30) -/* 80253F64 88 01 00 15 */ lbz r0, 0x15(r1) -/* 80253F68 98 1E 00 59 */ stb r0, 0x59(r30) -/* 80253F6C 88 01 00 16 */ lbz r0, 0x16(r1) -/* 80253F70 98 1E 00 5A */ stb r0, 0x5a(r30) -/* 80253F74 88 01 00 17 */ lbz r0, 0x17(r1) -/* 80253F78 98 1E 00 5B */ stb r0, 0x5b(r30) -/* 80253F7C 38 61 00 08 */ addi r3, r1, 8 -/* 80253F80 80 9E 00 04 */ lwz r4, 4(r30) -/* 80253F84 81 84 00 00 */ lwz r12, 0(r4) -/* 80253F88 81 8C 00 B0 */ lwz r12, 0xb0(r12) -/* 80253F8C 7D 89 03 A6 */ mtctr r12 -/* 80253F90 4E 80 04 21 */ bctrl -/* 80253F94 80 01 00 08 */ lwz r0, 8(r1) -/* 80253F98 90 01 00 0C */ stw r0, 0xc(r1) -/* 80253F9C 88 01 00 0C */ lbz r0, 0xc(r1) -/* 80253FA0 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 80253FA4 88 01 00 0D */ lbz r0, 0xd(r1) -/* 80253FA8 98 1E 00 5D */ stb r0, 0x5d(r30) -/* 80253FAC 88 01 00 0E */ lbz r0, 0xe(r1) -/* 80253FB0 98 1E 00 5E */ stb r0, 0x5e(r30) -/* 80253FB4 88 01 00 0F */ lbz r0, 0xf(r1) -/* 80253FB8 98 1E 00 5F */ stb r0, 0x5f(r30) -/* 80253FBC 48 00 00 2C */ b lbl_80253FE8 -lbl_80253FC0: -/* 80253FC0 38 00 00 FF */ li r0, 0xff -/* 80253FC4 98 1E 00 58 */ stb r0, 0x58(r30) -/* 80253FC8 98 1E 00 59 */ stb r0, 0x59(r30) -/* 80253FCC 98 1E 00 5A */ stb r0, 0x5a(r30) -/* 80253FD0 98 1E 00 5B */ stb r0, 0x5b(r30) -/* 80253FD4 38 00 00 00 */ li r0, 0 -/* 80253FD8 98 1E 00 5C */ stb r0, 0x5c(r30) -/* 80253FDC 98 1E 00 5D */ stb r0, 0x5d(r30) -/* 80253FE0 98 1E 00 5E */ stb r0, 0x5e(r30) -/* 80253FE4 98 1E 00 5F */ stb r0, 0x5f(r30) -lbl_80253FE8: -/* 80253FE8 83 E1 00 3C */ lwz r31, 0x3c(r1) -/* 80253FEC 83 C1 00 38 */ lwz r30, 0x38(r1) -/* 80253FF0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80253FF4 7C 08 03 A6 */ mtlr r0 -/* 80253FF8 38 21 00 40 */ addi r1, r1, 0x40 -/* 80253FFC 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/paneScale__8CPaneMgrFff.s b/asm/d/pane/d_pane_class/paneScale__8CPaneMgrFff.s deleted file mode 100644 index 8ab948a918..0000000000 --- a/asm/d/pane/d_pane_class/paneScale__8CPaneMgrFff.s +++ /dev/null @@ -1,104 +0,0 @@ -lbl_80254638: -/* 80254638 94 21 FF 90 */ stwu r1, -0x70(r1) -/* 8025463C 7C 08 02 A6 */ mflr r0 -/* 80254640 90 01 00 74 */ stw r0, 0x74(r1) -/* 80254644 DB E1 00 60 */ stfd f31, 0x60(r1) -/* 80254648 F3 E1 00 68 */ psq_st f31, 104(r1), 0, 0 /* qr0 */ -/* 8025464C DB C1 00 50 */ stfd f30, 0x50(r1) -/* 80254650 F3 C1 00 58 */ psq_st f30, 88(r1), 0, 0 /* qr0 */ -/* 80254654 DB A1 00 40 */ stfd f29, 0x40(r1) -/* 80254658 F3 A1 00 48 */ psq_st f29, 72(r1), 0, 0 /* qr0 */ -/* 8025465C DB 81 00 30 */ stfd f28, 0x30(r1) -/* 80254660 F3 81 00 38 */ psq_st f28, 56(r1), 0, 0 /* qr0 */ -/* 80254664 DB 61 00 20 */ stfd f27, 0x20(r1) -/* 80254668 F3 61 00 28 */ psq_st f27, 40(r1), 0, 0 /* qr0 */ -/* 8025466C DB 41 00 10 */ stfd f26, 0x10(r1) -/* 80254670 F3 41 00 18 */ psq_st f26, 24(r1), 0, 0 /* qr0 */ -/* 80254674 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80254678 7C 7F 1B 78 */ mr r31, r3 -/* 8025467C FF C0 08 90 */ fmr f30, f1 -/* 80254680 FF E0 10 90 */ fmr f31, f2 -/* 80254684 80 63 00 04 */ lwz r3, 4(r3) -/* 80254688 C0 23 00 28 */ lfs f1, 0x28(r3) -/* 8025468C C0 03 00 20 */ lfs f0, 0x20(r3) -/* 80254690 EF A1 00 28 */ fsubs f29, f1, f0 -/* 80254694 48 0A 2A 6D */ bl getBounds__7J2DPaneFv -/* 80254698 C3 83 00 00 */ lfs f28, 0(r3) -/* 8025469C 80 7F 00 04 */ lwz r3, 4(r31) -/* 802546A0 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802546A4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802546A8 EF 61 00 28 */ fsubs f27, f1, f0 -/* 802546AC 48 0A 2A 55 */ bl getBounds__7J2DPaneFv -/* 802546B0 C3 43 00 04 */ lfs f26, 4(r3) -/* 802546B4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802546B8 C0 1F 00 34 */ lfs f0, 0x34(r31) -/* 802546BC EC 20 07 B2 */ fmuls f1, f0, f30 -/* 802546C0 C0 1F 00 38 */ lfs f0, 0x38(r31) -/* 802546C4 EC 40 07 F2 */ fmuls f2, f0, f31 -/* 802546C8 81 83 00 00 */ lwz r12, 0(r3) -/* 802546CC 81 8C 00 18 */ lwz r12, 0x18(r12) -/* 802546D0 7D 89 03 A6 */ mtctr r12 -/* 802546D4 4E 80 04 21 */ bctrl -/* 802546D8 80 7F 00 04 */ lwz r3, 4(r31) -/* 802546DC C0 23 00 28 */ lfs f1, 0x28(r3) -/* 802546E0 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802546E4 EC 41 00 28 */ fsubs f2, f1, f0 -/* 802546E8 C0 23 00 2C */ lfs f1, 0x2c(r3) -/* 802546EC C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802546F0 EC 81 00 28 */ fsubs f4, f1, f0 -/* 802546F4 C0 62 B4 98 */ lfs f3, lit_4046(r2) -/* 802546F8 EC 03 07 72 */ fmuls f0, f3, f29 -/* 802546FC EC 3C 00 2A */ fadds f1, f28, f0 -/* 80254700 EC 03 00 B2 */ fmuls f0, f3, f2 -/* 80254704 EC 21 00 28 */ fsubs f1, f1, f0 -/* 80254708 EC 03 06 F2 */ fmuls f0, f3, f27 -/* 8025470C EC 5A 00 2A */ fadds f2, f26, f0 -/* 80254710 EC 03 01 32 */ fmuls f0, f3, f4 -/* 80254714 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80254718 81 83 00 00 */ lwz r12, 0(r3) -/* 8025471C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80254720 7D 89 03 A6 */ mtctr r12 -/* 80254724 4E 80 04 21 */ bctrl -/* 80254728 C0 22 B4 88 */ lfs f1, lit_3858(r2) -/* 8025472C C0 1F 00 4C */ lfs f0, 0x4c(r31) -/* 80254730 FC 01 00 00 */ fcmpu cr0, f1, f0 -/* 80254734 41 82 00 24 */ beq lbl_80254758 -/* 80254738 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025473C C0 63 00 C0 */ lfs f3, 0xc0(r3) -/* 80254740 C0 1F 00 50 */ lfs f0, 0x50(r31) -/* 80254744 EC 20 07 B2 */ fmuls f1, f0, f30 -/* 80254748 C0 1F 00 54 */ lfs f0, 0x54(r31) -/* 8025474C EC 40 07 F2 */ fmuls f2, f0, f31 -/* 80254750 38 80 00 7A */ li r4, 0x7a -/* 80254754 48 0A 2A 89 */ bl rotate__7J2DPaneFff13J2DRotateAxisf -lbl_80254758: -/* 80254758 88 1F 00 19 */ lbz r0, 0x19(r31) -/* 8025475C 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 80254760 41 82 00 28 */ beq lbl_80254788 -/* 80254764 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80254768 90 1F 00 20 */ stw r0, 0x20(r31) -/* 8025476C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80254770 48 0A 33 1D */ bl getFirstChildPane__7J2DPaneFv -/* 80254774 7C 64 1B 78 */ mr r4, r3 -/* 80254778 7F E3 FB 78 */ mr r3, r31 -/* 8025477C FC 20 F0 90 */ fmr f1, f30 -/* 80254780 FC 40 F8 90 */ fmr f2, f31 -/* 80254784 4B FF F9 B1 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff -lbl_80254788: -/* 80254788 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* qr0 */ -/* 8025478C CB E1 00 60 */ lfd f31, 0x60(r1) -/* 80254790 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 /* qr0 */ -/* 80254794 CB C1 00 50 */ lfd f30, 0x50(r1) -/* 80254798 E3 A1 00 48 */ psq_l f29, 72(r1), 0, 0 /* qr0 */ -/* 8025479C CB A1 00 40 */ lfd f29, 0x40(r1) -/* 802547A0 E3 81 00 38 */ psq_l f28, 56(r1), 0, 0 /* qr0 */ -/* 802547A4 CB 81 00 30 */ lfd f28, 0x30(r1) -/* 802547A8 E3 61 00 28 */ psq_l f27, 40(r1), 0, 0 /* qr0 */ -/* 802547AC CB 61 00 20 */ lfd f27, 0x20(r1) -/* 802547B0 E3 41 00 18 */ psq_l f26, 24(r1), 0, 0 /* qr0 */ -/* 802547B4 CB 41 00 10 */ lfd f26, 0x10(r1) -/* 802547B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802547BC 80 01 00 74 */ lwz r0, 0x74(r1) -/* 802547C0 7C 08 03 A6 */ mtlr r0 -/* 802547C4 38 21 00 70 */ addi r1, r1, 0x70 -/* 802547C8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/paneTrans__8CPaneMgrFff.s b/asm/d/pane/d_pane_class/paneTrans__8CPaneMgrFff.s deleted file mode 100644 index 79098d7c0b..0000000000 --- a/asm/d/pane/d_pane_class/paneTrans__8CPaneMgrFff.s +++ /dev/null @@ -1,35 +0,0 @@ -lbl_802545B0: -/* 802545B0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802545B4 7C 08 02 A6 */ mflr r0 -/* 802545B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802545BC 7C 64 1B 78 */ mr r4, r3 -/* 802545C0 80 63 00 04 */ lwz r3, 4(r3) -/* 802545C4 C0 63 00 28 */ lfs f3, 0x28(r3) -/* 802545C8 C0 03 00 20 */ lfs f0, 0x20(r3) -/* 802545CC EC A3 00 28 */ fsubs f5, f3, f0 -/* 802545D0 C0 63 00 2C */ lfs f3, 0x2c(r3) -/* 802545D4 C0 03 00 24 */ lfs f0, 0x24(r3) -/* 802545D8 EC C3 00 28 */ fsubs f6, f3, f0 -/* 802545DC C0 64 00 24 */ lfs f3, 0x24(r4) -/* 802545E0 C0 82 B4 98 */ lfs f4, lit_4046(r2) -/* 802545E4 C0 04 00 34 */ lfs f0, 0x34(r4) -/* 802545E8 EC 04 00 32 */ fmuls f0, f4, f0 -/* 802545EC EC 03 00 2A */ fadds f0, f3, f0 -/* 802545F0 EC 21 00 2A */ fadds f1, f1, f0 -/* 802545F4 EC 04 01 72 */ fmuls f0, f4, f5 -/* 802545F8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 802545FC C0 64 00 28 */ lfs f3, 0x28(r4) -/* 80254600 C0 04 00 38 */ lfs f0, 0x38(r4) -/* 80254604 EC 04 00 32 */ fmuls f0, f4, f0 -/* 80254608 EC 03 00 2A */ fadds f0, f3, f0 -/* 8025460C EC 42 00 2A */ fadds f2, f2, f0 -/* 80254610 EC 04 01 B2 */ fmuls f0, f4, f6 -/* 80254614 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80254618 81 83 00 00 */ lwz r12, 0(r3) -/* 8025461C 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 80254620 7D 89 03 A6 */ mtctr r12 -/* 80254624 4E 80 04 21 */ bctrl -/* 80254628 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8025462C 7C 08 03 A6 */ mtlr r0 -/* 80254630 38 21 00 10 */ addi r1, r1, 0x10 -/* 80254634 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class/setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor.s b/asm/d/pane/d_pane_class/setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor.s deleted file mode 100644 index 47d84871f4..0000000000 --- a/asm/d/pane/d_pane_class/setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor.s +++ /dev/null @@ -1,75 +0,0 @@ -lbl_80254458: -/* 80254458 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025445C 7C 08 02 A6 */ mflr r0 -/* 80254460 90 01 00 24 */ stw r0, 0x24(r1) -/* 80254464 80 C3 00 04 */ lwz r6, 4(r3) -/* 80254468 81 06 00 08 */ lwz r8, 8(r6) -/* 8025446C 3C E0 54 42 */ lis r7, 0x5442 /* 0x54425833@ha */ -/* 80254470 38 07 58 33 */ addi r0, r7, 0x5833 /* 0x54425833@l */ -/* 80254474 7C 08 00 00 */ cmpw r8, r0 -/* 80254478 40 80 00 34 */ bge lbl_802544AC -/* 8025447C 3C C0 50 49 */ lis r6, 0x5049 /* 0x50494333@ha */ -/* 80254480 38 06 43 33 */ addi r0, r6, 0x4333 /* 0x50494333@l */ -/* 80254484 7C 08 00 00 */ cmpw r8, r0 -/* 80254488 40 80 00 14 */ bge lbl_8025449C -/* 8025448C 38 06 43 31 */ addi r0, r6, 0x4331 -/* 80254490 7C 08 00 00 */ cmpw r8, r0 -/* 80254494 40 80 00 68 */ bge lbl_802544FC -/* 80254498 48 00 00 C0 */ b lbl_80254558 -lbl_8025449C: -/* 8025449C 38 07 58 31 */ addi r0, r7, 0x5831 -/* 802544A0 7C 08 00 00 */ cmpw r8, r0 -/* 802544A4 40 80 00 88 */ bge lbl_8025452C -/* 802544A8 48 00 00 B0 */ b lbl_80254558 -lbl_802544AC: -/* 802544AC 3C C0 57 49 */ lis r6, 0x5749 /* 0x57494E33@ha */ -/* 802544B0 38 06 4E 33 */ addi r0, r6, 0x4E33 /* 0x57494E33@l */ -/* 802544B4 7C 08 00 00 */ cmpw r8, r0 -/* 802544B8 40 80 00 A0 */ bge lbl_80254558 -/* 802544BC 38 06 4E 31 */ addi r0, r6, 0x4e31 -/* 802544C0 7C 08 00 00 */ cmpw r8, r0 -/* 802544C4 40 80 00 08 */ bge lbl_802544CC -/* 802544C8 48 00 00 90 */ b lbl_80254558 -lbl_802544CC: -/* 802544CC 80 05 00 00 */ lwz r0, 0(r5) -/* 802544D0 90 01 00 18 */ stw r0, 0x18(r1) -/* 802544D4 80 04 00 00 */ lwz r0, 0(r4) -/* 802544D8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 802544DC 80 63 00 04 */ lwz r3, 4(r3) -/* 802544E0 38 81 00 1C */ addi r4, r1, 0x1c -/* 802544E4 38 A1 00 18 */ addi r5, r1, 0x18 -/* 802544E8 81 83 00 00 */ lwz r12, 0(r3) -/* 802544EC 81 8C 00 A8 */ lwz r12, 0xa8(r12) -/* 802544F0 7D 89 03 A6 */ mtctr r12 -/* 802544F4 4E 80 04 21 */ bctrl -/* 802544F8 48 00 00 60 */ b lbl_80254558 -lbl_802544FC: -/* 802544FC 80 05 00 00 */ lwz r0, 0(r5) -/* 80254500 90 01 00 10 */ stw r0, 0x10(r1) -/* 80254504 80 04 00 00 */ lwz r0, 0(r4) -/* 80254508 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025450C 80 63 00 04 */ lwz r3, 4(r3) -/* 80254510 38 81 00 14 */ addi r4, r1, 0x14 -/* 80254514 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80254518 81 83 00 00 */ lwz r12, 0(r3) -/* 8025451C 81 8C 01 30 */ lwz r12, 0x130(r12) -/* 80254520 7D 89 03 A6 */ mtctr r12 -/* 80254524 4E 80 04 21 */ bctrl -/* 80254528 48 00 00 30 */ b lbl_80254558 -lbl_8025452C: -/* 8025452C 80 05 00 00 */ lwz r0, 0(r5) -/* 80254530 90 01 00 08 */ stw r0, 8(r1) -/* 80254534 80 04 00 00 */ lwz r0, 0(r4) -/* 80254538 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025453C 80 63 00 04 */ lwz r3, 4(r3) -/* 80254540 38 81 00 0C */ addi r4, r1, 0xc -/* 80254544 38 A1 00 08 */ addi r5, r1, 8 -/* 80254548 81 83 00 00 */ lwz r12, 0(r3) -/* 8025454C 81 8C 00 AC */ lwz r12, 0xac(r12) -/* 80254550 7D 89 03 A6 */ mtctr r12 -/* 80254554 4E 80 04 21 */ bctrl -lbl_80254558: -/* 80254558 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025455C 7C 08 03 A6 */ mtlr r0 -/* 80254560 38 21 00 20 */ addi r1, r1, 0x20 -/* 80254564 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s b/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s deleted file mode 100644 index 2d9c2cc4a1..0000000000 --- a/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_802553FC: -/* 802553FC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80255400 7C 08 02 A6 */ mflr r0 -/* 80255404 90 01 00 24 */ stw r0, 0x24(r1) -/* 80255408 39 61 00 20 */ addi r11, r1, 0x20 -/* 8025540C 48 10 CD D1 */ bl _savegpr_29 -/* 80255410 7C 7D 1B 78 */ mr r29, r3 -/* 80255414 7C FE 3B 78 */ mr r30, r7 -/* 80255418 7D 1F 43 78 */ mr r31, r8 -/* 8025541C 3C 60 80 3C */ lis r3, __vt__13CPaneMgrAlpha@ha /* 0x803C2E28@ha */ -/* 80255420 38 03 2E 28 */ addi r0, r3, __vt__13CPaneMgrAlpha@l /* 0x803C2E28@l */ -/* 80255424 90 1D 00 00 */ stw r0, 0(r29) -/* 80255428 7C 83 23 78 */ mr r3, r4 -/* 8025542C 81 84 00 00 */ lwz r12, 0(r4) -/* 80255430 81 8C 00 3C */ lwz r12, 0x3c(r12) -/* 80255434 7D 89 03 A6 */ mtctr r12 -/* 80255438 4E 80 04 21 */ bctrl -/* 8025543C 7C 64 1B 78 */ mr r4, r3 -/* 80255440 9B DD 00 19 */ stb r30, 0x19(r29) -/* 80255444 7F A3 EB 78 */ mr r3, r29 -/* 80255448 7F E5 FB 78 */ mr r5, r31 -/* 8025544C 48 00 00 95 */ bl initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap -/* 80255450 7F A3 EB 78 */ mr r3, r29 -/* 80255454 39 61 00 20 */ addi r11, r1, 0x20 -/* 80255458 48 10 CD D1 */ bl _restgpr_29 -/* 8025545C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80255460 7C 08 03 A6 */ mtlr r0 -/* 80255464 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255468 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFv.s deleted file mode 100644 index f0f60dee70..0000000000 --- a/asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,5 +0,0 @@ -lbl_802553EC: -/* 802553EC 3C 80 80 3C */ lis r4, __vt__13CPaneMgrAlpha@ha /* 0x803C2E28@ha */ -/* 802553F0 38 04 2E 28 */ addi r0, r4, __vt__13CPaneMgrAlpha@l /* 0x803C2E28@l */ -/* 802553F4 90 03 00 00 */ stw r0, 0(r3) -/* 802553F8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s b/asm/d/pane/d_pane_class_alpha/__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s deleted file mode 100644 index c1074ce05c..0000000000 --- a/asm/d/pane/d_pane_class_alpha/__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_80255C68: -/* 80255C68 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255C6C 7C 08 02 A6 */ mflr r0 -/* 80255C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255C74 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255C78 7C 7F 1B 78 */ mr r31, r3 -/* 80255C7C 4B FF F7 81 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap -/* 80255C80 3C 60 80 3C */ lis r3, __vt__17CPaneMgrAlphaMorf@ha /* 0x803C2E18@ha */ -/* 80255C84 38 03 2E 18 */ addi r0, r3, __vt__17CPaneMgrAlphaMorf@l /* 0x803C2E18@l */ -/* 80255C88 90 1F 00 00 */ stw r0, 0(r31) -/* 80255C8C 7F E3 FB 78 */ mr r3, r31 -/* 80255C90 48 00 00 B9 */ bl initiateAlphaMorf__17CPaneMgrAlphaMorfFv -/* 80255C94 7F E3 FB 78 */ mr r3, r31 -/* 80255C98 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255C9C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255CA0 7C 08 03 A6 */ mtlr r0 -/* 80255CA4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255CA8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/__dt__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/__dt__13CPaneMgrAlphaFv.s deleted file mode 100644 index 310b26ce41..0000000000 --- a/asm/d/pane/d_pane_class_alpha/__dt__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_8025546C: -/* 8025546C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255470 7C 08 02 A6 */ mflr r0 -/* 80255474 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255478 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8025547C 93 C1 00 08 */ stw r30, 8(r1) -/* 80255480 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80255484 7C 9F 23 78 */ mr r31, r4 -/* 80255488 41 82 00 3C */ beq lbl_802554C4 -/* 8025548C 3C 60 80 3C */ lis r3, __vt__13CPaneMgrAlpha@ha /* 0x803C2E28@ha */ -/* 80255490 38 03 2E 28 */ addi r0, r3, __vt__13CPaneMgrAlpha@l /* 0x803C2E28@l */ -/* 80255494 90 1E 00 00 */ stw r0, 0(r30) -/* 80255498 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 8025549C 28 04 00 00 */ cmplwi r4, 0 -/* 802554A0 41 82 00 14 */ beq lbl_802554B4 -/* 802554A4 80 7E 00 08 */ lwz r3, 8(r30) -/* 802554A8 48 07 90 A1 */ bl free__7JKRHeapFPv -/* 802554AC 38 00 00 00 */ li r0, 0 -/* 802554B0 90 1E 00 0C */ stw r0, 0xc(r30) -lbl_802554B4: -/* 802554B4 7F E0 07 35 */ extsh. r0, r31 -/* 802554B8 40 81 00 0C */ ble lbl_802554C4 -/* 802554BC 7F C3 F3 78 */ mr r3, r30 -/* 802554C0 48 07 98 7D */ bl __dl__FPv -lbl_802554C4: -/* 802554C4 7F C3 F3 78 */ mr r3, r30 -/* 802554C8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802554CC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802554D0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802554D4 7C 08 03 A6 */ mtlr r0 -/* 802554D8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802554DC 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/__dt__17CPaneMgrAlphaMorfFv.s b/asm/d/pane/d_pane_class_alpha/__dt__17CPaneMgrAlphaMorfFv.s deleted file mode 100644 index 09eabb3d40..0000000000 --- a/asm/d/pane/d_pane_class_alpha/__dt__17CPaneMgrAlphaMorfFv.s +++ /dev/null @@ -1,43 +0,0 @@ -lbl_80255CAC: -/* 80255CAC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255CB0 7C 08 02 A6 */ mflr r0 -/* 80255CB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255CB8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255CBC 93 C1 00 08 */ stw r30, 8(r1) -/* 80255CC0 7C 7E 1B 79 */ or. r30, r3, r3 -/* 80255CC4 7C 9F 23 78 */ mr r31, r4 -/* 80255CC8 41 82 00 64 */ beq lbl_80255D2C -/* 80255CCC 3C 60 80 3C */ lis r3, __vt__17CPaneMgrAlphaMorf@ha /* 0x803C2E18@ha */ -/* 80255CD0 38 03 2E 18 */ addi r0, r3, __vt__17CPaneMgrAlphaMorf@l /* 0x803C2E18@l */ -/* 80255CD4 90 1E 00 00 */ stw r0, 0(r30) -/* 80255CD8 80 9E 00 1C */ lwz r4, 0x1c(r30) -/* 80255CDC 28 04 00 00 */ cmplwi r4, 0 -/* 80255CE0 41 82 00 14 */ beq lbl_80255CF4 -/* 80255CE4 80 7E 00 08 */ lwz r3, 8(r30) -/* 80255CE8 48 07 88 61 */ bl free__7JKRHeapFPv -/* 80255CEC 38 00 00 00 */ li r0, 0 -/* 80255CF0 90 1E 00 1C */ stw r0, 0x1c(r30) -lbl_80255CF4: -/* 80255CF4 80 9E 00 24 */ lwz r4, 0x24(r30) -/* 80255CF8 28 04 00 00 */ cmplwi r4, 0 -/* 80255CFC 41 82 00 14 */ beq lbl_80255D10 -/* 80255D00 80 7E 00 08 */ lwz r3, 8(r30) -/* 80255D04 48 07 88 45 */ bl free__7JKRHeapFPv -/* 80255D08 38 00 00 00 */ li r0, 0 -/* 80255D0C 90 1E 00 24 */ stw r0, 0x24(r30) -lbl_80255D10: -/* 80255D10 7F C3 F3 78 */ mr r3, r30 -/* 80255D14 38 80 00 00 */ li r4, 0 -/* 80255D18 4B FF F7 55 */ bl __dt__13CPaneMgrAlphaFv -/* 80255D1C 7F E0 07 35 */ extsh. r0, r31 -/* 80255D20 40 81 00 0C */ ble lbl_80255D2C -/* 80255D24 7F C3 F3 78 */ mr r3, r30 -/* 80255D28 48 07 90 15 */ bl __dl__FPv -lbl_80255D2C: -/* 80255D2C 7F C3 F3 78 */ mr r3, r30 -/* 80255D30 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255D34 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255D38 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255D3C 7C 08 03 A6 */ mtlr r0 -/* 80255D40 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255D44 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s b/asm/d/pane/d_pane_class_alpha/alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s deleted file mode 100644 index f4d24241ee..0000000000 --- a/asm/d/pane/d_pane_class_alpha/alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s +++ /dev/null @@ -1,66 +0,0 @@ -lbl_80255964: -/* 80255964 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80255968 7C 08 02 A6 */ mflr r0 -/* 8025596C 90 01 00 34 */ stw r0, 0x34(r1) -/* 80255970 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255974 48 10 C8 65 */ bl _savegpr_28 -/* 80255978 7C 7C 1B 78 */ mr r28, r3 -/* 8025597C 7C BD 2B 78 */ mr r29, r5 -/* 80255980 7C DE 33 78 */ mr r30, r6 -/* 80255984 3B E0 00 00 */ li r31, 0 -/* 80255988 7C 85 07 34 */ extsh r5, r4 -/* 8025598C 7C A0 0E 70 */ srawi r0, r5, 1 -/* 80255990 7C 00 01 94 */ addze r0, r0 -/* 80255994 7C 04 07 34 */ extsh r4, r0 -/* 80255998 A8 63 00 16 */ lha r3, 0x16(r3) -/* 8025599C 38 03 00 01 */ addi r0, r3, 1 -/* 802559A0 B0 1C 00 16 */ sth r0, 0x16(r28) -/* 802559A4 A8 1C 00 16 */ lha r0, 0x16(r28) -/* 802559A8 7C 00 28 00 */ cmpw r0, r5 -/* 802559AC 41 80 00 10 */ blt lbl_802559BC -/* 802559B0 38 00 00 00 */ li r0, 0 -/* 802559B4 B0 1C 00 16 */ sth r0, 0x16(r28) -/* 802559B8 3B E0 00 01 */ li r31, 1 -lbl_802559BC: -/* 802559BC A8 7C 00 16 */ lha r3, 0x16(r28) -/* 802559C0 7C 03 20 00 */ cmpw r3, r4 -/* 802559C4 7C 03 28 50 */ subf r0, r3, r5 -/* 802559C8 7C 05 07 34 */ extsh r5, r0 -/* 802559CC 40 80 00 08 */ bge lbl_802559D4 -/* 802559D0 7C 65 1B 78 */ mr r5, r3 -lbl_802559D4: -/* 802559D4 7F 83 E3 78 */ mr r3, r28 -/* 802559D8 7C E6 3B 78 */ mr r6, r7 -/* 802559DC 4B FF FC 7D */ bl rateCalc__13CPaneMgrAlphaFssUc -/* 802559E0 7F 83 E3 78 */ mr r3, r28 -/* 802559E4 57 A5 06 3E */ clrlwi r5, r29, 0x18 -/* 802559E8 C8 42 B4 C8 */ lfd f2, lit_3708(r2) -/* 802559EC 90 A1 00 0C */ stw r5, 0xc(r1) -/* 802559F0 3C 80 43 30 */ lis r4, 0x4330 -/* 802559F4 90 81 00 08 */ stw r4, 8(r1) -/* 802559F8 C8 01 00 08 */ lfd f0, 8(r1) -/* 802559FC EC 60 10 28 */ fsubs f3, f0, f2 -/* 80255A00 57 C0 06 3E */ clrlwi r0, r30, 0x18 -/* 80255A04 7C 05 00 50 */ subf r0, r5, r0 -/* 80255A08 C8 42 B4 C0 */ lfd f2, lit_3694(r2) -/* 80255A0C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80255A10 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255A14 90 81 00 10 */ stw r4, 0x10(r1) -/* 80255A18 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80255A1C EC 00 10 28 */ fsubs f0, f0, f2 -/* 80255A20 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80255A24 EC 03 00 2A */ fadds f0, f3, f0 -/* 80255A28 FC 00 00 1E */ fctiwz f0, f0 -/* 80255A2C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80255A30 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 80255A34 81 9C 00 00 */ lwz r12, 0(r28) -/* 80255A38 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80255A3C 7D 89 03 A6 */ mtctr r12 -/* 80255A40 4E 80 04 21 */ bctrl -/* 80255A44 7F E3 FB 78 */ mr r3, r31 -/* 80255A48 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255A4C 48 10 C7 D9 */ bl _restgpr_28 -/* 80255A50 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80255A54 7C 08 03 A6 */ mtlr r0 -/* 80255A58 38 21 00 30 */ addi r1, r1, 0x30 -/* 80255A5C 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/alphaAnime__13CPaneMgrAlphaFsUcUcUc.s b/asm/d/pane/d_pane_class_alpha/alphaAnime__13CPaneMgrAlphaFsUcUcUc.s deleted file mode 100644 index 8b16a3144d..0000000000 --- a/asm/d/pane/d_pane_class_alpha/alphaAnime__13CPaneMgrAlphaFsUcUcUc.s +++ /dev/null @@ -1,63 +0,0 @@ -lbl_80255878: -/* 80255878 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8025587C 7C 08 02 A6 */ mflr r0 -/* 80255880 90 01 00 34 */ stw r0, 0x34(r1) -/* 80255884 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255888 48 10 C9 55 */ bl _savegpr_29 -/* 8025588C 7C 7D 1B 78 */ mr r29, r3 -/* 80255890 7C BE 2B 78 */ mr r30, r5 -/* 80255894 7C DF 33 78 */ mr r31, r6 -/* 80255898 A8 C3 00 16 */ lha r6, 0x16(r3) -/* 8025589C 7C 85 07 34 */ extsh r5, r4 -/* 802558A0 38 05 FF FF */ addi r0, r5, -1 -/* 802558A4 7C 06 00 00 */ cmpw r6, r0 -/* 802558A8 40 80 00 80 */ bge lbl_80255928 -/* 802558AC 38 06 00 01 */ addi r0, r6, 1 -/* 802558B0 B0 1D 00 16 */ sth r0, 0x16(r29) -/* 802558B4 A8 BD 00 16 */ lha r5, 0x16(r29) -/* 802558B8 7C E6 3B 78 */ mr r6, r7 -/* 802558BC 4B FF FD 9D */ bl rateCalc__13CPaneMgrAlphaFssUc -/* 802558C0 7F A3 EB 78 */ mr r3, r29 -/* 802558C4 57 C5 06 3E */ clrlwi r5, r30, 0x18 -/* 802558C8 C8 42 B4 C8 */ lfd f2, lit_3708(r2) -/* 802558CC 90 A1 00 0C */ stw r5, 0xc(r1) -/* 802558D0 3C 80 43 30 */ lis r4, 0x4330 -/* 802558D4 90 81 00 08 */ stw r4, 8(r1) -/* 802558D8 C8 01 00 08 */ lfd f0, 8(r1) -/* 802558DC EC 60 10 28 */ fsubs f3, f0, f2 -/* 802558E0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 802558E4 7C 05 00 50 */ subf r0, r5, r0 -/* 802558E8 C8 42 B4 C0 */ lfd f2, lit_3694(r2) -/* 802558EC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802558F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802558F4 90 81 00 10 */ stw r4, 0x10(r1) -/* 802558F8 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802558FC EC 00 10 28 */ fsubs f0, f0, f2 -/* 80255900 EC 01 00 32 */ fmuls f0, f1, f0 -/* 80255904 EC 03 00 2A */ fadds f0, f3, f0 -/* 80255908 FC 00 00 1E */ fctiwz f0, f0 -/* 8025590C D8 01 00 18 */ stfd f0, 0x18(r1) -/* 80255910 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 80255914 81 9D 00 00 */ lwz r12, 0(r29) -/* 80255918 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 8025591C 7D 89 03 A6 */ mtctr r12 -/* 80255920 4E 80 04 21 */ bctrl -/* 80255924 48 00 00 24 */ b lbl_80255948 -lbl_80255928: -/* 80255928 B0 9D 00 16 */ sth r4, 0x16(r29) -/* 8025592C 7F E4 FB 78 */ mr r4, r31 -/* 80255930 81 83 00 00 */ lwz r12, 0(r3) -/* 80255934 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80255938 7D 89 03 A6 */ mtctr r12 -/* 8025593C 4E 80 04 21 */ bctrl -/* 80255940 38 60 00 01 */ li r3, 1 -/* 80255944 48 00 00 08 */ b lbl_8025594C -lbl_80255948: -/* 80255948 38 60 00 00 */ li r3, 0 -lbl_8025594C: -/* 8025594C 39 61 00 30 */ addi r11, r1, 0x30 -/* 80255950 48 10 C8 D9 */ bl _restgpr_29 -/* 80255954 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80255958 7C 08 03 A6 */ mtlr r0 -/* 8025595C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80255960 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s b/asm/d/pane/d_pane_class_alpha/childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s deleted file mode 100644 index c422874ce8..0000000000 --- a/asm/d/pane/d_pane_class_alpha/childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s +++ /dev/null @@ -1,38 +0,0 @@ -lbl_80255E98: -/* 80255E98 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255E9C 7C 08 02 A6 */ mflr r0 -/* 80255EA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255EA4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255EA8 93 C1 00 08 */ stw r30, 8(r1) -/* 80255EAC 7C 7E 1B 78 */ mr r30, r3 -/* 80255EB0 7C 9F 23 79 */ or. r31, r4, r4 -/* 80255EB4 41 82 00 5C */ beq lbl_80255F10 -/* 80255EB8 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 80255EBC 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80255EC0 98 03 00 00 */ stb r0, 0(r3) -/* 80255EC4 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80255EC8 38 03 00 01 */ addi r0, r3, 1 -/* 80255ECC 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80255ED0 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 80255ED4 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80255ED8 98 03 00 00 */ stb r0, 0(r3) -/* 80255EDC 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80255EE0 38 03 00 01 */ addi r0, r3, 1 -/* 80255EE4 90 1E 00 28 */ stw r0, 0x28(r30) -/* 80255EE8 7F E3 FB 78 */ mr r3, r31 -/* 80255EEC 48 0A 1B A1 */ bl getFirstChildPane__7J2DPaneFv -/* 80255EF0 7C 64 1B 78 */ mr r4, r3 -/* 80255EF4 7F C3 F3 78 */ mr r3, r30 -/* 80255EF8 4B FF FF A1 */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane -/* 80255EFC 7F E3 FB 78 */ mr r3, r31 -/* 80255F00 48 0A 1B C5 */ bl getNextChildPane__7J2DPaneFv -/* 80255F04 7C 64 1B 78 */ mr r4, r3 -/* 80255F08 7F C3 F3 78 */ mr r3, r30 -/* 80255F0C 4B FF FF 8D */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane -lbl_80255F10: -/* 80255F10 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255F14 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255F18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255F1C 7C 08 03 A6 */ mtlr r0 -/* 80255F20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255F24 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/childPaneCount__13CPaneMgrAlphaFP7J2DPane.s b/asm/d/pane/d_pane_class_alpha/childPaneCount__13CPaneMgrAlphaFP7J2DPane.s deleted file mode 100644 index f187e790d0..0000000000 --- a/asm/d/pane/d_pane_class_alpha/childPaneCount__13CPaneMgrAlphaFP7J2DPane.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_80255A60: -/* 80255A60 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255A64 7C 08 02 A6 */ mflr r0 -/* 80255A68 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255A6C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255A70 93 C1 00 08 */ stw r30, 8(r1) -/* 80255A74 7C 7E 1B 78 */ mr r30, r3 -/* 80255A78 7C 9F 23 79 */ or. r31, r4, r4 -/* 80255A7C 41 82 00 38 */ beq lbl_80255AB4 -/* 80255A80 A8 7E 00 14 */ lha r3, 0x14(r30) -/* 80255A84 38 03 00 01 */ addi r0, r3, 1 -/* 80255A88 B0 1E 00 14 */ sth r0, 0x14(r30) -/* 80255A8C 7F E3 FB 78 */ mr r3, r31 -/* 80255A90 48 0A 1F FD */ bl getFirstChildPane__7J2DPaneFv -/* 80255A94 7C 64 1B 78 */ mr r4, r3 -/* 80255A98 7F C3 F3 78 */ mr r3, r30 -/* 80255A9C 4B FF FF C5 */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane -/* 80255AA0 7F E3 FB 78 */ mr r3, r31 -/* 80255AA4 48 0A 20 21 */ bl getNextChildPane__7J2DPaneFv -/* 80255AA8 7C 64 1B 78 */ mr r4, r3 -/* 80255AAC 7F C3 F3 78 */ mr r3, r30 -/* 80255AB0 4B FF FF B1 */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane -lbl_80255AB4: -/* 80255AB4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255AB8 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255ABC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255AC0 7C 08 03 A6 */ mtlr r0 -/* 80255AC4 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255AC8 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s b/asm/d/pane/d_pane_class_alpha/childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s deleted file mode 100644 index b3cd5c2b86..0000000000 --- a/asm/d/pane/d_pane_class_alpha/childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s +++ /dev/null @@ -1,40 +0,0 @@ -lbl_80255ACC: -/* 80255ACC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255AD0 7C 08 02 A6 */ mflr r0 -/* 80255AD4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255AD8 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255ADC 93 C1 00 08 */ stw r30, 8(r1) -/* 80255AE0 7C 7E 1B 78 */ mr r30, r3 -/* 80255AE4 7C 9F 23 79 */ or. r31, r4, r4 -/* 80255AE8 41 82 00 5C */ beq lbl_80255B44 -/* 80255AEC 80 7F 00 08 */ lwz r3, 8(r31) -/* 80255AF0 3C 03 AF BF */ addis r0, r3, 0xafbf -/* 80255AF4 28 00 4E 32 */ cmplwi r0, 0x4e32 -/* 80255AF8 40 82 00 0C */ bne lbl_80255B04 -/* 80255AFC 38 00 00 FF */ li r0, 0xff -/* 80255B00 48 00 00 08 */ b lbl_80255B08 -lbl_80255B04: -/* 80255B04 88 1F 00 B2 */ lbz r0, 0xb2(r31) -lbl_80255B08: -/* 80255B08 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80255B0C 98 03 00 00 */ stb r0, 0(r3) -/* 80255B10 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80255B14 38 03 00 01 */ addi r0, r3, 1 -/* 80255B18 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80255B1C 7F E3 FB 78 */ mr r3, r31 -/* 80255B20 48 0A 1F 6D */ bl getFirstChildPane__7J2DPaneFv -/* 80255B24 7C 64 1B 78 */ mr r4, r3 -/* 80255B28 7F C3 F3 78 */ mr r3, r30 -/* 80255B2C 4B FF FF A1 */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane -/* 80255B30 7F E3 FB 78 */ mr r3, r31 -/* 80255B34 48 0A 1F 91 */ bl getNextChildPane__7J2DPaneFv -/* 80255B38 7C 64 1B 78 */ mr r4, r3 -/* 80255B3C 7F C3 F3 78 */ mr r3, r30 -/* 80255B40 4B FF FF 8D */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane -lbl_80255B44: -/* 80255B44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255B48 83 C1 00 08 */ lwz r30, 8(r1) -/* 80255B4C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255B50 7C 08 03 A6 */ mtlr r0 -/* 80255B54 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255B58 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s b/asm/d/pane/d_pane_class_alpha/childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s deleted file mode 100644 index fbfa6c8b97..0000000000 --- a/asm/d/pane/d_pane_class_alpha/childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_80255F28: -/* 80255F28 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80255F2C 7C 08 02 A6 */ mflr r0 -/* 80255F30 90 01 00 34 */ stw r0, 0x34(r1) -/* 80255F34 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 80255F38 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 /* qr0 */ -/* 80255F3C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80255F40 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80255F44 7C 7E 1B 78 */ mr r30, r3 -/* 80255F48 7C 9F 23 79 */ or. r31, r4, r4 -/* 80255F4C FF E0 08 90 */ fmr f31, f1 -/* 80255F50 41 82 00 A8 */ beq lbl_80255FF8 -/* 80255F54 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 80255F58 88 04 00 00 */ lbz r0, 0(r4) -/* 80255F5C 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80255F60 88 63 00 00 */ lbz r3, 0(r3) -/* 80255F64 7C 00 18 40 */ cmplw r0, r3 -/* 80255F68 40 82 00 44 */ bne lbl_80255FAC -/* 80255F6C 7F E3 FB 78 */ mr r3, r31 -/* 80255F70 C8 22 B4 C8 */ lfd f1, lit_3708(r2) -/* 80255F74 90 01 00 0C */ stw r0, 0xc(r1) -/* 80255F78 3C 00 43 30 */ lis r0, 0x4330 -/* 80255F7C 90 01 00 08 */ stw r0, 8(r1) -/* 80255F80 C8 01 00 08 */ lfd f0, 8(r1) -/* 80255F84 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80255F88 EC 00 07 F2 */ fmuls f0, f0, f31 -/* 80255F8C FC 00 00 1E */ fctiwz f0, f0 -/* 80255F90 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80255F94 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80255F98 81 9F 00 00 */ lwz r12, 0(r31) -/* 80255F9C 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80255FA0 7D 89 03 A6 */ mtctr r12 -/* 80255FA4 4E 80 04 21 */ bctrl -/* 80255FA8 48 00 00 08 */ b lbl_80255FB0 -lbl_80255FAC: -/* 80255FAC 98 64 00 00 */ stb r3, 0(r4) -lbl_80255FB0: -/* 80255FB0 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80255FB4 38 03 00 01 */ addi r0, r3, 1 -/* 80255FB8 90 1E 00 20 */ stw r0, 0x20(r30) -/* 80255FBC 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 80255FC0 38 03 00 01 */ addi r0, r3, 1 -/* 80255FC4 90 1E 00 28 */ stw r0, 0x28(r30) -/* 80255FC8 7F E3 FB 78 */ mr r3, r31 -/* 80255FCC 48 0A 1A C1 */ bl getFirstChildPane__7J2DPaneFv -/* 80255FD0 7C 64 1B 78 */ mr r4, r3 -/* 80255FD4 7F C3 F3 78 */ mr r3, r30 -/* 80255FD8 FC 20 F8 90 */ fmr f1, f31 -/* 80255FDC 4B FF FF 4D */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef -/* 80255FE0 7F E3 FB 78 */ mr r3, r31 -/* 80255FE4 48 0A 1A E1 */ bl getNextChildPane__7J2DPaneFv -/* 80255FE8 7C 64 1B 78 */ mr r4, r3 -/* 80255FEC 7F C3 F3 78 */ mr r3, r30 -/* 80255FF0 FC 20 F8 90 */ fmr f1, f31 -/* 80255FF4 4B FF FF 35 */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef -lbl_80255FF8: -/* 80255FF8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* qr0 */ -/* 80255FFC CB E1 00 20 */ lfd f31, 0x20(r1) -/* 80256000 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80256004 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80256008 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8025600C 7C 08 03 A6 */ mtlr r0 -/* 80256010 38 21 00 30 */ addi r1, r1, 0x30 -/* 80256014 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s b/asm/d/pane/d_pane_class_alpha/childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s deleted file mode 100644 index 7b7d166ebf..0000000000 --- a/asm/d/pane/d_pane_class_alpha/childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s +++ /dev/null @@ -1,72 +0,0 @@ -lbl_80255B5C: -/* 80255B5C 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 80255B60 7C 08 02 A6 */ mflr r0 -/* 80255B64 90 01 00 44 */ stw r0, 0x44(r1) -/* 80255B68 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255B6C 48 10 C6 71 */ bl _savegpr_29 -/* 80255B70 7C 7D 1B 78 */ mr r29, r3 -/* 80255B74 7C 9E 23 79 */ or. r30, r4, r4 -/* 80255B78 7C BF 2B 78 */ mr r31, r5 -/* 80255B7C 41 82 00 D4 */ beq lbl_80255C50 -/* 80255B80 88 1E 00 B4 */ lbz r0, 0xb4(r30) -/* 80255B84 28 00 00 00 */ cmplwi r0, 0 -/* 80255B88 40 82 00 8C */ bne lbl_80255C14 -/* 80255B8C 88 7D 00 18 */ lbz r3, 0x18(r29) -/* 80255B90 28 03 00 00 */ cmplwi r3, 0 -/* 80255B94 40 82 00 0C */ bne lbl_80255BA0 -/* 80255B98 C0 42 B4 D0 */ lfs f2, lit_3721(r2) -/* 80255B9C 48 00 00 34 */ b lbl_80255BD0 -lbl_80255BA0: -/* 80255BA0 57 E0 06 3E */ clrlwi r0, r31, 0x18 -/* 80255BA4 C8 42 B4 C8 */ lfd f2, lit_3708(r2) -/* 80255BA8 90 01 00 0C */ stw r0, 0xc(r1) -/* 80255BAC 3C 00 43 30 */ lis r0, 0x4330 -/* 80255BB0 90 01 00 08 */ stw r0, 8(r1) -/* 80255BB4 C8 01 00 08 */ lfd f0, 8(r1) -/* 80255BB8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80255BBC 90 61 00 14 */ stw r3, 0x14(r1) -/* 80255BC0 90 01 00 10 */ stw r0, 0x10(r1) -/* 80255BC4 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80255BC8 EC 00 10 28 */ fsubs f0, f0, f2 -/* 80255BCC EC 41 00 24 */ fdivs f2, f1, f0 -lbl_80255BD0: -/* 80255BD0 7F C3 F3 78 */ mr r3, r30 -/* 80255BD4 80 9D 00 10 */ lwz r4, 0x10(r29) -/* 80255BD8 88 04 00 00 */ lbz r0, 0(r4) -/* 80255BDC C8 22 B4 C8 */ lfd f1, lit_3708(r2) -/* 80255BE0 90 01 00 1C */ stw r0, 0x1c(r1) -/* 80255BE4 3C 00 43 30 */ lis r0, 0x4330 -/* 80255BE8 90 01 00 18 */ stw r0, 0x18(r1) -/* 80255BEC C8 01 00 18 */ lfd f0, 0x18(r1) -/* 80255BF0 EC 00 08 28 */ fsubs f0, f0, f1 -/* 80255BF4 EC 00 00 B2 */ fmuls f0, f0, f2 -/* 80255BF8 FC 00 00 1E */ fctiwz f0, f0 -/* 80255BFC D8 01 00 20 */ stfd f0, 0x20(r1) -/* 80255C00 80 81 00 24 */ lwz r4, 0x24(r1) -/* 80255C04 81 9E 00 00 */ lwz r12, 0(r30) -/* 80255C08 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 80255C0C 7D 89 03 A6 */ mtctr r12 -/* 80255C10 4E 80 04 21 */ bctrl -lbl_80255C14: -/* 80255C14 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 80255C18 38 03 00 01 */ addi r0, r3, 1 -/* 80255C1C 90 1D 00 10 */ stw r0, 0x10(r29) -/* 80255C20 7F C3 F3 78 */ mr r3, r30 -/* 80255C24 48 0A 1E 69 */ bl getFirstChildPane__7J2DPaneFv -/* 80255C28 7C 64 1B 78 */ mr r4, r3 -/* 80255C2C 7F A3 EB 78 */ mr r3, r29 -/* 80255C30 7F E5 FB 78 */ mr r5, r31 -/* 80255C34 4B FF FF 29 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc -/* 80255C38 7F C3 F3 78 */ mr r3, r30 -/* 80255C3C 48 0A 1E 89 */ bl getNextChildPane__7J2DPaneFv -/* 80255C40 7C 64 1B 78 */ mr r4, r3 -/* 80255C44 7F A3 EB 78 */ mr r3, r29 -/* 80255C48 7F E5 FB 78 */ mr r5, r31 -/* 80255C4C 4B FF FF 11 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc -lbl_80255C50: -/* 80255C50 39 61 00 40 */ addi r11, r1, 0x40 -/* 80255C54 48 10 C5 D5 */ bl _restgpr_29 -/* 80255C58 80 01 00 44 */ lwz r0, 0x44(r1) -/* 80255C5C 7C 08 03 A6 */ mtlr r0 -/* 80255C60 38 21 00 40 */ addi r1, r1, 0x40 -/* 80255C64 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/getAlphaRate__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/getAlphaRate__13CPaneMgrAlphaFv.s deleted file mode 100644 index 9a0021726f..0000000000 --- a/asm/d/pane/d_pane_class_alpha/getAlphaRate__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,22 +0,0 @@ -lbl_80255828: -/* 80255828 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025582C C0 22 B4 D0 */ lfs f1, lit_3721(r2) -/* 80255830 88 83 00 18 */ lbz r4, 0x18(r3) -/* 80255834 28 04 00 00 */ cmplwi r4, 0 -/* 80255838 41 82 00 38 */ beq lbl_80255870 -/* 8025583C 80 63 00 04 */ lwz r3, 4(r3) -/* 80255840 88 03 00 B2 */ lbz r0, 0xb2(r3) -/* 80255844 C8 42 B4 C8 */ lfd f2, lit_3708(r2) -/* 80255848 90 01 00 0C */ stw r0, 0xc(r1) -/* 8025584C 3C 00 43 30 */ lis r0, 0x4330 -/* 80255850 90 01 00 08 */ stw r0, 8(r1) -/* 80255854 C8 01 00 08 */ lfd f0, 8(r1) -/* 80255858 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8025585C 90 81 00 14 */ stw r4, 0x14(r1) -/* 80255860 90 01 00 10 */ stw r0, 0x10(r1) -/* 80255864 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80255868 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025586C EC 21 00 24 */ fdivs f1, f1, f0 -lbl_80255870: -/* 80255870 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255874 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/hide__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/hide__13CPaneMgrAlphaFv.s deleted file mode 100644 index 816168d582..0000000000 --- a/asm/d/pane/d_pane_class_alpha/hide__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_80255608: -/* 80255608 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025560C 7C 08 02 A6 */ mflr r0 -/* 80255610 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255614 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255618 7C 7F 1B 78 */ mr r31, r3 -/* 8025561C 48 00 00 31 */ bl isVisible__13CPaneMgrAlphaFv -/* 80255620 54 60 06 3E */ clrlwi r0, r3, 0x18 -/* 80255624 28 00 00 01 */ cmplwi r0, 1 -/* 80255628 40 82 00 10 */ bne lbl_80255638 -/* 8025562C 38 00 00 00 */ li r0, 0 -/* 80255630 80 7F 00 04 */ lwz r3, 4(r31) -/* 80255634 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_80255638: -/* 80255638 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8025563C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255640 7C 08 03 A6 */ mtlr r0 -/* 80255644 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255648 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s b/asm/d/pane/d_pane_class_alpha/initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s deleted file mode 100644 index af2cbb7b48..0000000000 --- a/asm/d/pane/d_pane_class_alpha/initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s +++ /dev/null @@ -1,36 +0,0 @@ -lbl_80255D48: -/* 80255D48 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255D4C 7C 08 02 A6 */ mflr r0 -/* 80255D50 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255D54 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255D58 7C 7F 1B 78 */ mr r31, r3 -/* 80255D5C 38 00 00 00 */ li r0, 0 -/* 80255D60 90 03 00 1C */ stw r0, 0x1c(r3) -/* 80255D64 90 03 00 20 */ stw r0, 0x20(r3) -/* 80255D68 90 03 00 24 */ stw r0, 0x24(r3) -/* 80255D6C 90 03 00 28 */ stw r0, 0x28(r3) -/* 80255D70 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80255D74 28 00 00 00 */ cmplwi r0, 0 -/* 80255D78 41 82 00 44 */ beq lbl_80255DBC -/* 80255D7C 80 7F 00 08 */ lwz r3, 8(r31) -/* 80255D80 A8 9F 00 14 */ lha r4, 0x14(r31) -/* 80255D84 38 A0 00 20 */ li r5, 0x20 -/* 80255D88 48 07 87 4D */ bl alloc__7JKRHeapFUli -/* 80255D8C 90 7F 00 1C */ stw r3, 0x1c(r31) -/* 80255D90 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80255D94 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80255D98 80 7F 00 08 */ lwz r3, 8(r31) -/* 80255D9C A8 9F 00 14 */ lha r4, 0x14(r31) -/* 80255DA0 38 A0 00 20 */ li r5, 0x20 -/* 80255DA4 48 07 87 31 */ bl alloc__7JKRHeapFUli -/* 80255DA8 90 7F 00 24 */ stw r3, 0x24(r31) -/* 80255DAC 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80255DB0 90 1F 00 28 */ stw r0, 0x28(r31) -/* 80255DB4 7F E3 FB 78 */ mr r3, r31 -/* 80255DB8 48 00 00 19 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv -lbl_80255DBC: -/* 80255DBC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255DC0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255DC4 7C 08 03 A6 */ mtlr r0 -/* 80255DC8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255DCC 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s b/asm/d/pane/d_pane_class_alpha/initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s deleted file mode 100644 index 9b48550b83..0000000000 --- a/asm/d/pane/d_pane_class_alpha/initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s +++ /dev/null @@ -1,64 +0,0 @@ -lbl_802554E0: -/* 802554E0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802554E4 7C 08 02 A6 */ mflr r0 -/* 802554E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802554EC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802554F0 93 C1 00 08 */ stw r30, 8(r1) -/* 802554F4 7C 7E 1B 78 */ mr r30, r3 -/* 802554F8 7C 9F 23 78 */ mr r31, r4 -/* 802554FC 93 E3 00 04 */ stw r31, 4(r3) -/* 80255500 28 05 00 00 */ cmplwi r5, 0 -/* 80255504 41 82 00 0C */ beq lbl_80255510 -/* 80255508 90 BE 00 08 */ stw r5, 8(r30) -/* 8025550C 48 00 00 0C */ b lbl_80255518 -lbl_80255510: -/* 80255510 4B DB 9C DD */ bl mDoExt_getCurrentHeap__Fv -/* 80255514 90 7E 00 08 */ stw r3, 8(r30) -lbl_80255518: -/* 80255518 38 00 00 00 */ li r0, 0 -/* 8025551C 90 1E 00 0C */ stw r0, 0xc(r30) -/* 80255520 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80255524 B0 1E 00 14 */ sth r0, 0x14(r30) -/* 80255528 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 8025552C 28 00 00 00 */ cmplwi r0, 0 -/* 80255530 41 82 00 54 */ beq lbl_80255584 -/* 80255534 80 7E 00 04 */ lwz r3, 4(r30) -/* 80255538 48 0A 25 55 */ bl getFirstChildPane__7J2DPaneFv -/* 8025553C 7C 64 1B 78 */ mr r4, r3 -/* 80255540 7F C3 F3 78 */ mr r3, r30 -/* 80255544 48 00 05 1D */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane -/* 80255548 88 1E 00 19 */ lbz r0, 0x19(r30) -/* 8025554C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 80255550 41 82 00 34 */ beq lbl_80255584 -/* 80255554 80 7E 00 08 */ lwz r3, 8(r30) -/* 80255558 A8 9E 00 14 */ lha r4, 0x14(r30) -/* 8025555C 38 A0 00 20 */ li r5, 0x20 -/* 80255560 48 07 8F 75 */ bl alloc__7JKRHeapFUli -/* 80255564 90 7E 00 0C */ stw r3, 0xc(r30) -/* 80255568 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 8025556C 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80255570 80 7E 00 04 */ lwz r3, 4(r30) -/* 80255574 48 0A 25 19 */ bl getFirstChildPane__7J2DPaneFv -/* 80255578 7C 64 1B 78 */ mr r4, r3 -/* 8025557C 7F C3 F3 78 */ mr r3, r30 -/* 80255580 48 00 05 4D */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane -lbl_80255584: -/* 80255584 80 7F 00 08 */ lwz r3, 8(r31) -/* 80255588 3C 03 AF BF */ addis r0, r3, 0xafbf -/* 8025558C 28 00 4E 32 */ cmplwi r0, 0x4e32 -/* 80255590 40 82 00 10 */ bne lbl_802555A0 -/* 80255594 38 00 00 FF */ li r0, 0xff -/* 80255598 98 1E 00 18 */ stb r0, 0x18(r30) -/* 8025559C 48 00 00 0C */ b lbl_802555A8 -lbl_802555A0: -/* 802555A0 88 1F 00 B2 */ lbz r0, 0xb2(r31) -/* 802555A4 98 1E 00 18 */ stb r0, 0x18(r30) -lbl_802555A8: -/* 802555A8 38 00 00 00 */ li r0, 0 -/* 802555AC B0 1E 00 16 */ sth r0, 0x16(r30) -/* 802555B0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802555B4 83 C1 00 08 */ lwz r30, 8(r1) -/* 802555B8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802555BC 7C 08 03 A6 */ mtlr r0 -/* 802555C0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802555C4 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/isVisible__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/isVisible__13CPaneMgrAlphaFv.s deleted file mode 100644 index 2fe34b733a..0000000000 --- a/asm/d/pane/d_pane_class_alpha/isVisible__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,4 +0,0 @@ -lbl_8025564C: -/* 8025564C 80 63 00 04 */ lwz r3, 4(r3) -/* 80255650 88 63 00 B0 */ lbz r3, 0xb0(r3) -/* 80255654 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/rateCalc__13CPaneMgrAlphaFssUc.s b/asm/d/pane/d_pane_class_alpha/rateCalc__13CPaneMgrAlphaFssUc.s deleted file mode 100644 index 0ad64b2036..0000000000 --- a/asm/d/pane/d_pane_class_alpha/rateCalc__13CPaneMgrAlphaFssUc.s +++ /dev/null @@ -1,70 +0,0 @@ -lbl_80255658: -/* 80255658 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8025565C 7C 87 07 34 */ extsh r7, r4 -/* 80255660 7C A3 07 34 */ extsh r3, r5 -/* 80255664 7C 07 18 00 */ cmpw r7, r3 -/* 80255668 41 81 00 0C */ bgt lbl_80255674 -/* 8025566C C0 22 B4 B8 */ lfs f1, lit_3692(r2) -/* 80255670 48 00 00 E0 */ b lbl_80255750 -lbl_80255674: -/* 80255674 54 C0 06 3E */ clrlwi r0, r6, 0x18 -/* 80255678 2C 00 00 02 */ cmpwi r0, 2 -/* 8025567C 41 82 00 54 */ beq lbl_802556D0 -/* 80255680 40 80 00 94 */ bge lbl_80255714 -/* 80255684 2C 00 00 01 */ cmpwi r0, 1 -/* 80255688 40 80 00 08 */ bge lbl_80255690 -/* 8025568C 48 00 00 88 */ b lbl_80255714 -lbl_80255690: -/* 80255690 7C 03 19 D6 */ mullw r0, r3, r3 -/* 80255694 C8 42 B4 C0 */ lfd f2, lit_3694(r2) -/* 80255698 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025569C 90 01 00 0C */ stw r0, 0xc(r1) -/* 802556A0 3C 60 43 30 */ lis r3, 0x4330 -/* 802556A4 90 61 00 08 */ stw r3, 8(r1) -/* 802556A8 C8 01 00 08 */ lfd f0, 8(r1) -/* 802556AC EC 20 10 28 */ fsubs f1, f0, f2 -/* 802556B0 7C 07 39 D6 */ mullw r0, r7, r7 -/* 802556B4 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802556B8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802556BC 90 61 00 10 */ stw r3, 0x10(r1) -/* 802556C0 C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802556C4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802556C8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 802556CC 48 00 00 84 */ b lbl_80255750 -lbl_802556D0: -/* 802556D0 7C 03 38 50 */ subf r0, r3, r7 -/* 802556D4 7C 00 01 D6 */ mullw r0, r0, r0 -/* 802556D8 C8 42 B4 C0 */ lfd f2, lit_3694(r2) -/* 802556DC 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802556E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802556E4 3C 60 43 30 */ lis r3, 0x4330 -/* 802556E8 90 61 00 10 */ stw r3, 0x10(r1) -/* 802556EC C8 01 00 10 */ lfd f0, 0x10(r1) -/* 802556F0 EC 20 10 28 */ fsubs f1, f0, f2 -/* 802556F4 7C 07 39 D6 */ mullw r0, r7, r7 -/* 802556F8 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 802556FC 90 01 00 0C */ stw r0, 0xc(r1) -/* 80255700 90 61 00 08 */ stw r3, 8(r1) -/* 80255704 C8 01 00 08 */ lfd f0, 8(r1) -/* 80255708 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025570C EC 21 00 24 */ fdivs f1, f1, f0 -/* 80255710 48 00 00 40 */ b lbl_80255750 -lbl_80255714: -/* 80255714 7C A0 07 34 */ extsh r0, r5 -/* 80255718 C8 42 B4 C0 */ lfd f2, lit_3694(r2) -/* 8025571C 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 80255720 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255724 3C 60 43 30 */ lis r3, 0x4330 -/* 80255728 90 61 00 10 */ stw r3, 0x10(r1) -/* 8025572C C8 01 00 10 */ lfd f0, 0x10(r1) -/* 80255730 EC 20 10 28 */ fsubs f1, f0, f2 -/* 80255734 7C 80 07 34 */ extsh r0, r4 -/* 80255738 6C 00 80 00 */ xoris r0, r0, 0x8000 -/* 8025573C 90 01 00 0C */ stw r0, 0xc(r1) -/* 80255740 90 61 00 08 */ stw r3, 8(r1) -/* 80255744 C8 01 00 08 */ lfd f0, 8(r1) -/* 80255748 EC 00 10 28 */ fsubs f0, f0, f2 -/* 8025574C EC 21 00 24 */ fdivs f1, f1, f0 -lbl_80255750: -/* 80255750 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255754 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s b/asm/d/pane/d_pane_class_alpha/setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s deleted file mode 100644 index 66444f7aee..0000000000 --- a/asm/d/pane/d_pane_class_alpha/setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_80255E28: -/* 80255E28 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80255E2C 7C 08 02 A6 */ mflr r0 -/* 80255E30 90 01 00 24 */ stw r0, 0x24(r1) -/* 80255E34 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 80255E38 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80255E3C 7C 7F 1B 78 */ mr r31, r3 -/* 80255E40 FF E0 08 90 */ fmr f31, f1 -/* 80255E44 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80255E48 28 00 00 00 */ cmplwi r0, 0 -/* 80255E4C 41 82 00 30 */ beq lbl_80255E7C -/* 80255E50 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80255E54 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80255E58 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80255E5C 90 1F 00 28 */ stw r0, 0x28(r31) -/* 80255E60 80 7F 00 04 */ lwz r3, 4(r31) -/* 80255E64 48 0A 1C 29 */ bl getFirstChildPane__7J2DPaneFv -/* 80255E68 7C 64 1B 78 */ mr r4, r3 -/* 80255E6C 7F E3 FB 78 */ mr r3, r31 -/* 80255E70 FC 20 F8 90 */ fmr f1, f31 -/* 80255E74 48 00 00 B5 */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef -/* 80255E78 48 00 00 08 */ b lbl_80255E80 -lbl_80255E7C: -/* 80255E7C 4B FF F9 55 */ bl setAlphaRate__13CPaneMgrAlphaFf -lbl_80255E80: -/* 80255E80 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 80255E84 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80255E88 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80255E8C 7C 08 03 A6 */ mtlr r0 -/* 80255E90 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255E94 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/setAlphaRate__13CPaneMgrAlphaFf.s b/asm/d/pane/d_pane_class_alpha/setAlphaRate__13CPaneMgrAlphaFf.s deleted file mode 100644 index c8af3c4f2e..0000000000 --- a/asm/d/pane/d_pane_class_alpha/setAlphaRate__13CPaneMgrAlphaFf.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_802557D0: -/* 802557D0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802557D4 7C 08 02 A6 */ mflr r0 -/* 802557D8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802557DC 88 03 00 18 */ lbz r0, 0x18(r3) -/* 802557E0 C8 42 B4 C8 */ lfd f2, lit_3708(r2) -/* 802557E4 90 01 00 0C */ stw r0, 0xc(r1) -/* 802557E8 3C 00 43 30 */ lis r0, 0x4330 -/* 802557EC 90 01 00 08 */ stw r0, 8(r1) -/* 802557F0 C8 01 00 08 */ lfd f0, 8(r1) -/* 802557F4 EC 00 10 28 */ fsubs f0, f0, f2 -/* 802557F8 EC 00 00 72 */ fmuls f0, f0, f1 -/* 802557FC FC 00 00 1E */ fctiwz f0, f0 -/* 80255800 D8 01 00 10 */ stfd f0, 0x10(r1) -/* 80255804 80 81 00 14 */ lwz r4, 0x14(r1) -/* 80255808 81 83 00 00 */ lwz r12, 0(r3) -/* 8025580C 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 80255810 7D 89 03 A6 */ mtctr r12 -/* 80255814 4E 80 04 21 */ bctrl -/* 80255818 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8025581C 7C 08 03 A6 */ mtlr r0 -/* 80255820 38 21 00 20 */ addi r1, r1, 0x20 -/* 80255824 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/setAlpha__13CPaneMgrAlphaFUc.s b/asm/d/pane/d_pane_class_alpha/setAlpha__13CPaneMgrAlphaFUc.s deleted file mode 100644 index d8fafd9e18..0000000000 --- a/asm/d/pane/d_pane_class_alpha/setAlpha__13CPaneMgrAlphaFUc.s +++ /dev/null @@ -1,32 +0,0 @@ -lbl_80255758: -/* 80255758 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8025575C 7C 08 02 A6 */ mflr r0 -/* 80255760 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255764 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255768 93 C1 00 08 */ stw r30, 8(r1) -/* 8025576C 7C 7E 1B 78 */ mr r30, r3 -/* 80255770 7C 9F 23 78 */ mr r31, r4 -/* 80255774 88 03 00 19 */ lbz r0, 0x19(r3) -/* 80255778 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 8025577C 41 82 00 24 */ beq lbl_802557A0 -/* 80255780 80 1E 00 0C */ lwz r0, 0xc(r30) -/* 80255784 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80255788 80 7E 00 04 */ lwz r3, 4(r30) -/* 8025578C 48 0A 23 01 */ bl getFirstChildPane__7J2DPaneFv -/* 80255790 7C 64 1B 78 */ mr r4, r3 -/* 80255794 7F C3 F3 78 */ mr r3, r30 -/* 80255798 7F E5 FB 78 */ mr r5, r31 -/* 8025579C 48 00 03 C1 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc -lbl_802557A0: -/* 802557A0 80 7E 00 04 */ lwz r3, 4(r30) -/* 802557A4 7F E4 FB 78 */ mr r4, r31 -/* 802557A8 81 83 00 00 */ lwz r12, 0(r3) -/* 802557AC 81 8C 00 24 */ lwz r12, 0x24(r12) -/* 802557B0 7D 89 03 A6 */ mtctr r12 -/* 802557B4 4E 80 04 21 */ bctrl -/* 802557B8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802557BC 83 C1 00 08 */ lwz r30, 8(r1) -/* 802557C0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802557C4 7C 08 03 A6 */ mtlr r0 -/* 802557C8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802557CC 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/setBackupAlpha__17CPaneMgrAlphaMorfFv.s b/asm/d/pane/d_pane_class_alpha/setBackupAlpha__17CPaneMgrAlphaMorfFv.s deleted file mode 100644 index 89324ab530..0000000000 --- a/asm/d/pane/d_pane_class_alpha/setBackupAlpha__17CPaneMgrAlphaMorfFv.s +++ /dev/null @@ -1,24 +0,0 @@ -lbl_80255DD0: -/* 80255DD0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80255DD4 7C 08 02 A6 */ mflr r0 -/* 80255DD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80255DDC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80255DE0 7C 7F 1B 78 */ mr r31, r3 -/* 80255DE4 80 03 00 0C */ lwz r0, 0xc(r3) -/* 80255DE8 28 00 00 00 */ cmplwi r0, 0 -/* 80255DEC 41 82 00 28 */ beq lbl_80255E14 -/* 80255DF0 80 1F 00 1C */ lwz r0, 0x1c(r31) -/* 80255DF4 90 1F 00 20 */ stw r0, 0x20(r31) -/* 80255DF8 80 1F 00 24 */ lwz r0, 0x24(r31) -/* 80255DFC 90 1F 00 28 */ stw r0, 0x28(r31) -/* 80255E00 80 7F 00 04 */ lwz r3, 4(r31) -/* 80255E04 48 0A 1C 89 */ bl getFirstChildPane__7J2DPaneFv -/* 80255E08 7C 64 1B 78 */ mr r4, r3 -/* 80255E0C 7F E3 FB 78 */ mr r3, r31 -/* 80255E10 48 00 00 89 */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane -lbl_80255E14: -/* 80255E14 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80255E18 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80255E1C 7C 08 03 A6 */ mtlr r0 -/* 80255E20 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255E24 4E 80 00 20 */ blr diff --git a/asm/d/pane/d_pane_class_alpha/show__13CPaneMgrAlphaFv.s b/asm/d/pane/d_pane_class_alpha/show__13CPaneMgrAlphaFv.s deleted file mode 100644 index f2e24b9757..0000000000 --- a/asm/d/pane/d_pane_class_alpha/show__13CPaneMgrAlphaFv.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_802555C8: -/* 802555C8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802555CC 7C 08 02 A6 */ mflr r0 -/* 802555D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802555D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802555D8 7C 7F 1B 78 */ mr r31, r3 -/* 802555DC 48 00 00 71 */ bl isVisible__13CPaneMgrAlphaFv -/* 802555E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802555E4 40 82 00 10 */ bne lbl_802555F4 -/* 802555E8 38 00 00 01 */ li r0, 1 -/* 802555EC 80 7F 00 04 */ lwz r3, 4(r31) -/* 802555F0 98 03 00 B0 */ stb r0, 0xb0(r3) -lbl_802555F4: -/* 802555F4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802555F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802555FC 7C 08 03 A6 */ mtlr r0 -/* 80255600 38 21 00 10 */ addi r1, r1, 0x10 -/* 80255604 4E 80 00 20 */ blr diff --git a/asm/d/particle/d_particle/drawSecond_b_light8__FP14JPABaseEmitter.s b/asm/d/particle/d_particle/drawSecond_b_light8__FP14JPABaseEmitter.s index 3786a25c3e..d20c4a9867 100644 --- a/asm/d/particle/d_particle/drawSecond_b_light8__FP14JPABaseEmitter.s +++ b/asm/d/particle/d_particle/drawSecond_b_light8__FP14JPABaseEmitter.s @@ -7,7 +7,7 @@ lbl_80049E40: /* 80049E54 7C 7E 1B 78 */ mr r30, r3 /* 80049E58 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ /* 80049E5C 3B E3 CA 54 */ addi r31, r3, g_env_light@l /* 0x8042CA54@l */ -/* 80049E60 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80049E60 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80049E64 7C 03 07 74 */ extsb r3, r0 /* 80049E68 48 15 CD B9 */ bl dKy_setLight_nowroom__Fc /* 80049E6C 38 60 00 01 */ li r3, 1 diff --git a/asm/d/particle/d_particle/drawSecond_light8__FP14JPABaseEmitter.s b/asm/d/particle/d_particle/drawSecond_light8__FP14JPABaseEmitter.s index d955be5988..c6441a1eae 100644 --- a/asm/d/particle/d_particle/drawSecond_light8__FP14JPABaseEmitter.s +++ b/asm/d/particle/d_particle/drawSecond_light8__FP14JPABaseEmitter.s @@ -10,7 +10,7 @@ lbl_80049C44: /* 80049C64 88 03 00 B9 */ lbz r0, 0xb9(r3) /* 80049C68 7C 04 02 14 */ add r0, r4, r0 /* 80049C6C 7C 1F 07 34 */ extsh r31, r0 -/* 80049C70 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 80049C70 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 80049C74 7C 03 07 74 */ extsb r3, r0 /* 80049C78 C0 22 85 50 */ lfs f1, lit_3964(r2) /* 80049C7C 48 15 CF DD */ bl dKy_setLight_nowroom_grass__Fcf diff --git a/asm/d/s/d_s_name/create__10dScnName_cFv.s b/asm/d/s/d_s_name/create__10dScnName_cFv.s index e1bc032598..a0e9b46fab 100644 --- a/asm/d/s/d_s_name/create__10dScnName_cFv.s +++ b/asm/d/s/d_s_name/create__10dScnName_cFv.s @@ -134,7 +134,7 @@ lbl_8025899C: /* 80258AA4 93 83 61 A8 */ stw r28, 0x61a8(r3) /* 80258AA8 93 83 61 AC */ stw r28, 0x61ac(r3) /* 80258AAC 90 03 61 B0 */ stw r0, 0x61b0(r3) -/* 80258AB0 98 8D 86 67 */ stb r4, struct_80450BE4+0x3(r13) +/* 80258AB0 98 8D 86 67 */ stb r4, mBlureFlag__13mDoGph_gInf_c+0x3(r13) /* 80258AB4 7F A3 EB 78 */ mr r3, r29 /* 80258AB8 48 00 00 75 */ bl setView__10dScnName_cFv /* 80258ABC 4B F4 D3 99 */ bl dKy_setLight_init__Fv diff --git a/asm/d/s/d_s_play/dScnPly_Delete__FP9dScnPly_c.s b/asm/d/s/d_s_play/dScnPly_Delete__FP9dScnPly_c.s index 47e5fb7b67..cc008ae073 100644 --- a/asm/d/s/d_s_play/dScnPly_Delete__FP9dScnPly_c.s +++ b/asm/d/s/d_s_play/dScnPly_Delete__FP9dScnPly_c.s @@ -69,7 +69,7 @@ lbl_802598AC: /* 802599B8 9B C3 00 7C */ stb r30, 0x7c(r3) /* 802599BC 9B C3 5D 44 */ stb r30, 0x5d44(r3) /* 802599C0 93 C3 61 B0 */ stw r30, 0x61b0(r3) -/* 802599C4 88 8D 81 E4 */ lbz r4, struct_80450764+0x0(r13) +/* 802599C4 88 8D 81 E4 */ lbz r4, preLoadNo+0x0(r13) /* 802599C8 7C 80 07 75 */ extsb. r0, r4 /* 802599CC 41 80 00 CC */ blt lbl_80259A98 /* 802599D0 3C 60 80 3A */ lis r3, PreLoadInfoT@ha /* 0x8039A2C8@ha */ @@ -101,7 +101,7 @@ lbl_80259A28: lbl_80259A30: /* 80259A30 3C 60 80 3A */ lis r3, PreLoadInfoT@ha /* 0x8039A2C8@ha */ /* 80259A34 38 63 A2 C8 */ addi r3, r3, PreLoadInfoT@l /* 0x8039A2C8@l */ -/* 80259A38 88 0D 81 E4 */ lbz r0, struct_80450764+0x0(r13) +/* 80259A38 88 0D 81 E4 */ lbz r0, preLoadNo+0x0(r13) /* 80259A3C 7C 00 07 74 */ extsb r0, r0 /* 80259A40 54 00 20 36 */ slwi r0, r0, 4 /* 80259A44 7C 63 02 14 */ add r3, r3, r0 diff --git a/asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s b/asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s index 5e8c09580e..f2338066a7 100644 --- a/asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s +++ b/asm/d/s/d_s_play/dScnPly_Draw__FP9dScnPly_c.s @@ -143,7 +143,7 @@ lbl_802596AC: /* 802596B8 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) /* 802596BC 28 00 00 00 */ cmplwi r0, 0 /* 802596C0 40 82 00 60 */ bne lbl_80259720 -/* 802596C4 88 0D 8B A4 */ lbz r0, struct_80451124+0x0(r13) +/* 802596C4 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13) /* 802596C8 7C 00 07 75 */ extsb. r0, r0 /* 802596CC 40 82 00 54 */ bne lbl_80259720 /* 802596D0 A8 1C 00 08 */ lha r0, 8(r28) @@ -171,7 +171,7 @@ lbl_80259720: /* 80259720 88 0D 89 44 */ lbz r0, data_80450EC4(r13) /* 80259724 60 03 00 01 */ ori r3, r0, 1 /* 80259728 98 6D 89 44 */ stb r3, data_80450EC4(r13) -/* 8025972C 88 8D 8B A4 */ lbz r4, struct_80451124+0x0(r13) +/* 8025972C 88 8D 8B A4 */ lbz r4, pauseTimer__9dScnPly_c+0x0(r13) /* 80259730 7C 80 07 75 */ extsb. r0, r4 /* 80259734 40 82 00 10 */ bne lbl_80259744 /* 80259738 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/asm/d/s/d_s_play/phase_4__FP9dScnPly_c.s b/asm/d/s/d_s_play/phase_4__FP9dScnPly_c.s index cd3c0a933d..4729befee0 100644 --- a/asm/d/s/d_s_play/phase_4__FP9dScnPly_c.s +++ b/asm/d/s/d_s_play/phase_4__FP9dScnPly_c.s @@ -204,13 +204,13 @@ lbl_8025A93C: /* 8025A964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ /* 8025A968 3C 63 00 02 */ addis r3, r3, 2 /* 8025A96C 98 03 DD F8 */ stb r0, -0x2208(r3) -/* 8025A970 98 AD 86 66 */ stb r5, struct_80450BE4+0x2(r13) -/* 8025A974 98 8D 86 3A */ stb r4, struct_80450BB8+0x2(r13) -/* 8025A978 98 AD 8B A4 */ stb r5, struct_80451124+0x0(r13) -/* 8025A97C 98 AD 8B A5 */ stb r5, struct_80451124+0x1(r13) +/* 8025A970 98 AD 86 66 */ stb r5, mBlureFlag__13mDoGph_gInf_c+0x2(r13) +/* 8025A974 98 8D 86 3A */ stb r4, mBgmSet__17mDoAud_zelAudio_c(r13) +/* 8025A978 98 AD 8B A4 */ stb r5, pauseTimer__9dScnPly_c+0x0(r13) +/* 8025A97C 98 AD 8B A5 */ stb r5, pauseTimer__9dScnPly_c+0x1(r13) /* 8025A980 38 00 FF FF */ li r0, -1 -/* 8025A984 98 0D 81 E4 */ stb r0, struct_80450764+0x0(r13) -/* 8025A988 88 0D 81 E5 */ lbz r0, struct_80450764+0x1(r13) +/* 8025A984 98 0D 81 E4 */ stb r0, preLoadNo+0x0(r13) +/* 8025A988 88 0D 81 E5 */ lbz r0, preLoadNo+0x1(r13) /* 8025A98C 28 00 00 00 */ cmplwi r0, 0 /* 8025A990 41 82 00 28 */ beq lbl_8025A9B8 /* 8025A994 38 7E 3E C8 */ addi r3, r30, 0x3ec8 @@ -221,9 +221,9 @@ lbl_8025A93C: /* 8025A9A8 48 10 DF ED */ bl strcmp /* 8025A9AC 2C 03 00 00 */ cmpwi r3, 0 /* 8025A9B0 40 82 00 08 */ bne lbl_8025A9B8 -/* 8025A9B4 9B 8D 81 E4 */ stb r28, struct_80450764+0x0(r13) +/* 8025A9B4 9B 8D 81 E4 */ stb r28, preLoadNo+0x0(r13) lbl_8025A9B8: -/* 8025A9B8 88 0D 81 E4 */ lbz r0, struct_80450764+0x0(r13) +/* 8025A9B8 88 0D 81 E4 */ lbz r0, preLoadNo+0x0(r13) /* 8025A9BC 7C 00 07 75 */ extsb. r0, r0 /* 8025A9C0 40 80 00 0C */ bge lbl_8025A9CC /* 8025A9C4 38 60 00 04 */ li r3, 4 diff --git a/asm/d/s/d_s_play/phase_5__FP9dScnPly_c.s b/asm/d/s/d_s_play/phase_5__FP9dScnPly_c.s index c7d367d80e..a2c824f5cb 100644 --- a/asm/d/s/d_s_play/phase_5__FP9dScnPly_c.s +++ b/asm/d/s/d_s_play/phase_5__FP9dScnPly_c.s @@ -4,7 +4,7 @@ lbl_8025A9F4: /* 8025A9FC 90 01 00 24 */ stw r0, 0x24(r1) /* 8025AA00 39 61 00 20 */ addi r11, r1, 0x20 /* 8025AA04 48 10 77 CD */ bl _savegpr_26 -/* 8025AA08 88 8D 81 E4 */ lbz r4, struct_80450764+0x0(r13) +/* 8025AA08 88 8D 81 E4 */ lbz r4, preLoadNo+0x0(r13) /* 8025AA0C 7C 80 07 75 */ extsb. r0, r4 /* 8025AA10 41 80 00 94 */ blt lbl_8025AAA4 /* 8025AA14 3B A0 00 02 */ li r29, 2 diff --git a/asm/d/s/d_s_play/phase_6__FP9dScnPly_c.s b/asm/d/s/d_s_play/phase_6__FP9dScnPly_c.s index 85c71560e6..792b1af9ac 100644 --- a/asm/d/s/d_s_play/phase_6__FP9dScnPly_c.s +++ b/asm/d/s/d_s_play/phase_6__FP9dScnPly_c.s @@ -4,7 +4,7 @@ lbl_8025AAC0: /* 8025AAC8 90 01 00 24 */ stw r0, 0x24(r1) /* 8025AACC 39 61 00 20 */ addi r11, r1, 0x20 /* 8025AAD0 48 10 77 01 */ bl _savegpr_26 -/* 8025AAD4 88 8D 81 E4 */ lbz r4, struct_80450764+0x0(r13) +/* 8025AAD4 88 8D 81 E4 */ lbz r4, preLoadNo+0x0(r13) /* 8025AAD8 7C 80 07 75 */ extsb. r0, r4 /* 8025AADC 41 80 00 94 */ blt lbl_8025AB70 /* 8025AAE0 3B A0 00 02 */ li r29, 2 diff --git a/asm/d/s/d_s_room/dScnRoom_Execute__FP19room_of_scene_class.s b/asm/d/s/d_s_room/dScnRoom_Execute__FP19room_of_scene_class.s index 0bd6948ca1..a1f1c40da1 100644 --- a/asm/d/s/d_s_room/dScnRoom_Execute__FP19room_of_scene_class.s +++ b/asm/d/s/d_s_room/dScnRoom_Execute__FP19room_of_scene_class.s @@ -42,7 +42,7 @@ lbl_8025B5D8: /* 8025B5FC 28 00 00 00 */ cmplwi r0, 0 /* 8025B600 40 82 00 58 */ bne lbl_8025B658 /* 8025B604 80 7F 00 B0 */ lwz r3, 0xb0(r31) -/* 8025B608 88 0D 87 E4 */ lbz r0, struct_80450D64+0x0(r13) +/* 8025B608 88 0D 87 E4 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0(r13) /* 8025B60C 7C 00 07 74 */ extsb r0, r0 /* 8025B610 7C 03 00 00 */ cmpw r3, r0 /* 8025B614 40 82 00 44 */ bne lbl_8025B658 @@ -60,7 +60,7 @@ lbl_8025B638: /* 8025B63C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B640 41 82 00 10 */ beq lbl_8025B650 /* 8025B644 38 00 00 02 */ li r0, 2 -/* 8025B648 98 0D 8B A5 */ stb r0, struct_80451124+0x1(r13) +/* 8025B648 98 0D 8B A5 */ stb r0, pauseTimer__9dScnPly_c+0x1(r13) /* 8025B64C 48 00 00 0C */ b lbl_8025B658 lbl_8025B650: /* 8025B650 38 00 00 00 */ li r0, 0 diff --git a/asm/f_op/f_op_actor/fopAc_Create__FPv.s b/asm/f_op/f_op_actor/fopAc_Create__FPv.s index 610dfa79de..0df36ab5eb 100644 --- a/asm/f_op/f_op_actor/fopAc_Create__FPv.s +++ b/asm/f_op/f_op_actor/fopAc_Create__FPv.s @@ -153,7 +153,7 @@ lbl_8001919C: /* 800192A4 88 9F 04 BA */ lbz r4, 0x4ba(r31) /* 800192A8 38 A0 00 FF */ li r5, 0xff /* 800192AC 48 18 F6 41 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc -/* 800192B0 88 8D 87 E4 */ lbz r4, struct_80450D64+0x0(r13) +/* 800192B0 88 8D 87 E4 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0(r13) /* 800192B4 7C 84 07 75 */ extsb. r4, r4 /* 800192B8 41 80 00 24 */ blt lbl_800192DC /* 800192BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/f_op/f_op_camera/fopCam_Execute__FP12camera_class.s b/asm/f_op/f_op_camera/fopCam_Execute__FP12camera_class.s index 06d9c70047..d9c86f1d3e 100644 --- a/asm/f_op/f_op_camera/fopCam_Execute__FP12camera_class.s +++ b/asm/f_op/f_op_camera/fopCam_Execute__FP12camera_class.s @@ -8,7 +8,7 @@ lbl_8001E180: /* 8001E198 88 05 5E B5 */ lbz r0, 0x5eb5(r5) /* 8001E19C 28 00 00 00 */ cmplwi r0, 0 /* 8001E1A0 40 82 00 18 */ bne lbl_8001E1B8 -/* 8001E1A4 88 0D 8B A4 */ lbz r0, struct_80451124+0x0(r13) +/* 8001E1A4 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13) /* 8001E1A8 7C 00 07 75 */ extsb. r0, r0 /* 8001E1AC 40 82 00 0C */ bne lbl_8001E1B8 /* 8001E1B0 80 64 02 24 */ lwz r3, 0x224(r4) diff --git a/asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s b/asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s index 7e7c1ce7e7..ae5a21d319 100644 --- a/asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s +++ b/asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s @@ -3,7 +3,7 @@ lbl_8001F2C0: /* 8001F2C4 7C 08 02 A6 */ mflr r0 /* 8001F2C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F2CC 7C 64 1B 78 */ mr r4, r3 -/* 8001F2D0 88 0D 8B A4 */ lbz r0, struct_80451124+0x0(r13) +/* 8001F2D0 88 0D 8B A4 */ lbz r0, pauseTimer__9dScnPly_c+0x0(r13) /* 8001F2D4 7C 00 07 75 */ extsb. r0, r0 /* 8001F2D8 40 82 00 2C */ bne lbl_8001F304 /* 8001F2DC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/m_Do/m_Do_graphic/calcFade__13mDoGph_gInf_cFv.s b/asm/m_Do/m_Do_graphic/calcFade__13mDoGph_gInf_cFv.s index 41dd0f22d7..0815f60bb2 100644 --- a/asm/m_Do/m_Do_graphic/calcFade__13mDoGph_gInf_cFv.s +++ b/asm/m_Do/m_Do_graphic/calcFade__13mDoGph_gInf_cFv.s @@ -2,7 +2,7 @@ lbl_80008330: /* 80008330 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80008334 7C 08 02 A6 */ mflr r0 /* 80008338 90 01 00 24 */ stw r0, 0x24(r1) -/* 8000833C 88 0D 86 66 */ lbz r0, struct_80450BE4+0x2(r13) +/* 8000833C 88 0D 86 66 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 80008340 28 00 00 00 */ cmplwi r0, 0 /* 80008344 41 82 00 64 */ beq lbl_800083A8 /* 80008348 C0 2D 86 5C */ lfs f1, mFadeRate__13mDoGph_gInf_c(r13) @@ -14,7 +14,7 @@ lbl_80008330: /* 80008360 40 80 00 14 */ bge lbl_80008374 /* 80008364 D0 0D 86 5C */ stfs f0, mFadeRate__13mDoGph_gInf_c(r13) /* 80008368 38 00 00 00 */ li r0, 0 -/* 8000836C 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13) +/* 8000836C 98 0D 86 66 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 80008370 48 00 00 14 */ b lbl_80008384 lbl_80008374: /* 80008374 C0 02 80 3C */ lfs f0, lit_4063(r2) diff --git a/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s b/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s index 1f368acba8..5294755de4 100644 --- a/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s +++ b/asm/m_Do/m_Do_graphic/create__13mDoGph_gInf_cFv.s @@ -60,8 +60,8 @@ lbl_80007EC0: /* 80007F28 38 60 04 00 */ li r3, 0x400 /* 80007F2C 48 2E C7 2D */ bl setBuffer__8J2DPrintFUl /* 80007F30 38 00 00 00 */ li r0, 0 -/* 80007F34 98 0D 86 64 */ stb r0, struct_80450BE4+0x0(r13) -/* 80007F38 98 0D 86 66 */ stb r0, struct_80450BE4+0x2(r13) +/* 80007F34 98 0D 86 64 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) +/* 80007F38 98 0D 86 66 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 80007F3C 88 0D 80 80 */ lbz r0, g_clearColor(r13) /* 80007F40 98 0D 80 10 */ stb r0, mBackColor__13mDoGph_gInf_c(r13) /* 80007F44 38 8D 80 80 */ la r4, g_clearColor(r13) /* 80450600-_SDA_BASE_ */ diff --git a/asm/m_Do/m_Do_graphic/drawDepth2__FP10view_classP15view_port_classi.s b/asm/m_Do/m_Do_graphic/drawDepth2__FP10view_classP15view_port_classi.s index a10c85350e..809c5bb5ad 100644 --- a/asm/m_Do/m_Do_graphic/drawDepth2__FP10view_classP15view_port_classi.s +++ b/asm/m_Do/m_Do_graphic/drawDepth2__FP10view_classP15view_port_classi.s @@ -15,7 +15,7 @@ lbl_80008630: /* 80008664 80 16 5D B4 */ lwz r0, 0x5db4(r22) /* 80008668 28 00 00 00 */ cmplwi r0, 0 /* 8000866C 41 82 0A F0 */ beq lbl_8000915C -/* 80008670 88 0D 86 67 */ lbz r0, struct_80450BE4+0x3(r13) +/* 80008670 88 0D 86 67 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x3(r13) /* 80008674 2C 00 00 00 */ cmpwi r0, 0 /* 80008678 41 82 00 3C */ beq lbl_800086B4 /* 8000867C 38 61 00 4C */ addi r3, r1, 0x4c diff --git a/asm/m_Do/m_Do_graphic/mDoGph_AfterOfDraw__Fv.s b/asm/m_Do/m_Do_graphic/mDoGph_AfterOfDraw__Fv.s index 1f9e231d27..178d850b81 100644 --- a/asm/m_Do/m_Do_graphic/mDoGph_AfterOfDraw__Fv.s +++ b/asm/m_Do/m_Do_graphic/mDoGph_AfterOfDraw__Fv.s @@ -43,7 +43,7 @@ lbl_800084F8: /* 80008510 38 60 00 01 */ li r3, 1 lbl_80008514: /* 80008514 54 65 06 3E */ clrlwi r5, r3, 0x18 -/* 80008518 88 0D 80 00 */ lbz r0, data_80450580(r13) +/* 80008518 88 0D 80 00 */ lbz r0, developmentMode__7mDoMain(r13) /* 8000851C 7C 00 07 75 */ extsb. r0, r0 /* 80008520 40 82 00 0C */ bne lbl_8000852C /* 80008524 38 80 00 00 */ li r4, 0 diff --git a/asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s b/asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s index a12e09933b..3dd0746ef6 100644 --- a/asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s +++ b/asm/m_Do/m_Do_graphic/mDoGph_Painter__Fv.s @@ -592,7 +592,7 @@ lbl_8000AEC0: /* 8000AEDC 48 35 DA B9 */ bl strcmp /* 8000AEE0 2C 03 00 00 */ cmpwi r3, 0 /* 8000AEE4 41 82 00 14 */ beq lbl_8000AEF8 -/* 8000AEE8 88 0D 86 66 */ lbz r0, struct_80450BE4+0x2(r13) +/* 8000AEE8 88 0D 86 66 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 8000AEEC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8000AEF0 40 82 00 08 */ bne lbl_8000AEF8 /* 8000AEF4 4B FF D4 3D */ bl calcFade__13mDoGph_gInf_cFv @@ -700,7 +700,7 @@ lbl_8000B064: /* 8000B07C 48 35 D9 19 */ bl strcmp /* 8000B080 2C 03 00 00 */ cmpwi r3, 0 /* 8000B084 41 82 00 10 */ beq lbl_8000B094 -/* 8000B088 88 0D 86 66 */ lbz r0, struct_80450BE4+0x2(r13) +/* 8000B088 88 0D 86 66 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2(r13) /* 8000B08C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8000B090 41 82 00 08 */ beq lbl_8000B098 lbl_8000B094: diff --git a/asm/m_Do/m_Do_graphic/motionBlure__FP10view_class.s b/asm/m_Do/m_Do_graphic/motionBlure__FP10view_class.s index bd711f4b0d..cd611abef6 100644 --- a/asm/m_Do/m_Do_graphic/motionBlure__FP10view_class.s +++ b/asm/m_Do/m_Do_graphic/motionBlure__FP10view_class.s @@ -14,7 +14,7 @@ lbl_8000A290: /* 8000A2C0 38 63 D3 E8 */ addi r3, r3, mFrameBufferTexObj__13mDoGph_gInf_c@l /* 0x803DD3E8@l */ /* 8000A2C4 38 80 00 00 */ li r4, 0 /* 8000A2C8 48 35 41 4D */ bl GXLoadTexObj -/* 8000A2CC 88 0D 86 65 */ lbz r0, struct_80450BE4+0x1(r13) +/* 8000A2CC 88 0D 86 65 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x1(r13) /* 8000A2D0 98 01 00 13 */ stb r0, 0x13(r1) /* 8000A2D4 38 60 00 00 */ li r3, 0 /* 8000A2D8 48 35 38 59 */ bl GXSetNumChans @@ -143,7 +143,7 @@ lbl_8000A290: /* 8000A4C4 38 80 00 00 */ li r4, 0 /* 8000A4C8 48 35 5C 0D */ bl GXSetProjection lbl_8000A4CC: -/* 8000A4CC 88 0D 86 64 */ lbz r0, struct_80450BE4+0x0(r13) +/* 8000A4CC 88 0D 86 64 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x0(r13) /* 8000A4D0 28 00 00 00 */ cmplwi r0, 0 /* 8000A4D4 41 82 00 10 */ beq lbl_8000A4E4 /* 8000A4D8 38 00 00 01 */ li r0, 1 diff --git a/asm/m_Do/m_Do_machine/fault_callback_scroll__FUsP9OSContextUlUl.s b/asm/m_Do/m_Do_machine/fault_callback_scroll__FUsP9OSContextUlUl.s index cfa91ad9c8..87c2d34be6 100644 --- a/asm/m_Do/m_Do_machine/fault_callback_scroll__FUsP9OSContextUlUl.s +++ b/asm/m_Do/m_Do_machine/fault_callback_scroll__FUsP9OSContextUlUl.s @@ -61,7 +61,7 @@ lbl_8000BA40: /* 8000BA40 38 61 00 08 */ addi r3, r1, 8 /* 8000BA44 38 81 00 0C */ addi r4, r1, 0xc /* 8000BA48 4B FF FD 21 */ bl exceptionReadPad__FPUlPUl -/* 8000BA4C 88 0D 8F 81 */ lbz r0, struct_80451500+0x1(r13) +/* 8000BA4C 88 0D 8F 81 */ lbz r0, sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset+0x1(r13) /* 8000BA50 28 00 00 00 */ cmplwi r0, 0 /* 8000BA54 41 82 00 14 */ beq lbl_8000BA68 /* 8000BA58 38 60 00 01 */ li r3, 1 diff --git a/asm/m_Do/m_Do_machine/mDoMch_Create__Fv.s b/asm/m_Do/m_Do_machine/mDoMch_Create__Fv.s index 9b4c59268b..3fabaa783e 100644 --- a/asm/m_Do/m_Do_machine/mDoMch_Create__Fv.s +++ b/asm/m_Do/m_Do_machine/mDoMch_Create__Fv.s @@ -4,7 +4,7 @@ lbl_8000BD44: /* 8000BD4C 90 01 00 14 */ stw r0, 0x14(r1) /* 8000BD50 93 E1 00 0C */ stw r31, 0xc(r1) /* 8000BD54 93 C1 00 08 */ stw r30, 8(r1) -/* 8000BD58 88 0D 80 00 */ lbz r0, data_80450580(r13) +/* 8000BD58 88 0D 80 00 */ lbz r0, developmentMode__7mDoMain(r13) /* 8000BD5C 7C 00 07 75 */ extsb. r0, r0 /* 8000BD60 41 82 00 10 */ beq lbl_8000BD70 /* 8000BD64 48 32 E1 99 */ bl OSGetConsoleType @@ -13,7 +13,7 @@ lbl_8000BD44: lbl_8000BD70: /* 8000BD70 4B FF AB 25 */ bl OSReportDisable lbl_8000BD74: -/* 8000BD74 88 6D 86 70 */ lbz r3, data_80450BF0(r13) +/* 8000BD74 88 6D 86 70 */ lbz r3, mDebugFill(r13) /* 8000BD78 30 03 FF FF */ addic r0, r3, -1 /* 8000BD7C 7C 00 19 10 */ subfe r0, r0, r3 /* 8000BD80 98 0D 83 30 */ stb r0, data_804508B0(r13) @@ -97,7 +97,7 @@ lbl_8000BE84: /* 8000BEA8 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap(r13) /* 8000BEAC 48 00 2E 15 */ bl mDoExt_createAssertHeap__FP7JKRHeap /* 8000BEB0 48 26 5E 69 */ bl init__9JFWSystemFv -/* 8000BEB4 88 0D 80 00 */ lbz r0, data_80450580(r13) +/* 8000BEB4 88 0D 80 00 */ lbz r0, developmentMode__7mDoMain(r13) /* 8000BEB8 7C 00 07 75 */ extsb. r0, r0 /* 8000BEBC 40 82 00 18 */ bne lbl_8000BED4 /* 8000BEC0 38 60 00 00 */ li r3, 0 diff --git a/asm/m_Do/m_Do_main/main01__Fv.s b/asm/m_Do/m_Do_main/main01__Fv.s index 2e8da466b9..6b30e86e9f 100644 --- a/asm/m_Do/m_Do_main/main01__Fv.s +++ b/asm/m_Do/m_Do_main/main01__Fv.s @@ -73,7 +73,7 @@ lbl_80006374: /* 8000638C 90 04 00 1C */ stw r0, 0x1c(r4) lbl_80006390: /* 80006390 80 6D 8C 38 */ lwz r3, systemConsole__9JFWSystem(r13) -/* 80006394 88 0D 80 00 */ lbz r0, data_80450580(r13) +/* 80006394 88 0D 80 00 */ lbz r0, developmentMode__7mDoMain(r13) /* 80006398 7C 00 07 75 */ extsb. r0, r0 /* 8000639C 38 00 00 00 */ li r0, 0 /* 800063A0 41 82 00 08 */ beq lbl_800063A8 @@ -91,7 +91,7 @@ lbl_800063A8: /* 800063CC 48 01 26 D5 */ bl fapGm_Create__Fv /* 800063D0 48 01 7A 41 */ bl fopAcM_initManager__Fv /* 800063D4 38 00 00 00 */ li r0, 0 -/* 800063D8 98 0D 85 98 */ stb r0, struct_80450B18+0x0(r13) +/* 800063D8 98 0D 85 98 */ stb r0, mDisplayHeapSize(r13) /* 800063DC 48 01 23 89 */ bl cDyl_InitAsync__Fv /* 800063E0 3C 60 00 15 */ lis r3, 0x0015 /* 0x0014D800@ha */ /* 800063E4 38 63 D8 00 */ addi r3, r3, 0xD800 /* 0x0014D800@l */ @@ -105,7 +105,7 @@ lbl_80006400: /* 80006400 80 6D 85 B4 */ lwz r3, frame(r13) /* 80006404 38 63 00 01 */ addi r3, r3, 1 /* 80006408 90 6D 85 B4 */ stw r3, frame(r13) -/* 8000640C 88 8D 85 80 */ lbz r4, data_80450B00(r13) +/* 8000640C 88 8D 85 80 */ lbz r4, fillcheck_check_frame(r13) /* 80006410 28 04 00 00 */ cmplwi r4, 0 /* 80006414 41 82 00 18 */ beq lbl_8000642C /* 80006418 7C 03 23 96 */ divwu r0, r3, r4 @@ -114,7 +114,7 @@ lbl_80006400: /* 80006424 40 82 00 08 */ bne lbl_8000642C /* 80006428 48 00 52 41 */ bl mDoMch_HeapCheckAll__Fv lbl_8000642C: -/* 8000642C 88 0D 87 00 */ lbz r0, struct_80450C80+0x0(r13) +/* 8000642C 88 0D 87 00 */ lbz r0, SyncWidthSound(r13) /* 80006430 28 00 00 00 */ cmplwi r0, 0 /* 80006434 41 82 00 0C */ beq lbl_80006440 /* 80006438 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/daB_BQ_Draw__FP10b_bq_class.s b/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/daB_BQ_Draw__FP10b_bq_class.s index 40e9e770c0..3cf5112647 100644 --- a/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/daB_BQ_Draw__FP10b_bq_class.s +++ b/asm/rel/d/a/b/d_a_b_bq/d_a_b_bq/daB_BQ_Draw__FP10b_bq_class.s @@ -193,14 +193,14 @@ lbl_805B3A78: /* 805B3A78 A8 1D 12 AC */ lha r0, 0x12ac(r29) /* 805B3A7C 2C 00 00 02 */ cmpwi r0, 2 /* 805B3A80 40 81 00 14 */ ble lbl_805B3A94 -/* 805B3A84 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 805B3A88 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 805B3A84 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 805B3A88 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 805B3A8C 4B A5 45 ED */ bl onBlure__13mDoGph_gInf_cFv /* 805B3A90 48 00 00 10 */ b lbl_805B3AA0 lbl_805B3A94: /* 805B3A94 38 00 00 00 */ li r0, 0 -/* 805B3A98 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 805B3A9C 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 805B3A98 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 805B3A9C 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_805B3AA0: /* 805B3AA0 38 60 00 01 */ li r3, 1 lbl_805B3AA4: diff --git a/asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/daB_DRE_Draw__FP9daB_DRE_c.s b/asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/daB_DRE_Draw__FP9daB_DRE_c.s index 1200abc7a3..adfc3cdd90 100644 --- a/asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/daB_DRE_Draw__FP9daB_DRE_c.s +++ b/asm/rel/d/a/b/d_a_b_dre/d_a_b_dre/daB_DRE_Draw__FP9daB_DRE_c.s @@ -93,14 +93,14 @@ lbl_805CA8D0: /* 805CA8E0 FC 00 08 1E */ fctiwz f0, f1 /* 805CA8E4 D8 01 00 18 */ stfd f0, 0x18(r1) /* 805CA8E8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 805CA8EC 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 805CA8F0 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 805CA8EC 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 805CA8F0 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 805CA8F4 4B A3 D7 85 */ bl onBlure__13mDoGph_gInf_cFv /* 805CA8F8 48 00 00 10 */ b lbl_805CA908 lbl_805CA8FC: /* 805CA8FC 38 00 00 00 */ li r0, 0 -/* 805CA900 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 805CA904 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 805CA900 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 805CA904 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_805CA908: /* 805CA908 38 60 00 01 */ li r3, 1 /* 805CA90C 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/damageSet__8daB_DS_cFv.s b/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/damageSet__8daB_DS_cFv.s index 41dc779424..2049efea70 100644 --- a/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/damageSet__8daB_DS_cFv.s +++ b/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/damageSet__8daB_DS_cFv.s @@ -6,8 +6,8 @@ lbl_805D0374: /* 805D0384 28 00 00 00 */ cmplwi r0, 0 /* 805D0388 40 82 00 10 */ bne lbl_805D0398 /* 805D038C 38 00 00 05 */ li r0, 5 -/* 805D0390 3C 80 80 45 */ lis r4, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 805D0394 98 04 11 25 */ stb r0, struct_80451124+0x1@l(r4) /* 0x80451125@l */ +/* 805D0390 3C 80 80 45 */ lis r4, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 805D0394 98 04 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r4) /* 0x80451125@l */ lbl_805D0398: /* 805D0398 38 00 00 01 */ li r0, 1 /* 805D039C 98 03 08 5E */ stb r0, 0x85e(r3) diff --git a/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/executeBattle2Damage__8daB_DS_cFv.s b/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/executeBattle2Damage__8daB_DS_cFv.s index 9841fb5588..0bf7c86183 100644 --- a/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/executeBattle2Damage__8daB_DS_cFv.s +++ b/asm/rel/d/a/b/d_a_b_ds/d_a_b_ds/executeBattle2Damage__8daB_DS_cFv.s @@ -420,8 +420,8 @@ lbl_805D5794: /* 805D5914 4B A7 7B B9 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 805D5918 90 7B 2D EC */ stw r3, 0x2dec(r27) /* 805D591C 38 00 00 05 */ li r0, 5 -/* 805D5920 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 805D5924 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 805D5920 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 805D5924 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 805D5928 C0 3D 00 04 */ lfs f1, 4(r29) /* 805D592C D0 21 00 78 */ stfs f1, 0x78(r1) /* 805D5930 C0 1D 00 08 */ lfs f0, 8(r29) diff --git a/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/At_Check__8daB_GG_cFv.s b/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/At_Check__8daB_GG_cFv.s index e85dbaf84c..b76c0e2ff2 100644 --- a/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/At_Check__8daB_GG_cFv.s +++ b/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/At_Check__8daB_GG_cFv.s @@ -128,8 +128,8 @@ lbl_805EA8E8: /* 805EA910 41 82 00 08 */ beq lbl_805EA918 /* 805EA914 3B C0 00 04 */ li r30, 4 lbl_805EA918: -/* 805EA918 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 805EA91C 9B C3 11 25 */ stb r30, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 805EA918 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 805EA91C 9B C3 11 25 */ stb r30, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_805EA920: /* 805EA920 39 61 00 20 */ addi r11, r1, 0x20 /* 805EA924 4B D7 78 FD */ bl _restgpr_27 diff --git a/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/Draw__8daB_GG_cFv.s b/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/Draw__8daB_GG_cFv.s index 294e5850ef..bceb7346c7 100644 --- a/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/Draw__8daB_GG_cFv.s +++ b/asm/rel/d/a/b/d_a_b_gg/d_a_b_gg/Draw__8daB_GG_cFv.s @@ -167,14 +167,14 @@ lbl_805EB830: /* 805EB864 FC 00 00 1E */ fctiwz f0, f0 /* 805EB868 D8 01 00 28 */ stfd f0, 0x28(r1) /* 805EB86C 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 805EB870 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 805EB874 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 805EB870 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 805EB874 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 805EB878 4B A1 C8 01 */ bl onBlure__13mDoGph_gInf_cFv /* 805EB87C 48 00 00 10 */ b lbl_805EB88C lbl_805EB880: /* 805EB880 38 00 00 00 */ li r0, 0 -/* 805EB884 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 805EB888 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 805EB884 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 805EB888 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_805EB88C: /* 805EB88C 38 60 00 01 */ li r3, 1 /* 805EB890 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/damage_check__FP11b_gnd_class.s b/asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/damage_check__FP11b_gnd_class.s index 37b1ec3490..7782b925ab 100644 --- a/asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/damage_check__FP11b_gnd_class.s +++ b/asm/rel/d/a/b/d_a_b_gnd/d_a_b_gnd/damage_check__FP11b_gnd_class.s @@ -182,8 +182,8 @@ lbl_805F9AFC: /* 805F9B9C B0 1C 0C 58 */ sth r0, 0xc58(r28) /* 805F9BA0 98 7C 0C 7C */ stb r3, 0xc7c(r28) /* 805F9BA4 38 00 00 07 */ li r0, 7 -/* 805F9BA8 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 805F9BAC 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 805F9BA8 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 805F9BAC 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 805F9BB0 38 00 00 64 */ li r0, 0x64 /* 805F9BB4 B0 1C 05 62 */ sth r0, 0x562(r28) /* 805F9BB8 48 00 00 14 */ b lbl_805F9BCC diff --git a/asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/draw__9daB_MGN_cFv.s b/asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/draw__9daB_MGN_cFv.s index c910f3a448..a97499ab33 100644 --- a/asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/draw__9daB_MGN_cFv.s +++ b/asm/rel/d/a/b/d_a_b_mgn/d_a_b_mgn/draw__9daB_MGN_cFv.s @@ -241,14 +241,14 @@ lbl_80605C14: /* 80605C3C FC 00 08 1E */ fctiwz f0, f1 /* 80605C40 D8 01 00 88 */ stfd f0, 0x88(r1) /* 80605C44 80 01 00 8C */ lwz r0, 0x8c(r1) -/* 80605C48 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 80605C4C 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 80605C48 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 80605C4C 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 80605C50 4B A0 24 29 */ bl onBlure__13mDoGph_gInf_cFv /* 80605C54 48 00 00 10 */ b lbl_80605C64 lbl_80605C58: /* 80605C58 38 00 00 00 */ li r0, 0 -/* 80605C5C 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 80605C60 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 80605C5C 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 80605C60 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_80605C64: /* 80605C64 38 61 00 20 */ addi r3, r1, 0x20 /* 80605C68 38 80 FF FF */ li r4, -1 diff --git a/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/daB_OB_Draw__FP10b_ob_class.s b/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/daB_OB_Draw__FP10b_ob_class.s index ef6b939fdb..2b9d5d20b5 100644 --- a/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/daB_OB_Draw__FP10b_ob_class.s +++ b/asm/rel/d/a/b/d_a_b_ob/d_a_b_ob/daB_OB_Draw__FP10b_ob_class.s @@ -336,14 +336,14 @@ lbl_806113C4: /* 806113C4 A8 1F 5D 0A */ lha r0, 0x5d0a(r31) /* 806113C8 2C 00 00 02 */ cmpwi r0, 2 /* 806113CC 40 81 00 14 */ ble lbl_806113E0 -/* 806113D0 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 806113D4 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 806113D0 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 806113D4 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 806113D8 4B 9F 6C A1 */ bl onBlure__13mDoGph_gInf_cFv /* 806113DC 48 00 00 10 */ b lbl_806113EC lbl_806113E0: /* 806113E0 38 00 00 00 */ li r0, 0 -/* 806113E4 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 806113E8 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 806113E4 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 806113E8 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_806113EC: /* 806113EC 38 60 00 01 */ li r3, 1 /* 806113F0 39 61 00 50 */ addi r11, r1, 0x50 diff --git a/asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/create__8daB_TN_cFv.s b/asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/create__8daB_TN_cFv.s index 09380482b6..78832ff4c1 100644 --- a/asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/create__8daB_TN_cFv.s +++ b/asm/rel/d/a/b/d_a_b_tn/d_a_b_tn/create__8daB_TN_cFv.s @@ -351,8 +351,8 @@ lbl_8062D290: /* 8062D2A8 4B D3 B6 ED */ bl strcmp /* 8062D2AC 2C 03 00 00 */ cmpwi r3, 0 /* 8062D2B0 40 82 00 1C */ bne lbl_8062D2CC -/* 8062D2B4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8062D2B8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8062D2B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8062D2B8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8062D2BC 2C 00 00 02 */ cmpwi r0, 2 /* 8062D2C0 40 82 00 0C */ bne lbl_8062D2CC /* 8062D2C4 38 00 00 01 */ li r0, 1 diff --git a/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/damage_check__8daB_YO_cFv.s b/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/damage_check__8daB_YO_cFv.s index c501b11c7f..9c332f9d1e 100644 --- a/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/damage_check__8daB_YO_cFv.s +++ b/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/damage_check__8daB_YO_cFv.s @@ -138,8 +138,8 @@ lbl_8062FFC0: /* 8063000C 80 1F 18 2C */ lwz r0, 0x182c(r31) /* 80630010 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80630014 41 82 00 10 */ beq lbl_80630024 -/* 80630018 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8063001C 98 83 11 25 */ stb r4, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80630018 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8063001C 98 83 11 25 */ stb r4, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80630020 48 00 00 C0 */ b lbl_806300E0 lbl_80630024: /* 80630024 88 1F 0F A8 */ lbz r0, 0xfa8(r31) diff --git a/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/draw__8daB_YO_cFv.s b/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/draw__8daB_YO_cFv.s index ebc5a6c1c7..2afc2b95f0 100644 --- a/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/draw__8daB_YO_cFv.s +++ b/asm/rel/d/a/b/d_a_b_yo/d_a_b_yo/draw__8daB_YO_cFv.s @@ -421,14 +421,14 @@ lbl_8062FB34: /* 8062FB44 FC 00 08 1E */ fctiwz f0, f1 /* 8062FB48 D8 01 00 20 */ stfd f0, 0x20(r1) /* 8062FB4C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8062FB50 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 8062FB54 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 8062FB50 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 8062FB54 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 8062FB58 4B 9D 85 21 */ bl onBlure__13mDoGph_gInf_cFv /* 8062FB5C 48 00 00 10 */ b lbl_8062FB6C lbl_8062FB60: /* 8062FB60 38 00 00 00 */ li r0, 0 -/* 8062FB64 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 8062FB68 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 8062FB64 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 8062FB68 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_8062FB6C: /* 8062FB6C 38 60 00 01 */ li r3, 1 lbl_8062FB70: diff --git a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/action__10daB_ZANT_cFv.s b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/action__10daB_ZANT_cFv.s index edfb4609f2..c06d67d322 100644 --- a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/action__10daB_ZANT_cFv.s +++ b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/action__10daB_ZANT_cFv.s @@ -356,8 +356,8 @@ lbl_8064CA20: /* 8064CA68 7F C3 F3 78 */ mr r3, r30 /* 8064CA6C 4B FF E8 05 */ bl calcMahojinAnime__10daB_ZANT_cFv /* 8064CA70 38 00 00 01 */ li r0, 1 -/* 8064CA74 3C 60 80 45 */ lis r3, data_80450D68@ha /* 0x80450D68@ha */ -/* 8064CA78 98 03 0D 68 */ stb r0, data_80450D68@l(r3) /* 0x80450D68@l */ +/* 8064CA74 3C 60 80 45 */ lis r3, mNoChangeRoom__20dStage_roomControl_c@ha /* 0x80450D68@ha */ +/* 8064CA78 98 03 0D 68 */ stb r0, mNoChangeRoom__20dStage_roomControl_c@l(r3) /* 0x80450D68@l */ /* 8064CA7C 88 1E 06 FB */ lbz r0, 0x6fb(r30) /* 8064CA80 3C 60 80 65 */ lis r3, data_8064F030@ha /* 0x8064F030@ha */ /* 8064CA84 38 63 F0 30 */ addi r3, r3, data_8064F030@l /* 0x8064F030@l */ diff --git a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/create__10daB_ZANT_cFv.s b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/create__10daB_ZANT_cFv.s index 813fdef6e6..9a0ea09f35 100644 --- a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/create__10daB_ZANT_cFv.s +++ b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/create__10daB_ZANT_cFv.s @@ -296,8 +296,8 @@ lbl_8064E5FC: /* 8064E608 42 00 FF F4 */ bdnz lbl_8064E5FC /* 8064E60C 38 00 FF FF */ li r0, -1 /* 8064E610 90 1F 07 24 */ stw r0, 0x724(r31) -/* 8064E614 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8064E618 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8064E614 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8064E618 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8064E61C 88 63 00 00 */ lbz r3, 0(r3) /* 8064E620 7C 63 07 74 */ extsb r3, r3 /* 8064E624 2C 03 00 3C */ cmpwi r3, 0x3c diff --git a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/damage_check__10daB_ZANT_cFv.s b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/damage_check__10daB_ZANT_cFv.s index 0a5ebbc974..a379010679 100644 --- a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/damage_check__10daB_ZANT_cFv.s +++ b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/damage_check__10daB_ZANT_cFv.s @@ -121,8 +121,8 @@ lbl_8063EAEC: /* 8063EAF8 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 8063EAFC 40 82 00 10 */ bne lbl_8063EB0C /* 8063EB00 38 00 00 00 */ li r0, 0 -/* 8063EB04 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8063EB08 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8063EB04 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8063EB08 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8063EB0C: /* 8063EB0C 80 78 0C 50 */ lwz r3, 0xc50(r24) /* 8063EB10 80 03 00 10 */ lwz r0, 0x10(r3) diff --git a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/ice_damage_check__10daB_ZANT_cFv.s b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/ice_damage_check__10daB_ZANT_cFv.s index a042009165..6879025c20 100644 --- a/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/ice_damage_check__10daB_ZANT_cFv.s +++ b/asm/rel/d/a/b/d_a_b_zant/d_a_b_zant/ice_damage_check__10daB_ZANT_cFv.s @@ -130,8 +130,8 @@ lbl_8063F6DC: /* 8063F6FC 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 8063F700 40 82 00 10 */ bne lbl_8063F710 /* 8063F704 38 00 00 00 */ li r0, 0 -/* 8063F708 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8063F70C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8063F708 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8063F70C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8063F710: /* 8063F710 80 7B 0C 50 */ lwz r3, 0xc50(r27) /* 8063F714 80 03 00 10 */ lwz r0, 0x10(r3) diff --git a/asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/executeSmall__11daB_ZANTM_cFv.s b/asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/executeSmall__11daB_ZANTM_cFv.s index 247644f952..e156e43de1 100644 --- a/asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/executeSmall__11daB_ZANTM_cFv.s +++ b/asm/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic/executeSmall__11daB_ZANTM_cFv.s @@ -27,8 +27,8 @@ lbl_8064FAA0: /* 8064FAAC 80 61 00 10 */ lwz r3, 0x10(r1) /* 8064FAB0 28 03 00 00 */ cmplwi r3, 0 /* 8064FAB4 41 82 00 2C */ beq lbl_8064FAE0 -/* 8064FAB8 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8064FABC 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8064FAB8 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8064FABC 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8064FAC0 2C 00 00 37 */ cmpwi r0, 0x37 /* 8064FAC4 40 82 00 10 */ bne lbl_8064FAD4 /* 8064FAC8 4B FF 0B 9D */ bl getMagicWaterSpeed__10daB_ZANT_cFv @@ -39,8 +39,8 @@ lbl_8064FAD4: /* 8064FAD8 FF E0 08 90 */ fmr f31, f1 /* 8064FADC 48 00 00 20 */ b lbl_8064FAFC lbl_8064FAE0: -/* 8064FAE0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8064FAE4 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8064FAE0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8064FAE4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8064FAE8 2C 00 00 37 */ cmpwi r0, 0x37 /* 8064FAEC 40 82 00 0C */ bne lbl_8064FAF8 /* 8064FAF0 C3 FF 00 14 */ lfs f31, 0x14(r31) @@ -84,8 +84,8 @@ lbl_8064FB18: /* 8064FB7C EC 01 00 28 */ fsubs f0, f1, f0 /* 8064FB80 EC 03 00 2A */ fadds f0, f3, f0 /* 8064FB84 D0 01 00 18 */ stfs f0, 0x18(r1) -/* 8064FB88 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8064FB8C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8064FB88 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8064FB8C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8064FB90 2C 00 00 37 */ cmpwi r0, 0x37 /* 8064FB94 41 82 00 20 */ beq lbl_8064FBB4 /* 8064FB98 38 7E 04 D0 */ addi r3, r30, 0x4d0 diff --git a/asm/rel/d/a/d_a_arrow/d_a_arrow/setRoomInfo__9daArrow_cFv.s b/asm/rel/d/a/d_a_arrow/d_a_arrow/setRoomInfo__9daArrow_cFv.s index a4e6f3aa35..df0d54b94a 100644 --- a/asm/rel/d/a/d_a_arrow/d_a_arrow/setRoomInfo__9daArrow_cFv.s +++ b/asm/rel/d/a/d_a_arrow/d_a_arrow/setRoomInfo__9daArrow_cFv.s @@ -25,8 +25,8 @@ lbl_8049ACE0: /* 8049AD3C 98 7C 04 8D */ stb r3, 0x48d(r28) /* 8049AD40 48 00 00 10 */ b lbl_8049AD50 lbl_8049AD44: -/* 8049AD44 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8049AD48 8B A3 0D 64 */ lbz r29, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8049AD44 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8049AD48 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8049AD4C 7F BD 07 74 */ extsb r29, r29 lbl_8049AD50: /* 8049AD50 9B BC 04 8C */ stb r29, 0x48c(r28) diff --git a/asm/rel/d/a/d_a_boomerang/d_a_boomerang/setRoomInfo__13daBoomerang_cFv.s b/asm/rel/d/a/d_a_boomerang/d_a_boomerang/setRoomInfo__13daBoomerang_cFv.s index dbda02d1f7..4216ec3dc9 100644 --- a/asm/rel/d/a/d_a_boomerang/d_a_boomerang/setRoomInfo__13daBoomerang_cFv.s +++ b/asm/rel/d/a/d_a_boomerang/d_a_boomerang/setRoomInfo__13daBoomerang_cFv.s @@ -30,8 +30,8 @@ lbl_8049F9F0: /* 8049FA60 98 7D 04 8D */ stb r3, 0x48d(r29) /* 8049FA64 48 00 00 10 */ b lbl_8049FA74 lbl_8049FA68: -/* 8049FA68 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8049FA6C 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8049FA68 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8049FA6C 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8049FA70 7F DE 07 74 */ extsb r30, r30 lbl_8049FA74: /* 8049FA74 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/d_a_bullet/d_a_bullet/Execute__10daBullet_cFv.s b/asm/rel/d/a/d_a_bullet/d_a_bullet/Execute__10daBullet_cFv.s index 1ab32758d5..11c8d337ba 100644 --- a/asm/rel/d/a/d_a_bullet/d_a_bullet/Execute__10daBullet_cFv.s +++ b/asm/rel/d/a/d_a_bullet/d_a_bullet/Execute__10daBullet_cFv.s @@ -83,8 +83,8 @@ lbl_8065600C: /* 80656048 98 7F 04 8D */ stb r3, 0x48d(r31) /* 8065604C 48 00 00 10 */ b lbl_8065605C lbl_80656050: -/* 80656050 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80656054 8B A3 0D 64 */ lbz r29, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80656050 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80656054 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80656058 7F BD 07 74 */ extsb r29, r29 lbl_8065605C: /* 8065605C 9B BF 04 8C */ stb r29, 0x48c(r31) diff --git a/asm/rel/d/a/d_a_canoe/d_a_canoe/setRoomInfo__9daCanoe_cFv.s b/asm/rel/d/a/d_a_canoe/d_a_canoe/setRoomInfo__9daCanoe_cFv.s index 66adde405f..c188a2ad43 100644 --- a/asm/rel/d/a/d_a_canoe/d_a_canoe/setRoomInfo__9daCanoe_cFv.s +++ b/asm/rel/d/a/d_a_canoe/d_a_canoe/setRoomInfo__9daCanoe_cFv.s @@ -23,8 +23,8 @@ lbl_804DB008: /* 804DB05C 98 7D 04 8D */ stb r3, 0x48d(r29) /* 804DB060 48 00 00 10 */ b lbl_804DB070 lbl_804DB064: -/* 804DB064 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804DB068 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804DB064 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804DB068 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804DB06C 7F DE 07 74 */ extsb r30, r30 lbl_804DB070: /* 804DB070 88 1D 04 E2 */ lbz r0, 0x4e2(r29) diff --git a/asm/rel/d/a/d_a_cstaf/d_a_cstaF/setRoomInfo__9daCstaF_cFv.s b/asm/rel/d/a/d_a_cstaf/d_a_cstaF/setRoomInfo__9daCstaF_cFv.s index 5d38c64a3a..61fa8b459b 100644 --- a/asm/rel/d/a/d_a_cstaf/d_a_cstaF/setRoomInfo__9daCstaF_cFv.s +++ b/asm/rel/d/a/d_a_cstaf/d_a_cstaF/setRoomInfo__9daCstaF_cFv.s @@ -23,8 +23,8 @@ lbl_804DE558: /* 804DE5AC 98 7D 04 8D */ stb r3, 0x48d(r29) /* 804DE5B0 48 00 00 10 */ b lbl_804DE5C0 lbl_804DE5B4: -/* 804DE5B4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804DE5B8 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804DE5B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804DE5B8 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804DE5BC 7F DE 07 74 */ extsb r30, r30 lbl_804DE5C0: /* 804DE5C0 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/d_a_cstatue/d_a_cstatue/setRoomInfo__11daCstatue_cFv.s b/asm/rel/d/a/d_a_cstatue/d_a_cstatue/setRoomInfo__11daCstatue_cFv.s index f0a7d0d325..592559100a 100644 --- a/asm/rel/d/a/d_a_cstatue/d_a_cstatue/setRoomInfo__11daCstatue_cFv.s +++ b/asm/rel/d/a/d_a_cstatue/d_a_cstatue/setRoomInfo__11daCstatue_cFv.s @@ -23,8 +23,8 @@ lbl_80664AA0: /* 80664AF4 98 7D 04 8D */ stb r3, 0x48d(r29) /* 80664AF8 48 00 00 10 */ b lbl_80664B08 lbl_80664AFC: -/* 80664AFC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80664B00 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80664AFC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80664B00 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80664B04 7F DE 07 74 */ extsb r30, r30 lbl_80664B08: /* 80664B08 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/d_a_demo00/d_a_demo00/actPerformance__10daDemo00_cFP13dDemo_actor_c.s b/asm/rel/d/a/d_a_demo00/d_a_demo00/actPerformance__10daDemo00_cFP13dDemo_actor_c.s index 1727cc8d02..deae1d05cf 100644 --- a/asm/rel/d/a/d_a_demo00/d_a_demo00/actPerformance__10daDemo00_cFP13dDemo_actor_c.s +++ b/asm/rel/d/a/d_a_demo00/d_a_demo00/actPerformance__10daDemo00_cFP13dDemo_actor_c.s @@ -294,8 +294,8 @@ lbl_804A5D5C: /* 804A5D88 28 03 00 00 */ cmplwi r3, 0 /* 804A5D8C 41 82 00 9C */ beq lbl_804A5E28 /* 804A5D90 D3 E3 00 1C */ stfs f31, 0x1c(r3) -/* 804A5D94 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804A5D98 8B 83 0D 64 */ lbz r28, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804A5D94 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804A5D98 8B 83 0D 64 */ lbz r28, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804A5D9C 7F 9C 07 74 */ extsb r28, r28 /* 804A5DA0 38 80 00 00 */ li r4, 0 /* 804A5DA4 7C 83 23 78 */ mr r3, r4 diff --git a/asm/rel/d/a/d_a_demo00/d_a_demo00/daDemo00_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/d_a_demo00/d_a_demo00/daDemo00_Create__FP10fopAc_ac_c.s index c2293114b5..f610688aae 100644 --- a/asm/rel/d/a/d_a_demo00/d_a_demo00/daDemo00_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/d_a_demo00/d_a_demo00/daDemo00_Create__FP10fopAc_ac_c.s @@ -87,8 +87,8 @@ lbl_804A8574: /* 804A8628 D0 03 00 04 */ stfs f0, 4(r3) /* 804A862C D0 03 00 08 */ stfs f0, 8(r3) /* 804A8630 38 7F 01 0C */ addi r3, r31, 0x10c -/* 804A8634 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804A8638 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 804A8634 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804A8638 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 804A863C 7C 04 07 74 */ extsb r4, r0 /* 804A8640 38 A0 00 FF */ li r5, 0xff /* 804A8644 4B D0 02 A9 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc diff --git a/asm/rel/d/a/d_a_demo_item/d_a_demo_item/actionEvent__9daDitem_cFv.s b/asm/rel/d/a/d_a_demo_item/d_a_demo_item/actionEvent__9daDitem_cFv.s index fe8c26e1d6..19a893e66c 100644 --- a/asm/rel/d/a/d_a_demo_item/d_a_demo_item/actionEvent__9daDitem_cFv.s +++ b/asm/rel/d/a/d_a_demo_item/d_a_demo_item/actionEvent__9daDitem_cFv.s @@ -44,8 +44,8 @@ lbl_804E0178: /* 804E0178 88 1D 09 2A */ lbz r0, 0x92a(r29) /* 804E017C 28 00 00 21 */ cmplwi r0, 0x21 /* 804E0180 40 82 08 A0 */ bne lbl_804E0A20 -/* 804E0184 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804E0188 8B E3 0D 64 */ lbz r31, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804E0184 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804E0188 8B E3 0D 64 */ lbz r31, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804E018C 7F FF 07 74 */ extsb r31, r31 /* 804E0190 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 804E0194 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/d_a_ep/d_a_ep/daEp_Execute__FP8ep_class.s b/asm/rel/d/a/d_a_ep/d_a_ep/daEp_Execute__FP8ep_class.s index 120cfeea3d..6cc57c764d 100644 --- a/asm/rel/d/a/d_a_ep/d_a_ep/daEp_Execute__FP8ep_class.s +++ b/asm/rel/d/a/d_a_ep/d_a_ep/daEp_Execute__FP8ep_class.s @@ -239,8 +239,8 @@ lbl_8046A420: /* 8046A42C 28 00 00 01 */ cmplwi r0, 1 /* 8046A430 40 82 00 10 */ bne lbl_8046A440 /* 8046A434 38 00 00 02 */ li r0, 2 -/* 8046A438 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8046A43C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8046A438 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8046A43C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8046A440: /* 8046A440 3C 60 00 04 */ lis r3, 0x0004 /* 0x00040020@ha */ /* 8046A444 38 03 00 20 */ addi r0, r3, 0x0020 /* 0x00040020@l */ diff --git a/asm/rel/d/a/d_a_grass/d_a_grass/calc__15dGrass_packet_cFv.s b/asm/rel/d/a/d_a_grass/d_a_grass/calc__15dGrass_packet_cFv.s index 3512f2cd56..d75f66e511 100644 --- a/asm/rel/d/a/d_a_grass/d_a_grass/calc__15dGrass_packet_cFv.s +++ b/asm/rel/d/a/d_a_grass/d_a_grass/calc__15dGrass_packet_cFv.s @@ -204,8 +204,8 @@ lbl_8051FD20: /* 8051FDC4 3A F7 00 38 */ addi r23, r23, 0x38 /* 8051FDC8 3A 94 0B EA */ addi r20, r20, 0xbea /* 8051FDCC 41 80 FF 04 */ blt lbl_8051FCD0 -/* 8051FDD0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8051FDD4 8B A3 0D 64 */ lbz r29, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8051FDD0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8051FDD4 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8051FDD8 7F BD 07 74 */ extsb r29, r29 /* 8051FDDC 3C 75 00 02 */ addis r3, r21, 2 /* 8051FDE0 57 A0 10 3A */ slwi r0, r29, 2 diff --git a/asm/rel/d/a/d_a_grass/d_a_grass/calc__16dFlower_packet_cFv.s b/asm/rel/d/a/d_a_grass/d_a_grass/calc__16dFlower_packet_cFv.s index 1e0fc76fcc..3ed1a37d8c 100644 --- a/asm/rel/d/a/d_a_grass/d_a_grass/calc__16dFlower_packet_cFv.s +++ b/asm/rel/d/a/d_a_grass/d_a_grass/calc__16dFlower_packet_cFv.s @@ -43,8 +43,8 @@ lbl_805227C8: /* 80522814 39 08 00 38 */ addi r8, r8, 0x38 /* 80522818 38 63 00 FA */ addi r3, r3, 0xfa /* 8052281C 42 00 FF AC */ bdnz lbl_805227C8 -/* 80522820 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80522824 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80522820 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80522824 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80522828 7F DE 07 74 */ extsb r30, r30 /* 8052282C 3C 9B 00 01 */ addis r4, r27, 1 /* 80522830 57 C0 10 3A */ slwi r0, r30, 2 diff --git a/asm/rel/d/a/d_a_horse/d_a_horse/callHorseSubstance__9daHorse_cFPC4cXyz.s b/asm/rel/d/a/d_a_horse/d_a_horse/callHorseSubstance__9daHorse_cFPC4cXyz.s index ef888799d0..529cfadf8f 100644 --- a/asm/rel/d/a/d_a_horse/d_a_horse/callHorseSubstance__9daHorse_cFPC4cXyz.s +++ b/asm/rel/d/a/d_a_horse/d_a_horse/callHorseSubstance__9daHorse_cFPC4cXyz.s @@ -12,8 +12,8 @@ lbl_808411D0: /* 808411F8 7C 9D 23 78 */ mr r29, r4 /* 808411FC 3C 60 80 84 */ lis r3, lit_3894@ha /* 0x808454AC@ha */ /* 80841200 3B E3 54 AC */ addi r31, r3, lit_3894@l /* 0x808454AC@l */ -/* 80841204 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80841208 8B 63 0D 64 */ lbz r27, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80841204 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80841208 8B 63 0D 64 */ lbz r27, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8084120C 7F 7B 07 74 */ extsb r27, r27 /* 80841210 80 1C 17 44 */ lwz r0, 0x1744(r28) /* 80841214 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 diff --git a/asm/rel/d/a/d_a_horse/d_a_horse/checkEnding__9daHorse_cFv.s b/asm/rel/d/a/d_a_horse/d_a_horse/checkEnding__9daHorse_cFv.s index c2d518f4db..6a1854e4f0 100644 --- a/asm/rel/d/a/d_a_horse/d_a_horse/checkEnding__9daHorse_cFv.s +++ b/asm/rel/d/a/d_a_horse/d_a_horse/checkEnding__9daHorse_cFv.s @@ -24,8 +24,8 @@ lbl_80839444: /* 80839460 4B 7F 35 1D */ bl getLayerNo__14dComIfG_play_cFi /* 80839464 2C 03 00 0C */ cmpwi r3, 0xc /* 80839468 40 82 00 18 */ bne lbl_80839480 -/* 8083946C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80839470 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8083946C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80839470 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80839474 2C 00 00 01 */ cmpwi r0, 1 /* 80839478 40 82 00 08 */ bne lbl_80839480 lbl_8083947C: diff --git a/asm/rel/d/a/d_a_horse/d_a_horse/setRoomInfo__9daHorse_cFi.s b/asm/rel/d/a/d_a_horse/d_a_horse/setRoomInfo__9daHorse_cFi.s index 53e7f18606..30a4e3652e 100644 --- a/asm/rel/d/a/d_a_horse/d_a_horse/setRoomInfo__9daHorse_cFi.s +++ b/asm/rel/d/a/d_a_horse/d_a_horse/setRoomInfo__9daHorse_cFi.s @@ -98,8 +98,8 @@ lbl_8083D8CC: /* 8083D8D4 7C 00 07 74 */ extsb r0, r0 /* 8083D8D8 2C 00 FF FF */ cmpwi r0, -1 /* 8083D8DC 40 82 00 10 */ bne lbl_8083D8EC -/* 8083D8E0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8083D8E4 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8083D8E0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8083D8E4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8083D8E8 98 1D 04 8C */ stb r0, 0x48c(r29) lbl_8083D8EC: /* 8083D8EC 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/rel/d/a/d_a_kago/d_a_kago/executeBalloonMenu__8daKago_cFv.s b/asm/rel/d/a/d_a_kago/d_a_kago/executeBalloonMenu__8daKago_cFv.s index 6692e90110..594ded7462 100644 --- a/asm/rel/d/a/d_a_kago/d_a_kago/executeBalloonMenu__8daKago_cFv.s +++ b/asm/rel/d/a/d_a_kago/d_a_kago/executeBalloonMenu__8daKago_cFv.s @@ -105,8 +105,8 @@ lbl_80849AF0: /* 80849AFC 40 82 00 64 */ bne lbl_80849B60 /* 80849B00 38 00 00 03 */ li r0, 3 /* 80849B04 98 1F 06 EB */ stb r0, 0x6eb(r31) -/* 80849B08 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80849B0C 8B E3 0D 64 */ lbz r31, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80849B08 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80849B0C 8B E3 0D 64 */ lbz r31, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80849B10 7F FF 07 74 */ extsb r31, r31 /* 80849B14 38 60 00 00 */ li r3, 0 /* 80849B18 4B 7E 2E 65 */ bl getLayerNo__14dComIfG_play_cFi diff --git a/asm/rel/d/a/d_a_midna/d_a_midna/setRoomInfo__9daMidna_cFv.s b/asm/rel/d/a/d_a_midna/d_a_midna/setRoomInfo__9daMidna_cFv.s index 4e4e2708a3..1d9d6d594c 100644 --- a/asm/rel/d/a/d_a_midna/d_a_midna/setRoomInfo__9daMidna_cFv.s +++ b/asm/rel/d/a/d_a_midna/d_a_midna/setRoomInfo__9daMidna_cFv.s @@ -25,8 +25,8 @@ lbl_804BED1C: /* 804BED78 98 7C 04 8D */ stb r3, 0x48d(r28) /* 804BED7C 48 00 00 10 */ b lbl_804BED8C lbl_804BED80: -/* 804BED80 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804BED84 8B A3 0D 64 */ lbz r29, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804BED80 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804BED84 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804BED88 7F BD 07 74 */ extsb r29, r29 lbl_804BED8C: /* 804BED8C 9B BC 04 8C */ stb r29, 0x48c(r28) diff --git a/asm/rel/d/a/d_a_movie_player/d_a_movie_player/isFade__13mDoGph_gInf_cFv.s b/asm/rel/d/a/d_a_movie_player/d_a_movie_player/isFade__13mDoGph_gInf_cFv.s index 4eb1c2a0a0..ea6d8de29e 100644 --- a/asm/rel/d/a/d_a_movie_player/d_a_movie_player/isFade__13mDoGph_gInf_cFv.s +++ b/asm/rel/d/a/d_a_movie_player/d_a_movie_player/isFade__13mDoGph_gInf_cFv.s @@ -1,5 +1,5 @@ lbl_80878558: -/* 80878558 3C 60 80 45 */ lis r3, struct_80450BE4+0x2@ha /* 0x80450BE6@ha */ -/* 8087855C 38 63 0B E6 */ addi r3, r3, struct_80450BE4+0x2@l /* 0x80450BE6@l */ +/* 80878558 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x2@ha /* 0x80450BE6@ha */ +/* 8087855C 38 63 0B E6 */ addi r3, r3, mBlureFlag__13mDoGph_gInf_c+0x2@l /* 0x80450BE6@l */ /* 80878560 88 63 00 00 */ lbz r3, 0(r3) /* 80878564 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/d_a_nbomb/d_a_nbomb/setRoomInfo__9daNbomb_cFv.s b/asm/rel/d/a/d_a_nbomb/d_a_nbomb/setRoomInfo__9daNbomb_cFv.s index 3efd71b7fb..1560e3d715 100644 --- a/asm/rel/d/a/d_a_nbomb/d_a_nbomb/setRoomInfo__9daNbomb_cFv.s +++ b/asm/rel/d/a/d_a_nbomb/d_a_nbomb/setRoomInfo__9daNbomb_cFv.s @@ -27,8 +27,8 @@ lbl_804C8430: /* 804C8494 90 1D 0B B4 */ stw r0, 0xbb4(r29) /* 804C8498 48 00 00 10 */ b lbl_804C84A8 lbl_804C849C: -/* 804C849C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804C84A0 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804C849C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804C84A0 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804C84A4 7F DE 07 74 */ extsb r30, r30 lbl_804C84A8: /* 804C84A8 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/d_a_spinner/d_a_spinner/execute__11daSpinner_cFv.s b/asm/rel/d/a/d_a_spinner/d_a_spinner/execute__11daSpinner_cFv.s index f4d1e1e89c..bdde71645c 100644 --- a/asm/rel/d/a/d_a_spinner/d_a_spinner/execute__11daSpinner_cFv.s +++ b/asm/rel/d/a/d_a_spinner/d_a_spinner/execute__11daSpinner_cFv.s @@ -71,16 +71,16 @@ lbl_804D4060: /* 804D4090 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 804D4094 41 82 00 4C */ beq lbl_804D40E0 /* 804D4098 38 60 00 06 */ li r3, 6 -/* 804D409C 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804D40A0 38 84 0D 64 */ addi r4, r4, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 804D409C 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804D40A0 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 804D40A4 88 84 00 00 */ lbz r4, 0(r4) /* 804D40A8 7C 84 07 74 */ extsb r4, r4 /* 804D40AC 4B B5 99 85 */ bl dComIfGs_isZoneSwitch__Fii /* 804D40B0 2C 03 00 00 */ cmpwi r3, 0 /* 804D40B4 41 82 00 2C */ beq lbl_804D40E0 /* 804D40B8 38 60 00 07 */ li r3, 7 -/* 804D40BC 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804D40C0 38 84 0D 64 */ addi r4, r4, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 804D40BC 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804D40C0 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 804D40C4 88 84 00 00 */ lbz r4, 0(r4) /* 804D40C8 7C 84 07 74 */ extsb r4, r4 /* 804D40CC 4B B5 99 65 */ bl dComIfGs_isZoneSwitch__Fii diff --git a/asm/rel/d/a/d_a_spinner/d_a_spinner/setRoomInfo__11daSpinner_cFv.s b/asm/rel/d/a/d_a_spinner/d_a_spinner/setRoomInfo__11daSpinner_cFv.s index 433a93950c..c9e1f687a3 100644 --- a/asm/rel/d/a/d_a_spinner/d_a_spinner/setRoomInfo__11daSpinner_cFv.s +++ b/asm/rel/d/a/d_a_spinner/d_a_spinner/setRoomInfo__11daSpinner_cFv.s @@ -23,8 +23,8 @@ lbl_804D21E0: /* 804D2234 98 7D 04 8D */ stb r3, 0x48d(r29) /* 804D2238 48 00 00 10 */ b lbl_804D2248 lbl_804D223C: -/* 804D223C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804D2240 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804D223C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804D2240 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804D2244 7F DE 07 74 */ extsb r30, r30 lbl_804D2248: /* 804D2248 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s b/asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s index 85d766deef..6ac63d7562 100644 --- a/asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s +++ b/asm/rel/d/a/d_a_vrbox/d_a_vrbox/daVrbox_Draw__FP11vrbox_class.s @@ -19,8 +19,8 @@ lbl_80498518: /* 8049855C 38 60 00 01 */ li r3, 1 /* 80498560 48 00 01 38 */ b lbl_80498698 lbl_80498564: -/* 80498564 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80498568 88 83 0D 64 */ lbz r4, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80498564 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80498568 88 83 0D 64 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8049856C 7C 84 07 75 */ extsb. r4, r4 /* 80498570 41 80 00 28 */ blt lbl_80498598 /* 80498574 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Draw__FP12vrbox2_class.s b/asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Draw__FP12vrbox2_class.s index a0d648e51a..6b5ad69b7e 100644 --- a/asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Draw__FP12vrbox2_class.s +++ b/asm/rel/d/a/d_a_vrbox2/d_a_vrbox2/daVrbox2_Draw__FP12vrbox2_class.s @@ -120,8 +120,8 @@ lbl_80498C68: /* 80498C7C 4B B7 4A 5D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef /* 80498C80 7F A3 EB 78 */ mr r3, r29 /* 80498C84 48 00 04 59 */ bl daVrbox2_color_set__FP12vrbox2_class -/* 80498C88 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80498C8C 88 83 0D 64 */ lbz r4, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80498C88 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80498C8C 88 83 0D 64 */ lbz r4, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80498C90 7C 84 07 75 */ extsb. r4, r4 /* 80498C94 41 80 00 28 */ blt lbl_80498CBC /* 80498C98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ diff --git a/asm/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s index a719091f95..41b7e203d2 100644 --- a/asm/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s +++ b/asm/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1/checkFront__11daBdoorL1_cFv.s @@ -11,15 +11,15 @@ lbl_804E432C: /* 804E4350 4B E8 46 45 */ bl strcmp /* 804E4354 2C 03 00 00 */ cmpwi r3, 0 /* 804E4358 40 82 00 1C */ bne lbl_804E4374 -/* 804E435C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804E4360 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804E435C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804E4360 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804E4364 2C 00 00 0A */ cmpwi r0, 0xa /* 804E4368 40 82 00 24 */ bne lbl_804E438C /* 804E436C 38 60 00 00 */ li r3, 0 /* 804E4370 48 00 00 20 */ b lbl_804E4390 lbl_804E4374: -/* 804E4374 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804E4378 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804E4374 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804E4378 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804E437C 2C 00 00 32 */ cmpwi r0, 0x32 /* 804E4380 40 82 00 0C */ bne lbl_804E438C /* 804E4384 38 60 00 00 */ li r3, 0 diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateInit__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateInit__12daMBdoorL1_cFv.s index 1fbe7e1dd8..2608f3520e 100644 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateInit__12daMBdoorL1_cFv.s +++ b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/CreateInit__12daMBdoorL1_cFv.s @@ -165,8 +165,8 @@ lbl_80673AF0: /* 80673B40 7F C4 F3 78 */ mr r4, r30 /* 80673B44 4B FF ED 71 */ bl calcMtx__13dDoor_stop2_cFP10fopAc_ac_c lbl_80673B48: -/* 80673B48 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80673B4C 8B 63 0D 64 */ lbz r27, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80673B48 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80673B4C 8B 63 0D 64 */ lbz r27, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80673B50 7F 7B 07 74 */ extsb r27, r27 /* 80673B54 7F C3 F3 78 */ mr r3, r30 /* 80673B58 4B 9C 66 61 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c diff --git a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s index d9f57dd883..b945856c24 100644 --- a/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s +++ b/asm/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1/checkMBossRoom__12daMBdoorL1_cFv.s @@ -1,6 +1,6 @@ lbl_806769A4: -/* 806769A4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 806769A8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 806769A4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 806769A8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 806769AC 7C 00 07 74 */ extsb r0, r0 /* 806769B0 2C 00 00 33 */ cmpwi r0, 0x33 /* 806769B4 41 82 00 0C */ beq lbl_806769C0 diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s index 771c23573f..7f5e447b2a 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/checkExecute__10daDoor20_cFv.s @@ -23,8 +23,8 @@ lbl_80464E5C: lbl_80464E64: /* 80464E64 88 1F 06 7D */ lbz r0, 0x67d(r31) /* 80464E68 7C 04 07 74 */ extsb r4, r0 -/* 80464E6C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464E70 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80464E6C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464E70 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80464E74 7C 00 07 74 */ extsb r0, r0 /* 80464E78 7C 04 00 00 */ cmpw r4, r0 /* 80464E7C 41 82 00 0C */ beq lbl_80464E88 diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s index 6245446edd..9264b2c060 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/closeInit_0__10daDoor20_cFv.s @@ -163,8 +163,8 @@ lbl_804625F8: /* 80462604 41 82 00 50 */ beq lbl_80462654 /* 80462608 38 80 00 00 */ li r4, 0 /* 8046260C 90 81 00 08 */ stw r4, 8(r1) -/* 80462610 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80462614 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80462610 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80462614 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80462618 7C 00 07 74 */ extsb r0, r0 /* 8046261C 90 01 00 0C */ stw r0, 0xc(r1) /* 80462620 90 81 00 10 */ stw r4, 0x10(r1) diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s index 33a0e231c9..980a66f83e 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/demoProc__10daDoor20_cFv.s @@ -513,8 +513,8 @@ lbl_80463734: lbl_80463744: /* 80463744 80 7F 05 C4 */ lwz r3, 0x5c4(r31) /* 80463748 4B C1 82 79 */ bl Move__4dBgWFv -/* 8046374C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80463750 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046374C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80463750 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80463754 98 1F 05 C8 */ stb r0, 0x5c8(r31) /* 80463758 7F A3 EB 78 */ mr r3, r29 /* 8046375C 80 9F 06 CC */ lwz r4, 0x6cc(r31) diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s index 53a1b69b45..f8f1e53956 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/drawCheck__10daDoor20_cFi.s @@ -26,8 +26,8 @@ lbl_80464D2C: /* 80464D48 4B BD 54 59 */ bl getFrontOption__13door_param2_cFP10fopAc_ac_c /* 80464D4C 7F 83 E3 78 */ mr r3, r28 /* 80464D50 4B BD 54 5D */ bl getBackOption__13door_param2_cFP10fopAc_ac_c -/* 80464D54 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464D58 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80464D54 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464D58 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80464D5C 7C 00 07 74 */ extsb r0, r0 /* 80464D60 7C 1E 00 00 */ cmpw r30, r0 /* 80464D64 41 82 00 0C */ beq lbl_80464D70 diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s index 63c8bd643c..75eb1f93ab 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/draw__10daDoor20_cFv.s @@ -62,15 +62,15 @@ lbl_8046447C: /* 8046448C 41 82 00 34 */ beq lbl_804644C0 /* 80464490 88 1E 05 C8 */ lbz r0, 0x5c8(r30) /* 80464494 7C 04 07 74 */ extsb r4, r0 -/* 80464498 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046449C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80464498 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046449C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804644A0 7C 00 07 74 */ extsb r0, r0 /* 804644A4 7C 04 00 00 */ cmpw r4, r0 /* 804644A8 41 82 00 18 */ beq lbl_804644C0 /* 804644AC 80 7E 05 C4 */ lwz r3, 0x5c4(r30) /* 804644B0 4B C1 75 11 */ bl Move__4dBgWFv -/* 804644B4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804644B8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804644B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804644B8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804644BC 98 1E 05 C8 */ stb r0, 0x5c8(r30) lbl_804644C0: /* 804644C0 3C 60 80 43 */ lis r3, g_env_light@ha /* 0x8042CA54@ha */ diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s index 1cec46db48..9a364968c7 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/execute__10daDoor20_cFv.s @@ -57,8 +57,8 @@ lbl_804642F0: /* 804642F8 7F E3 FB 78 */ mr r3, r31 /* 804642FC 4B FF EC E5 */ bl demoProc__10daDoor20_cFv lbl_80464300: -/* 80464300 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464304 8C 03 0D 64 */ lbzu r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80464300 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464304 8C 03 0D 64 */ lbzu r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80464308 98 1F 06 7D */ stb r0, 0x67d(r31) /* 8046430C 8B C3 00 00 */ lbz r30, 0(r3) /* 80464310 7F DE 07 74 */ extsb r30, r30 diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s index 7880ea1fb1..6c41366bf2 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/frontCheck__10daDoor20_cFv.s @@ -5,8 +5,8 @@ lbl_80464C68: /* 80464C74 39 61 00 20 */ addi r11, r1, 0x20 /* 80464C78 4B EF D5 65 */ bl _savegpr_29 /* 80464C7C 7C 7D 1B 78 */ mr r29, r3 -/* 80464C80 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464C84 8B E4 0D 64 */ lbz r31, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 80464C80 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464C84 8B E4 0D 64 */ lbz r31, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 80464C88 7F FF 07 74 */ extsb r31, r31 /* 80464C8C 4B BD 55 2D */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c /* 80464C90 54 7E 06 3E */ clrlwi r30, r3, 0x18 diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s index 7c9f7b8d10..51ff40c93c 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setDoorAngleSpec__10daDoor20_cFv.s @@ -65,8 +65,8 @@ lbl_80464724: /* 80464728 B0 1F 06 70 */ sth r0, 0x670(r31) /* 8046472C 48 00 00 78 */ b lbl_804647A4 lbl_80464730: -/* 80464730 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464734 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80464730 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464734 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80464738 7F DE 07 74 */ extsb r30, r30 /* 8046473C 7F E3 FB 78 */ mr r3, r31 /* 80464740 4B BD 5A 79 */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c @@ -82,8 +82,8 @@ lbl_80464760: /* 80464764 B0 1F 06 70 */ sth r0, 0x670(r31) /* 80464768 48 00 00 3C */ b lbl_804647A4 lbl_8046476C: -/* 8046476C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80464770 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046476C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80464770 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80464774 7F DE 07 74 */ extsb r30, r30 /* 80464778 7F E3 FB 78 */ mr r3, r31 /* 8046477C 4B BD 5A 3D */ bl getFRoomNo__13door_param2_cFP10fopAc_ac_c diff --git a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s index ee484d3188..b60f2b5d4c 100644 --- a/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s +++ b/asm/rel/d/a/door/d_a_door_shutter/d_a_door_shutter/setEventPrm__10daDoor20_cFv.s @@ -19,8 +19,8 @@ lbl_8046129C: /* 804612E0 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 804612E4 3C 60 80 3F */ lis r3, mStatus__20dStage_roomControl_c@ha /* 0x803F6094@ha */ /* 804612E8 38 83 60 94 */ addi r4, r3, mStatus__20dStage_roomControl_c@l /* 0x803F6094@l */ -/* 804612EC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804612F0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804612EC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804612F0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804612F4 7C 00 07 74 */ extsb r0, r0 /* 804612F8 7C 1C 00 00 */ cmpw r28, r0 /* 804612FC 7F 80 E3 78 */ mr r0, r28 diff --git a/asm/rel/d/a/e/d_a_e_ai/d_a_e_ai/damage_check__10e_ai_classFv.s b/asm/rel/d/a/e/d_a_e_ai/d_a_e_ai/damage_check__10e_ai_classFv.s index aa6f7c22b4..902843673c 100644 --- a/asm/rel/d/a/e/d_a_e_ai/d_a_e_ai/damage_check__10e_ai_classFv.s +++ b/asm/rel/d/a/e/d_a_e_ai/d_a_e_ai/damage_check__10e_ai_classFv.s @@ -216,8 +216,8 @@ lbl_806798E8: /* 806799BC 38 00 00 03 */ li r0, 3 /* 806799C0 98 1D 0D 29 */ stb r0, 0xd29(r29) /* 806799C4 38 00 00 05 */ li r0, 5 -/* 806799C8 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806799CC 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806799C8 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806799CC 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 806799D0 38 00 00 00 */ li r0, 0 /* 806799D4 B0 1D 06 B4 */ sth r0, 0x6b4(r29) /* 806799D8 48 00 03 B0 */ b lbl_80679D88 @@ -387,8 +387,8 @@ lbl_80679C4C: /* 80679C54 38 00 00 14 */ li r0, 0x14 /* 80679C58 B0 1D 06 BC */ sth r0, 0x6bc(r29) lbl_80679C5C: -/* 80679C5C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80679C60 9B 63 11 25 */ stb r27, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80679C5C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80679C60 9B 63 11 25 */ stb r27, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80679C64 48 00 01 24 */ b lbl_80679D88 lbl_80679C68: /* 80679C68 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a diff --git a/asm/rel/d/a/e/d_a_e_ba/d_a_e_ba/damage_check__FP10e_ba_class.s b/asm/rel/d/a/e/d_a_e_ba/d_a_e_ba/damage_check__FP10e_ba_class.s index 601e4a14e6..3c9486243b 100644 --- a/asm/rel/d/a/e/d_a_e_ba/d_a_e_ba/damage_check__FP10e_ba_class.s +++ b/asm/rel/d/a/e/d_a_e_ba/d_a_e_ba/damage_check__FP10e_ba_class.s @@ -93,8 +93,8 @@ lbl_8067F1D0: /* 8067F208 B0 9E 06 74 */ sth r4, 0x674(r30) /* 8067F20C 38 00 00 C8 */ li r0, 0xc8 /* 8067F210 B0 1E 06 AE */ sth r0, 0x6ae(r30) -/* 8067F214 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8067F218 98 83 11 25 */ stb r4, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8067F214 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8067F218 98 83 11 25 */ stb r4, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8067F21C 3C 60 00 07 */ lis r3, 0x0007 /* 0x000701C3@ha */ /* 8067F220 38 03 01 C3 */ addi r0, r3, 0x01C3 /* 0x000701C3@l */ /* 8067F224 90 01 00 0C */ stw r0, 0xc(r1) diff --git a/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/damage_check__8daE_BG_cFv.s b/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/damage_check__8daE_BG_cFv.s index ad7eaa8a46..9ff8311a84 100644 --- a/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/damage_check__8daE_BG_cFv.s +++ b/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/damage_check__8daE_BG_cFv.s @@ -69,8 +69,8 @@ lbl_80685D18: /* 80685D28 98 1F 06 8E */ stb r0, 0x68e(r31) lbl_80685D2C: /* 80685D2C 38 00 00 00 */ li r0, 0 -/* 80685D30 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80685D34 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80685D30 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80685D34 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80685D38 38 7F 09 08 */ addi r3, r31, 0x908 /* 80685D3C 81 9F 09 44 */ lwz r12, 0x944(r31) /* 80685D40 81 8C 00 24 */ lwz r12, 0x24(r12) diff --git a/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/setSparkEffect__8daE_BG_cFv.s b/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/setSparkEffect__8daE_BG_cFv.s index ad7fcbc25b..4a309d5d82 100644 --- a/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/setSparkEffect__8daE_BG_cFv.s +++ b/asm/rel/d/a/e/d_a_e_bg/d_a_e_bg/setSparkEffect__8daE_BG_cFv.s @@ -64,8 +64,8 @@ lbl_80685E98: /* 80685EAC 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008000A@ha */ /* 80685EB0 38 03 00 0A */ addi r0, r3, 0x000A /* 0x0008000A@l */ /* 80685EB4 90 01 00 20 */ stw r0, 0x20(r1) -/* 80685EB8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80685EBC 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80685EB8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80685EBC 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80685EC0 88 63 00 00 */ lbz r3, 0(r3) /* 80685EC4 7C 63 07 74 */ extsb r3, r3 /* 80685EC8 4B 9A 71 A5 */ bl dComIfGp_getReverb__Fi diff --git a/asm/rel/d/a/e/d_a_e_dn/d_a_e_dn/daE_DN_Execute__FP10e_dn_class.s b/asm/rel/d/a/e/d_a_e_dn/d_a_e_dn/daE_DN_Execute__FP10e_dn_class.s index 7f53138b2a..4b66d3d057 100644 --- a/asm/rel/d/a/e/d_a_e_dn/d_a_e_dn/daE_DN_Execute__FP10e_dn_class.s +++ b/asm/rel/d/a/e/d_a_e_dn/d_a_e_dn/daE_DN_Execute__FP10e_dn_class.s @@ -686,8 +686,8 @@ lbl_804ED4B4: /* 804ED56C 3C 60 80 4F */ lis r3, l_HIO@ha /* 0x804EEF3C@ha */ /* 804ED570 38 63 EF 3C */ addi r3, r3, l_HIO@l /* 0x804EEF3C@l */ /* 804ED574 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 804ED578 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 804ED57C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 804ED578 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 804ED57C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 804ED580 38 00 00 0A */ li r0, 0xa /* 804ED584 B0 1F 06 EC */ sth r0, 0x6ec(r31) /* 804ED588 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ diff --git a/asm/rel/d/a/e/d_a_e_dt/d_a_e_dt/draw__8daE_DT_cFv.s b/asm/rel/d/a/e/d_a_e_dt/d_a_e_dt/draw__8daE_DT_cFv.s index 76db501423..2ecd068f57 100644 --- a/asm/rel/d/a/e/d_a_e_dt/d_a_e_dt/draw__8daE_DT_cFv.s +++ b/asm/rel/d/a/e/d_a_e_dt/d_a_e_dt/draw__8daE_DT_cFv.s @@ -495,16 +495,16 @@ lbl_806AE4F0: /* 806AE500 FC 00 00 1E */ fctiwz f0, f0 /* 806AE504 D8 01 00 60 */ stfd f0, 0x60(r1) /* 806AE508 80 01 00 64 */ lwz r0, 0x64(r1) -/* 806AE50C 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 806AE510 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 806AE50C 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 806AE510 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 806AE514 4B 95 9B 65 */ bl onBlure__13mDoGph_gInf_cFv /* 806AE518 48 00 00 18 */ b lbl_806AE530 lbl_806AE51C: /* 806AE51C 28 00 00 02 */ cmplwi r0, 2 /* 806AE520 40 82 00 10 */ bne lbl_806AE530 /* 806AE524 38 00 00 00 */ li r0, 0 -/* 806AE528 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 806AE52C 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 806AE528 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 806AE52C 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_806AE530: /* 806AE530 38 60 00 01 */ li r3, 1 lbl_806AE534: diff --git a/asm/rel/d/a/e/d_a_e_gm/d_a_e_gm/damage_check__8daE_GM_cFv.s b/asm/rel/d/a/e/d_a_e_gm/d_a_e_gm/damage_check__8daE_GM_cFv.s index eae9680383..8b80c8455b 100644 --- a/asm/rel/d/a/e/d_a_e_gm/d_a_e_gm/damage_check__8daE_GM_cFv.s +++ b/asm/rel/d/a/e/d_a_e_gm/d_a_e_gm/damage_check__8daE_GM_cFv.s @@ -64,8 +64,8 @@ lbl_806D63EC: /* 806D63FC 98 1E 0A 72 */ stb r0, 0xa72(r30) lbl_806D6400: /* 806D6400 38 00 00 00 */ li r0, 0 -/* 806D6404 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806D6408 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806D6404 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806D6408 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 806D640C 88 1E 0A 6F */ lbz r0, 0xa6f(r30) /* 806D6410 28 00 00 03 */ cmplwi r0, 3 /* 806D6414 40 82 00 EC */ bne lbl_806D6500 diff --git a/asm/rel/d/a/e/d_a_e_hb/d_a_e_hb/damage_check__FP10e_hb_class.s b/asm/rel/d/a/e/d_a_e_hb/d_a_e_hb/damage_check__FP10e_hb_class.s index 85e90a4228..3bde61cc73 100644 --- a/asm/rel/d/a/e/d_a_e_hb/d_a_e_hb/damage_check__FP10e_hb_class.s +++ b/asm/rel/d/a/e/d_a_e_hb/d_a_e_hb/damage_check__FP10e_hb_class.s @@ -256,8 +256,8 @@ lbl_804FC41C: /* 804FC4D8 2C 00 00 01 */ cmpwi r0, 1 /* 804FC4DC 40 82 00 10 */ bne lbl_804FC4EC /* 804FC4E0 38 00 00 04 */ li r0, 4 -/* 804FC4E4 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 804FC4E8 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 804FC4E4 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 804FC4E8 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_804FC4EC: /* 804FC4EC 39 61 00 70 */ addi r11, r1, 0x70 /* 804FC4F0 4B E6 5D 29 */ bl _restgpr_25 diff --git a/asm/rel/d/a/e/d_a_e_hm/d_a_e_hm/At_Check__8daE_HM_cFv.s b/asm/rel/d/a/e/d_a_e_hm/d_a_e_hm/At_Check__8daE_HM_cFv.s index e975214af6..f751f1e3f5 100644 --- a/asm/rel/d/a/e/d_a_e_hm/d_a_e_hm/At_Check__8daE_HM_cFv.s +++ b/asm/rel/d/a/e/d_a_e_hm/d_a_e_hm/At_Check__8daE_HM_cFv.s @@ -90,8 +90,8 @@ lbl_806E39B4: /* 806E39C0 41 82 00 08 */ beq lbl_806E39C8 /* 806E39C4 3B E0 00 04 */ li r31, 4 lbl_806E39C8: -/* 806E39C8 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806E39CC 9B E3 11 25 */ stb r31, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806E39C8 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806E39CC 9B E3 11 25 */ stb r31, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_806E39D0: /* 806E39D0 39 61 00 20 */ addi r11, r1, 0x20 /* 806E39D4 4B C7 E8 51 */ bl _restgpr_28 diff --git a/asm/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda/daE_HZELDA_Execute__FP14e_hzelda_class.s b/asm/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda/daE_HZELDA_Execute__FP14e_hzelda_class.s index 29135ace53..2dbf351b46 100644 --- a/asm/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda/daE_HZELDA_Execute__FP14e_hzelda_class.s +++ b/asm/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda/daE_HZELDA_Execute__FP14e_hzelda_class.s @@ -520,8 +520,8 @@ lbl_806F3C88: /* 806F3D6C C0 3E 00 A0 */ lfs f1, 0xa0(r30) /* 806F3D70 4B FF E2 35 */ bl ball_crash_eff_set__FP14e_hzelda_classf /* 806F3D74 38 00 00 02 */ li r0, 2 -/* 806F3D78 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806F3D7C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806F3D78 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806F3D7C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 806F3D80 C0 21 00 B4 */ lfs f1, 0xb4(r1) /* 806F3D84 C0 1E 01 1C */ lfs f0, 0x11c(r30) /* 806F3D88 EC 01 00 2A */ fadds f0, f1, f0 @@ -645,8 +645,8 @@ lbl_806F3EA0: /* 806F3F40 C0 3E 00 A0 */ lfs f1, 0xa0(r30) /* 806F3F44 4B FF E0 61 */ bl ball_crash_eff_set__FP14e_hzelda_classf /* 806F3F48 38 00 00 02 */ li r0, 2 -/* 806F3F4C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806F3F50 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806F3F4C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806F3F50 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 806F3F54 C0 21 00 B4 */ lfs f1, 0xb4(r1) /* 806F3F58 C0 1E 01 1C */ lfs f0, 0x11c(r30) /* 806F3F5C EC 01 00 2A */ fadds f0, f1, f0 diff --git a/asm/rel/d/a/e/d_a_e_kk/d_a_e_kk/damage_check__8daE_KK_cFv.s b/asm/rel/d/a/e/d_a_e_kk/d_a_e_kk/damage_check__8daE_KK_cFv.s index f69d4bcbaa..fc25f18a00 100644 --- a/asm/rel/d/a/e/d_a_e_kk/d_a_e_kk/damage_check__8daE_KK_cFv.s +++ b/asm/rel/d/a/e/d_a_e_kk/d_a_e_kk/damage_check__8daE_KK_cFv.s @@ -255,8 +255,8 @@ lbl_806FB044: /* 806FB050 38 00 00 00 */ li r0, 0 /* 806FB054 B0 1E 05 62 */ sth r0, 0x562(r30) /* 806FB058 38 00 00 05 */ li r0, 5 -/* 806FB05C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 806FB060 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 806FB05C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 806FB060 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 806FB064 38 7E 05 BC */ addi r3, r30, 0x5bc /* 806FB068 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040006@ha */ /* 806FB06C 38 84 00 06 */ addi r4, r4, 0x0006 /* 0x00040006@l */ diff --git a/asm/rel/d/a/e/d_a_e_mf/d_a_e_mf/daE_MF_Execute__FP10e_mf_class.s b/asm/rel/d/a/e/d_a_e_mf/d_a_e_mf/daE_MF_Execute__FP10e_mf_class.s index d6b6823d3f..a549bea1d1 100644 --- a/asm/rel/d/a/e/d_a_e_mf/d_a_e_mf/daE_MF_Execute__FP10e_mf_class.s +++ b/asm/rel/d/a/e/d_a_e_mf/d_a_e_mf/daE_MF_Execute__FP10e_mf_class.s @@ -648,8 +648,8 @@ lbl_80712584: /* 80712648 3C 60 80 71 */ lis r3, l_HIO@ha /* 0x80713F74@ha */ /* 8071264C 38 63 3F 74 */ addi r3, r3, l_HIO@l /* 0x80713F74@l */ /* 80712650 A8 03 00 1C */ lha r0, 0x1c(r3) -/* 80712654 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80712658 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80712654 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80712658 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8071265C 38 00 00 0A */ li r0, 0xa /* 80712660 B0 1F 06 CC */ sth r0, 0x6cc(r31) /* 80712664 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ diff --git a/asm/rel/d/a/e/d_a_e_mk/d_a_e_mk/damage_check__FP10e_mk_class.s b/asm/rel/d/a/e/d_a_e_mk/d_a_e_mk/damage_check__FP10e_mk_class.s index 9f16347377..80e71ea657 100644 --- a/asm/rel/d/a/e/d_a_e_mk/d_a_e_mk/damage_check__FP10e_mk_class.s +++ b/asm/rel/d/a/e/d_a_e_mk/d_a_e_mk/damage_check__FP10e_mk_class.s @@ -66,8 +66,8 @@ lbl_80716288: /* 807162F0 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 807162F4 4B B9 95 91 */ bl subBgmStop__8Z2SeqMgrFv /* 807162F8 38 00 00 00 */ li r0, 0 -/* 807162FC 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80716300 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807162FC 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80716300 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80716304 48 00 00 44 */ b lbl_80716348 lbl_80716308: /* 80716308 38 00 00 0A */ li r0, 0xa diff --git a/asm/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt/action__FP13e_mm_mt_class.s b/asm/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt/action__FP13e_mm_mt_class.s index 5ec95a3ef6..5910ca02f6 100644 --- a/asm/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt/action__FP13e_mm_mt_class.s +++ b/asm/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt/action__FP13e_mm_mt_class.s @@ -342,8 +342,8 @@ lbl_80724678: /* 80724694 2C 03 00 00 */ cmpwi r3, 0 /* 80724698 40 82 00 10 */ bne lbl_807246A8 /* 8072469C 38 00 00 05 */ li r0, 5 -/* 807246A0 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807246A4 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807246A0 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807246A4 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_807246A8: /* 807246A8 80 1E 09 9C */ lwz r0, 0x99c(r30) /* 807246AC 60 00 00 01 */ ori r0, r0, 1 @@ -400,8 +400,8 @@ lbl_8072474C: /* 80724768 2C 03 00 00 */ cmpwi r3, 0 /* 8072476C 40 82 00 10 */ bne lbl_8072477C /* 80724770 38 00 00 02 */ li r0, 2 -/* 80724774 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80724778 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80724774 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80724778 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8072477C: /* 8072477C 88 1D 0B 99 */ lbz r0, 0xb99(r29) /* 80724780 60 00 00 08 */ ori r0, r0, 8 diff --git a/asm/rel/d/a/e/d_a_e_ms/d_a_e_ms/damage_check__FP10e_ms_class.s b/asm/rel/d/a/e/d_a_e_ms/d_a_e_ms/damage_check__FP10e_ms_class.s index d5a8c83147..4a9553ba5a 100644 --- a/asm/rel/d/a/e/d_a_e_ms/d_a_e_ms/damage_check__FP10e_ms_class.s +++ b/asm/rel/d/a/e/d_a_e_ms/d_a_e_ms/damage_check__FP10e_ms_class.s @@ -63,8 +63,8 @@ lbl_80727938: /* 80727978 B0 9F 05 B4 */ sth r4, 0x5b4(r31) /* 8072797C 38 00 00 C8 */ li r0, 0xc8 /* 80727980 B0 1F 06 8E */ sth r0, 0x68e(r31) -/* 80727984 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80727988 98 83 11 25 */ stb r4, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80727984 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80727988 98 83 11 25 */ stb r4, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8072798C 48 00 00 7C */ b lbl_80727A08 lbl_80727990: /* 80727990 38 00 00 04 */ li r0, 4 diff --git a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s index eb81560f15..c4d05c7c42 100644 --- a/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s +++ b/asm/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg/damage_check__11daE_OctBg_cFv.s @@ -98,8 +98,8 @@ lbl_80738F8C: /* 80738F9C 98 1E 0B AD */ stb r0, 0xbad(r30) lbl_80738FA0: /* 80738FA0 38 00 00 00 */ li r0, 0 -/* 80738FA4 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80738FA8 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80738FA4 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80738FA8 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80738FAC 38 7E 08 C0 */ addi r3, r30, 0x8c0 /* 80738FB0 81 9E 08 FC */ lwz r12, 0x8fc(r30) /* 80738FB4 81 8C 00 24 */ lwz r12, 0x24(r12) diff --git a/asm/rel/d/a/e/d_a_e_ot/d_a_e_ot/damage_check__8daE_OT_cFv.s b/asm/rel/d/a/e/d_a_e_ot/d_a_e_ot/damage_check__8daE_OT_cFv.s index e84d5f4787..8f8260c8c4 100644 --- a/asm/rel/d/a/e/d_a_e_ot/d_a_e_ot/damage_check__8daE_OT_cFv.s +++ b/asm/rel/d/a/e/d_a_e_ot/d_a_e_ot/damage_check__8daE_OT_cFv.s @@ -148,8 +148,8 @@ lbl_8073A700: /* 8073A728 38 9E 0B 5C */ addi r4, r30, 0xb5c /* 8073A72C 4B 94 D4 D9 */ bl cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo /* 8073A730 38 00 00 00 */ li r0, 0 -/* 8073A734 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8073A738 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8073A734 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8073A738 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8073A73C 80 7E 0B 5C */ lwz r3, 0xb5c(r30) /* 8073A740 80 63 00 10 */ lwz r3, 0x10(r3) /* 8073A744 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b diff --git a/asm/rel/d/a/e/d_a_e_pm/d_a_e_pm/At_Check__8daE_PM_cFv.s b/asm/rel/d/a/e/d_a_e_pm/d_a_e_pm/At_Check__8daE_PM_cFv.s index 945913e631..36b0cb1323 100644 --- a/asm/rel/d/a/e/d_a_e_pm/d_a_e_pm/At_Check__8daE_PM_cFv.s +++ b/asm/rel/d/a/e/d_a_e_pm/d_a_e_pm/At_Check__8daE_PM_cFv.s @@ -117,8 +117,8 @@ lbl_8074A3A8: /* 8074A3B4 41 82 00 08 */ beq lbl_8074A3BC /* 8074A3B8 3B E0 00 04 */ li r31, 4 lbl_8074A3BC: -/* 8074A3BC 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8074A3C0 9B E3 11 25 */ stb r31, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8074A3BC 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8074A3C0 9B E3 11 25 */ stb r31, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8074A3C4: /* 8074A3C4 39 61 00 20 */ addi r11, r1, 0x20 /* 8074A3C8 4B C1 7E 5D */ bl _restgpr_28 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/damage_check__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/damage_check__FP10e_po_class.s index 85e1a915ae..0201f6977a 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/damage_check__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/damage_check__FP10e_po_class.s @@ -156,8 +156,8 @@ lbl_8074E350: /* 8074E3B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8074E3B8 41 82 00 54 */ beq lbl_8074E40C /* 8074E3BC 38 00 00 00 */ li r0, 0 -/* 8074E3C0 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8074E3C4 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8074E3C0 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8074E3C4 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8074E3C8 38 DE 05 68 */ addi r6, r30, 0x568 /* 8074E3CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8074E3D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -206,8 +206,8 @@ lbl_8074E46C: /* 8074E474 38 00 00 03 */ li r0, 3 /* 8074E478 98 1E 0B 62 */ stb r0, 0xb62(r30) /* 8074E47C 38 00 00 05 */ li r0, 5 -/* 8074E480 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8074E484 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8074E480 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8074E484 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8074E488 C0 1F 00 74 */ lfs f0, 0x74(r31) /* 8074E48C D0 1E 05 2C */ stfs f0, 0x52c(r30) /* 8074E490 48 00 00 44 */ b lbl_8074E4D4 diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_dead__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_dead__FP10e_po_class.s index fb57f683ba..3fc5d28362 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_dead__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_dead__FP10e_po_class.s @@ -392,8 +392,8 @@ lbl_8074EFAC: /* 8074F034 38 00 00 03 */ li r0, 3 /* 8074F038 98 1F 0B 62 */ stb r0, 0xb62(r31) /* 8074F03C 38 00 00 05 */ li r0, 5 -/* 8074F040 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8074F044 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8074F040 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8074F044 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8074F048 80 1F 04 9C */ lwz r0, 0x49c(r31) /* 8074F04C 60 00 40 00 */ ori r0, r0, 0x4000 /* 8074F050 90 1F 04 9C */ stw r0, 0x49c(r31) diff --git a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s index 285aab8413..ac5d13e529 100644 --- a/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s +++ b/asm/rel/d/a/e/d_a_e_po/d_a_e_po/e_po_wolfbite__FP10e_po_class.s @@ -130,8 +130,8 @@ lbl_8074E86C: /* 8074E86C 38 00 00 03 */ li r0, 3 /* 8074E870 98 1E 0B 62 */ stb r0, 0xb62(r30) /* 8074E874 38 00 00 05 */ li r0, 5 -/* 8074E878 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8074E87C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8074E878 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8074E87C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8074E880 38 7E 05 F8 */ addi r3, r30, 0x5f8 /* 8074E884 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040003@ha */ /* 8074E888 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00040003@l */ diff --git a/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/daE_RD_Draw__FP10e_rd_class.s b/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/daE_RD_Draw__FP10e_rd_class.s index 3afae63d62..d5fbdd0065 100644 --- a/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/daE_RD_Draw__FP10e_rd_class.s +++ b/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/daE_RD_Draw__FP10e_rd_class.s @@ -313,14 +313,14 @@ lbl_80505954: /* 80505960 88 1B 13 04 */ lbz r0, 0x1304(r27) /* 80505964 28 00 00 02 */ cmplwi r0, 2 /* 80505968 40 81 00 14 */ ble lbl_8050597C -/* 8050596C 3C 60 80 45 */ lis r3, struct_80450BE4+0x1@ha /* 0x80450BE5@ha */ -/* 80505970 98 03 0B E5 */ stb r0, struct_80450BE4+0x1@l(r3) /* 0x80450BE5@l */ +/* 8050596C 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x1@ha /* 0x80450BE5@ha */ +/* 80505970 98 03 0B E5 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x1@l(r3) /* 0x80450BE5@l */ /* 80505974 4B B0 27 05 */ bl onBlure__13mDoGph_gInf_cFv /* 80505978 48 00 00 10 */ b lbl_80505988 lbl_8050597C: /* 8050597C 38 00 00 00 */ li r0, 0 -/* 80505980 3C 60 80 45 */ lis r3, struct_80450BE4+0x0@ha /* 0x80450BE4@ha */ -/* 80505984 98 03 0B E4 */ stb r0, struct_80450BE4+0x0@l(r3) /* 0x80450BE4@l */ +/* 80505980 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x0@ha /* 0x80450BE4@ha */ +/* 80505984 98 03 0B E4 */ stb r0, mBlureFlag__13mDoGph_gInf_c+0x0@l(r3) /* 0x80450BE4@l */ lbl_80505988: /* 80505988 38 60 00 01 */ li r3, 1 lbl_8050598C: diff --git a/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/damage_check__FP10e_rd_class.s b/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/damage_check__FP10e_rd_class.s index 6dd210c321..cc2a7dc289 100644 --- a/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/damage_check__FP10e_rd_class.s +++ b/asm/rel/d/a/e/d_a_e_rd/d_a_e_rd/damage_check__FP10e_rd_class.s @@ -140,8 +140,8 @@ lbl_8050F0C4: /* 8050F0C8 38 9C 12 38 */ addi r4, r28, 0x1238 /* 8050F0CC 4B B7 8B 39 */ bl cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo /* 8050F0D0 38 00 00 00 */ li r0, 0 -/* 8050F0D4 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8050F0D8 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8050F0D4 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8050F0D8 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8050F0DC 88 7F 07 9E */ lbz r3, 0x79e(r31) /* 8050F0E0 38 03 00 01 */ addi r0, r3, 1 /* 8050F0E4 98 1F 07 9E */ stb r0, 0x79e(r31) @@ -255,8 +255,8 @@ lbl_8050F25C: /* 8050F280 38 00 00 19 */ li r0, 0x19 /* 8050F284 B0 1F 16 9E */ sth r0, 0x169e(r31) /* 8050F288 38 00 00 00 */ li r0, 0 -/* 8050F28C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8050F290 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8050F28C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8050F290 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8050F294 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ /* 8050F298 38 63 07 68 */ addi r3, r3, calc_mtx@l /* 0x80450768@l */ /* 8050F29C 80 63 00 00 */ lwz r3, 0(r3) @@ -528,8 +528,8 @@ lbl_8050F614: /* 8050F680 38 00 00 14 */ li r0, 0x14 /* 8050F684 B0 1F 16 9E */ sth r0, 0x169e(r31) /* 8050F688 38 00 00 00 */ li r0, 0 -/* 8050F68C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8050F690 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8050F68C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8050F690 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8050F694: /* 8050F694 3C 60 80 52 */ lis r3, l_HIO@ha /* 0x80519194@ha */ /* 8050F698 38 63 91 94 */ addi r3, r3, l_HIO@l /* 0x80519194@l */ @@ -567,8 +567,8 @@ lbl_8050F6FC: /* 8050F710 B0 1C 09 F6 */ sth r0, 0x9f6(r28) lbl_8050F714: /* 8050F714 38 00 00 0A */ li r0, 0xa -/* 8050F718 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8050F71C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8050F718 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8050F71C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8050F720 48 00 03 A4 */ b lbl_8050FAC4 lbl_8050F724: /* 8050F724 80 1C 06 80 */ lwz r0, 0x680(r28) diff --git a/asm/rel/d/a/e/d_a_e_s1/d_a_e_s1/e_s1_roof__FP10e_s1_class.s b/asm/rel/d/a/e/d_a_e_s1/d_a_e_s1/e_s1_roof__FP10e_s1_class.s index 6ab2b3e95a..8d12257e31 100644 --- a/asm/rel/d/a/e/d_a_e_s1/d_a_e_s1/e_s1_roof__FP10e_s1_class.s +++ b/asm/rel/d/a/e/d_a_e_s1/d_a_e_s1/e_s1_roof__FP10e_s1_class.s @@ -34,8 +34,8 @@ lbl_8077BCFC: /* 8077BD00 88 9E 05 B7 */ lbz r4, 0x5b7(r30) /* 8077BD04 28 04 00 FF */ cmplwi r4, 0xff /* 8077BD08 41 82 00 30 */ beq lbl_8077BD38 -/* 8077BD0C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8077BD10 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8077BD0C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8077BD10 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8077BD14 7C A5 07 74 */ extsb r5, r5 /* 8077BD18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8077BD1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/e/d_a_e_sf/d_a_e_sf/daE_SF_Execute__FP10e_sf_class.s b/asm/rel/d/a/e/d_a_e_sf/d_a_e_sf/daE_SF_Execute__FP10e_sf_class.s index 1b1b9f7ee9..2f8b1ce8ee 100644 --- a/asm/rel/d/a/e/d_a_e_sf/d_a_e_sf/daE_SF_Execute__FP10e_sf_class.s +++ b/asm/rel/d/a/e/d_a_e_sf/d_a_e_sf/daE_SF_Execute__FP10e_sf_class.s @@ -381,8 +381,8 @@ lbl_80788A70: /* 80788B10 38 00 00 0F */ li r0, 0xf /* 80788B14 B0 1F 07 1A */ sth r0, 0x71a(r31) /* 80788B18 38 00 00 03 */ li r0, 3 -/* 80788B1C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80788B20 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80788B1C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80788B20 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80788B24 88 1F 05 B9 */ lbz r0, 0x5b9(r31) /* 80788B28 28 00 00 01 */ cmplwi r0, 1 /* 80788B2C 40 82 01 58 */ bne lbl_80788C84 diff --git a/asm/rel/d/a/e/d_a_e_st/d_a_e_st/damage_check_g__FP10e_st_class.s b/asm/rel/d/a/e/d_a_e_st/d_a_e_st/damage_check_g__FP10e_st_class.s index 7097a607eb..489b926731 100644 --- a/asm/rel/d/a/e/d_a_e_st/d_a_e_st/damage_check_g__FP10e_st_class.s +++ b/asm/rel/d/a/e/d_a_e_st/d_a_e_st/damage_check_g__FP10e_st_class.s @@ -145,8 +145,8 @@ lbl_807A3D1C: /* 807A3D4C 38 C0 00 00 */ li r6, 0 /* 807A3D50 4B 8E 37 C5 */ bl def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c /* 807A3D54 38 00 00 04 */ li r0, 4 -/* 807A3D58 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807A3D5C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807A3D58 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807A3D5C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 807A3D60 38 00 00 0A */ li r0, 0xa /* 807A3D64 B0 1E 06 8C */ sth r0, 0x68c(r30) /* 807A3D68 3C 60 80 45 */ lis r3, calc_mtx@ha /* 0x80450768@ha */ diff --git a/asm/rel/d/a/e/d_a_e_ws/d_a_e_ws/damage_check__8daE_WS_cFv.s b/asm/rel/d/a/e/d_a_e_ws/d_a_e_ws/damage_check__8daE_WS_cFv.s index cc0c7f3ab1..e13411558f 100644 --- a/asm/rel/d/a/e/d_a_e_ws/d_a_e_ws/damage_check__8daE_WS_cFv.s +++ b/asm/rel/d/a/e/d_a_e_ws/d_a_e_ws/damage_check__8daE_WS_cFv.s @@ -38,8 +38,8 @@ lbl_807E5708: /* 807E575C 39 20 00 00 */ li r9, 0 /* 807E5760 4B 86 6A B9 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 807E5764 38 00 00 04 */ li r0, 4 -/* 807E5768 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807E576C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807E5768 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807E576C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 807E5770 3C 60 00 07 */ lis r3, 0x0007 /* 0x00070171@ha */ /* 807E5774 38 03 01 71 */ addi r0, r3, 0x0171 /* 0x00070171@l */ /* 807E5778 90 01 00 0C */ stw r0, 0xc(r1) diff --git a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s index e4a7ca48dd..58a4db8aec 100644 --- a/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s +++ b/asm/rel/d/a/e/d_a_e_yc/d_a_e_yc/e_yc_wolfbite__FP10e_yc_class.s @@ -148,8 +148,8 @@ lbl_807F13D8: /* 807F1440 38 00 00 05 */ li r0, 5 /* 807F1444 B0 1F 13 70 */ sth r0, 0x1370(r31) /* 807F1448 38 00 00 07 */ li r0, 7 -/* 807F144C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807F1450 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807F144C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807F1450 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 807F1454 38 7D 05 BC */ addi r3, r29, 0x5bc /* 807F1458 3C 80 00 04 */ lis r4, 0x0004 /* 0x00040003@ha */ /* 807F145C 38 84 00 03 */ addi r4, r4, 0x0003 /* 0x00040003@l */ diff --git a/asm/rel/d/a/e/d_a_e_yd/d_a_e_yd/damage_check__FP10e_yd_class.s b/asm/rel/d/a/e/d_a_e_yd/d_a_e_yd/damage_check__FP10e_yd_class.s index f9b03fd43b..706f4ceb4b 100644 --- a/asm/rel/d/a/e/d_a_e_yd/d_a_e_yd/damage_check__FP10e_yd_class.s +++ b/asm/rel/d/a/e/d_a_e_yd/d_a_e_yd/damage_check__FP10e_yd_class.s @@ -156,8 +156,8 @@ lbl_807F33EC: /* 807F3400 2C 00 00 01 */ cmpwi r0, 1 /* 807F3404 40 82 00 10 */ bne lbl_807F3414 /* 807F3408 38 00 00 04 */ li r0, 4 -/* 807F340C 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807F3410 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807F340C 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807F3410 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_807F3414: /* 807F3414 39 61 00 40 */ addi r11, r1, 0x40 /* 807F3418 4B B6 EE 01 */ bl _restgpr_25 diff --git a/asm/rel/d/a/e/d_a_e_yg/d_a_e_yg/damage_check__FP10e_yg_class.s b/asm/rel/d/a/e/d_a_e_yg/d_a_e_yg/damage_check__FP10e_yg_class.s index fe4913448d..82394843eb 100644 --- a/asm/rel/d/a/e/d_a_e_yg/d_a_e_yg/damage_check__FP10e_yg_class.s +++ b/asm/rel/d/a/e/d_a_e_yg/d_a_e_yg/damage_check__FP10e_yg_class.s @@ -65,8 +65,8 @@ lbl_807FA390: /* 807FA3D0 B0 9F 05 B4 */ sth r4, 0x5b4(r31) /* 807FA3D4 38 00 00 C8 */ li r0, 0xc8 /* 807FA3D8 B0 1F 06 8E */ sth r0, 0x68e(r31) -/* 807FA3DC 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 807FA3E0 98 83 11 25 */ stb r4, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 807FA3DC 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 807FA3E0 98 83 11 25 */ stb r4, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 807FA3E4 48 00 00 7C */ b lbl_807FA460 lbl_807FA3E8: /* 807FA3E8 38 00 00 04 */ li r0, 4 diff --git a/asm/rel/d/a/e/d_a_e_yk/d_a_e_yk/damage_check__FP10e_yk_class.s b/asm/rel/d/a/e/d_a_e_yk/d_a_e_yk/damage_check__FP10e_yk_class.s index 140f5456da..0de19d7b93 100644 --- a/asm/rel/d/a/e/d_a_e_yk/d_a_e_yk/damage_check__FP10e_yk_class.s +++ b/asm/rel/d/a/e/d_a_e_yk/d_a_e_yk/damage_check__FP10e_yk_class.s @@ -90,8 +90,8 @@ lbl_80804E50: /* 80804E88 B0 9E 06 70 */ sth r4, 0x670(r30) /* 80804E8C 38 00 00 C8 */ li r0, 0xc8 /* 80804E90 B0 1E 06 AA */ sth r0, 0x6aa(r30) -/* 80804E94 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80804E98 98 83 11 25 */ stb r4, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80804E94 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80804E98 98 83 11 25 */ stb r4, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80804E9C 3C 60 00 07 */ lis r3, 0x0007 /* 0x000701CB@ha */ /* 80804EA0 38 03 01 CB */ addi r0, r3, 0x01CB /* 0x000701CB@l */ /* 80804EA4 90 01 00 0C */ stw r0, 0xc(r1) diff --git a/asm/rel/d/a/e/d_a_e_zs/d_a_e_zs/damage_check__8daE_ZS_cFv.s b/asm/rel/d/a/e/d_a_e_zs/d_a_e_zs/damage_check__8daE_ZS_cFv.s index 2f14d280e6..6d6deca3c3 100644 --- a/asm/rel/d/a/e/d_a_e_zs/d_a_e_zs/damage_check__8daE_ZS_cFv.s +++ b/asm/rel/d/a/e/d_a_e_zs/d_a_e_zs/damage_check__8daE_ZS_cFv.s @@ -182,8 +182,8 @@ lbl_808334F4: /* 8083355C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80833560 40 82 00 10 */ bne lbl_80833570 /* 80833564 38 00 00 03 */ li r0, 3 -/* 80833568 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8083356C 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80833568 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8083356C 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_80833570: /* 80833570 38 7F 05 B8 */ addi r3, r31, 0x5b8 /* 80833574 3C 80 00 04 */ lis r4, 4 diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s index fe20a82f65..2682b6a987 100644 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Create__FP10fopAc_ac_c.s @@ -40,8 +40,8 @@ lbl_8046C800: /* 8046C84C 88 9E 05 71 */ lbz r4, 0x571(r30) /* 8046C850 28 04 00 FF */ cmplwi r4, 0xff /* 8046C854 41 82 00 2C */ beq lbl_8046C880 -/* 8046C858 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C85C 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C858 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C85C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C860 7C A5 07 74 */ extsb r5, r5 /* 8046C864 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046C868 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -54,8 +54,8 @@ lbl_8046C880: /* 8046C880 88 9E 05 72 */ lbz r4, 0x572(r30) /* 8046C884 28 04 00 FF */ cmplwi r4, 0xff /* 8046C888 41 82 00 28 */ beq lbl_8046C8B0 -/* 8046C88C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C890 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C88C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C890 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C894 7C A5 07 74 */ extsb r5, r5 /* 8046C898 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046C89C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s index 385e65fe54..7e0589ba84 100644 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/daKytag00_Execute__FP13kytag00_class.s @@ -11,8 +11,8 @@ lbl_8046C684: /* 8046C6A8 88 9D 05 71 */ lbz r4, 0x571(r29) /* 8046C6AC 28 04 00 FF */ cmplwi r4, 0xff /* 8046C6B0 41 82 00 2C */ beq lbl_8046C6DC -/* 8046C6B4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C6B8 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C6B4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C6B8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C6BC 7C A5 07 74 */ extsb r5, r5 /* 8046C6C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046C6C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -25,8 +25,8 @@ lbl_8046C6DC: /* 8046C6DC 88 9D 05 72 */ lbz r4, 0x572(r29) /* 8046C6E0 28 04 00 FF */ cmplwi r4, 0xff /* 8046C6E4 41 82 00 28 */ beq lbl_8046C70C -/* 8046C6E8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C6EC 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C6E8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C6EC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C6F0 7C A5 07 74 */ extsb r5, r5 /* 8046C6F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046C6F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s index ba7886a597..bb0134e937 100644 --- a/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag00/d_a_kytag00/wether_tag_efect_move__FP13kytag00_class.s @@ -189,8 +189,8 @@ lbl_8046C15C: lbl_8046C168: /* 8046C168 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 8046C16C 7C 04 07 74 */ extsb r4, r0 -/* 8046C170 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C174 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C170 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C174 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C178 7C 00 07 74 */ extsb r0, r0 /* 8046C17C 7C 04 00 00 */ cmpw r4, r0 /* 8046C180 40 82 00 B8 */ bne lbl_8046C238 @@ -263,8 +263,8 @@ lbl_8046C270: /* 8046C27C 98 C5 0E A9 */ stb r6, 0xea9(r5) /* 8046C280 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 8046C284 7C 04 07 74 */ extsb r4, r0 -/* 8046C288 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C28C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C288 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C28C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C290 7C 00 07 74 */ extsb r0, r0 /* 8046C294 7C 04 00 00 */ cmpw r4, r0 /* 8046C298 40 82 00 20 */ bne lbl_8046C2B8 @@ -425,8 +425,8 @@ lbl_8046C4A8: lbl_8046C4CC: /* 8046C4CC 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 8046C4D0 7C 04 07 74 */ extsb r4, r0 -/* 8046C4D4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046C4D8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046C4D4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046C4D8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046C4DC 7C 00 07 74 */ extsb r0, r0 /* 8046C4E0 7C 04 00 00 */ cmpw r4, r0 /* 8046C4E4 40 82 00 B8 */ bne lbl_8046C59C diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s index 32c92f580e..b310ea615b 100644 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Create__FP10fopAc_ac_c.s @@ -38,8 +38,8 @@ lbl_80855830: /* 80855874 40 82 00 F4 */ bne lbl_80855968 /* 80855878 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 8085587C 7C 04 07 74 */ extsb r4, r0 -/* 80855880 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80855884 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80855880 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80855884 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80855888 7C 00 07 74 */ extsb r0, r0 /* 8085588C 7C 04 00 00 */ cmpw r4, r0 /* 80855890 40 82 00 D8 */ bne lbl_80855968 diff --git a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s index e231f68486..07762b330e 100644 --- a/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag01/d_a_kytag01/daKytag01_Execute__FP13kytag01_class.s @@ -26,8 +26,8 @@ lbl_80855698: /* 8085569C 40 82 01 24 */ bne lbl_808557C0 /* 808556A0 88 BE 04 BA */ lbz r5, 0x4ba(r30) /* 808556A4 7C A5 07 74 */ extsb r5, r5 -/* 808556A8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 808556AC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 808556A8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 808556AC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 808556B0 7C 00 07 74 */ extsb r0, r0 /* 808556B4 7C 05 00 00 */ cmpw r5, r0 /* 808556B8 40 82 01 08 */ bne lbl_808557C0 diff --git a/asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Execute__FP13kytag02_class.s b/asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Execute__FP13kytag02_class.s index 731313ed15..4ba4fe32f4 100644 --- a/asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Execute__FP13kytag02_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag02/d_a_kytag02/daKytag02_Execute__FP13kytag02_class.s @@ -121,8 +121,8 @@ lbl_80855C68: /* 80855C78 38 63 DD 70 */ addi r3, r3, g_mEnvSeMgr@l /* 0x8042DD70@l */ /* 80855C7C 7F E4 FB 78 */ mr r4, r31 /* 80855C80 4B A7 23 49 */ bl setWindDirection__10Z2EnvSeMgrFP3Vec -/* 80855C84 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80855C88 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80855C84 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80855C88 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80855C8C 88 63 00 00 */ lbz r3, 0(r3) /* 80855C90 7C 63 07 74 */ extsb r3, r3 /* 80855C94 4B 7D 73 D9 */ bl dComIfGp_getReverb__Fi diff --git a/asm/rel/d/a/kytag/d_a_kytag03/d_a_kytag03/odour_move__FP13kytag03_class.s b/asm/rel/d/a/kytag/d_a_kytag03/d_a_kytag03/odour_move__FP13kytag03_class.s index 60ee63fb93..cfbd1a173b 100644 --- a/asm/rel/d/a/kytag/d_a_kytag03/d_a_kytag03/odour_move__FP13kytag03_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag03/d_a_kytag03/odour_move__FP13kytag03_class.s @@ -42,8 +42,8 @@ lbl_80856378: /* 80856418 88 9D 05 8E */ lbz r4, 0x58e(r29) /* 8085641C 28 04 00 FF */ cmplwi r4, 0xff /* 80856420 41 82 00 20 */ beq lbl_80856440 -/* 80856424 3C A0 80 45 */ lis r5, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80856428 38 A5 0D 64 */ addi r5, r5, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80856424 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80856428 38 A5 0D 64 */ addi r5, r5, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8085642C 88 A5 00 00 */ lbz r5, 0(r5) /* 80856430 7C A5 07 74 */ extsb r5, r5 /* 80856434 4B 7D EF 2D */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s index 3df90eb84d..5c404e620c 100644 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Create__FP10fopAc_ac_c.s @@ -109,8 +109,8 @@ lbl_8046D6DC: /* 8046D73C 88 9F 05 B5 */ lbz r4, 0x5b5(r31) /* 8046D740 28 04 00 FF */ cmplwi r4, 0xff /* 8046D744 41 82 00 28 */ beq lbl_8046D76C -/* 8046D748 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D74C 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046D748 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D74C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046D750 7C A5 07 74 */ extsb r5, r5 /* 8046D754 7F A3 EB 78 */ mr r3, r29 /* 8046D758 4B BC 7C 09 */ bl isSwitch__10dSv_info_cCFii @@ -142,8 +142,8 @@ lbl_8046D76C: lbl_8046D7BC: /* 8046D7BC 38 00 FF FF */ li r0, -1 /* 8046D7C0 98 1F 05 B7 */ stb r0, 0x5b7(r31) -/* 8046D7C4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D7C8 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046D7C4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D7C8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046D7CC 7C A5 07 74 */ extsb r5, r5 /* 8046D7D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046D7D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -156,8 +156,8 @@ lbl_8046D7E4: /* 8046D7EC 88 9F 05 B5 */ lbz r4, 0x5b5(r31) /* 8046D7F0 28 04 00 FF */ cmplwi r4, 0xff /* 8046D7F4 41 82 00 98 */ beq lbl_8046D88C -/* 8046D7F8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D7FC 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046D7F8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D7FC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046D800 7C A5 07 74 */ extsb r5, r5 /* 8046D804 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046D808 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -211,8 +211,8 @@ lbl_8046D8B0: /* 8046D8BC 88 9F 05 B5 */ lbz r4, 0x5b5(r31) /* 8046D8C0 28 04 00 FF */ cmplwi r4, 0xff /* 8046D8C4 41 82 00 68 */ beq lbl_8046D92C -/* 8046D8C8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D8CC 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046D8C8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D8CC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046D8D0 7C A5 07 74 */ extsb r5, r5 /* 8046D8D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046D8D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s index 96e0fb1d39..6b92086db0 100644 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Draw__FP13kytag04_class.s @@ -46,8 +46,8 @@ lbl_8046CBF0: /* 8046CC04 88 1D 05 D1 */ lbz r0, 0x5d1(r29) /* 8046CC08 28 00 00 01 */ cmplwi r0, 1 /* 8046CC0C 40 82 00 6C */ bne lbl_8046CC78 -/* 8046CC10 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046CC14 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8046CC10 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046CC14 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8046CC18 7C A5 07 74 */ extsb r5, r5 /* 8046CC1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8046CC20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s index 5042ffa161..606be694b3 100644 --- a/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag04/d_a_kytag04/daKytag04_Execute__FP13kytag04_class.s @@ -24,8 +24,8 @@ lbl_8046D030: /* 8046D03C 88 9E 05 B5 */ lbz r4, 0x5b5(r30) /* 8046D040 28 04 00 FF */ cmplwi r4, 0xff /* 8046D044 41 82 00 D0 */ beq lbl_8046D114 -/* 8046D048 3C A0 80 45 */ lis r5, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D04C 38 A5 0D 64 */ addi r5, r5, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8046D048 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D04C 38 A5 0D 64 */ addi r5, r5, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8046D050 88 A5 00 00 */ lbz r5, 0(r5) /* 8046D054 7C A5 07 74 */ extsb r5, r5 /* 8046D058 4B BC 83 09 */ bl isSwitch__10dSv_info_cCFii @@ -95,8 +95,8 @@ lbl_8046D114: /* 8046D14C 28 03 00 FF */ cmplwi r3, 0xff /* 8046D150 40 82 00 28 */ bne lbl_8046D178 /* 8046D154 80 7E 05 B0 */ lwz r3, 0x5b0(r30) -/* 8046D158 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D15C 38 84 0D 64 */ addi r4, r4, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8046D158 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D15C 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8046D160 88 84 00 00 */ lbz r4, 0(r4) /* 8046D164 7C 84 07 74 */ extsb r4, r4 /* 8046D168 38 A1 00 14 */ addi r5, r1, 0x14 @@ -104,8 +104,8 @@ lbl_8046D114: /* 8046D170 4B CE 86 05 */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz /* 8046D174 48 00 00 20 */ b lbl_8046D194 lbl_8046D178: -/* 8046D178 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D17C 38 84 0D 64 */ addi r4, r4, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8046D178 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D17C 38 84 0D 64 */ addi r4, r4, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8046D180 88 84 00 00 */ lbz r4, 0(r4) /* 8046D184 7C 84 07 74 */ extsb r4, r4 /* 8046D188 38 A1 00 14 */ addi r5, r1, 0x14 @@ -149,8 +149,8 @@ lbl_8046D1F0: /* 8046D214 38 60 00 03 */ li r3, 3 /* 8046D218 C0 3F 00 08 */ lfs f1, 8(r31) /* 8046D21C 38 80 00 00 */ li r4, 0 -/* 8046D220 3C A0 80 45 */ lis r5, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D224 88 05 0D 64 */ lbz r0, struct_80450D64+0x0@l(r5) /* 0x80450D64@l */ +/* 8046D220 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D224 88 05 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r5) /* 0x80450D64@l */ /* 8046D228 7C 05 07 74 */ extsb r5, r0 /* 8046D22C 38 C0 00 00 */ li r6, 0 /* 8046D230 38 E0 FF FF */ li r7, -1 @@ -163,8 +163,8 @@ lbl_8046D244: /* 8046D244 88 9E 05 B5 */ lbz r4, 0x5b5(r30) /* 8046D248 28 04 00 FF */ cmplwi r4, 0xff /* 8046D24C 41 82 00 EC */ beq lbl_8046D338 -/* 8046D250 3C A0 80 45 */ lis r5, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8046D254 38 A5 0D 64 */ addi r5, r5, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8046D250 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8046D254 38 A5 0D 64 */ addi r5, r5, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8046D258 88 A5 00 00 */ lbz r5, 0(r5) /* 8046D25C 7C A5 07 74 */ extsb r5, r5 /* 8046D260 4B BC 81 01 */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s index 00370b689f..549c6e44f8 100644 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_Execute__FP13kytag06_class.s @@ -121,8 +121,8 @@ lbl_808596E8: /* 808596E8 88 9D 05 95 */ lbz r4, 0x595(r29) /* 808596EC 28 04 00 FF */ cmplwi r4, 0xff /* 808596F0 41 82 03 7C */ beq lbl_80859A6C -/* 808596F4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 808596F8 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 808596F4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 808596F8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 808596FC 7C A5 07 74 */ extsb r5, r5 /* 80859700 7F E3 FB 78 */ mr r3, r31 /* 80859704 4B 7D BC 5D */ bl isSwitch__10dSv_info_cCFii diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s index f00eb758e9..2338514379 100644 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type03_init__FP10fopAc_ac_c.s @@ -31,8 +31,8 @@ lbl_80859B34: /* 80859BA8 88 9F 05 95 */ lbz r4, 0x595(r31) /* 80859BAC 28 04 00 FF */ cmplwi r4, 0xff /* 80859BB0 41 82 00 C0 */ beq lbl_80859C70 -/* 80859BB4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80859BB8 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80859BB4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80859BB8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80859BBC 7C A5 07 74 */ extsb r5, r5 /* 80859BC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 80859BC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -53,8 +53,8 @@ lbl_80859B34: lbl_80859C00: /* 80859C00 28 00 00 02 */ cmplwi r0, 2 /* 80859C04 40 82 00 6C */ bne lbl_80859C70 -/* 80859C08 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80859C0C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80859C08 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80859C0C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80859C10 7C 00 07 75 */ extsb. r0, r0 /* 80859C14 41 82 00 5C */ beq lbl_80859C70 /* 80859C18 88 9F 05 95 */ lbz r4, 0x595(r31) diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s index 79692989f3..3dcc8e3927 100644 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_03_Execute__FP13kytag06_class.s @@ -39,8 +39,8 @@ lbl_8085936C: /* 808593AC 90 1F 05 78 */ stw r0, 0x578(r31) /* 808593B0 88 7F 05 91 */ lbz r3, 0x591(r31) /* 808593B4 4B 94 F4 31 */ bl dKy_change_colpat__FUc -/* 808593B8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 808593BC 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 808593B8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 808593BC 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 808593C0 7C A5 07 74 */ extsb r5, r5 /* 808593C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 808593C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -77,8 +77,8 @@ lbl_8085942C: lbl_80859438: /* 80859438 28 00 00 02 */ cmplwi r0, 2 /* 8085943C 40 82 00 D4 */ bne lbl_80859510 -/* 80859440 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80859444 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80859440 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80859444 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80859448 7C 00 07 75 */ extsb. r0, r0 /* 8085944C 41 82 00 C4 */ beq lbl_80859510 /* 80859450 88 1F 05 90 */ lbz r0, 0x590(r31) diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s index e902686496..ec347b5f0e 100644 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_10_Execute__FP13kytag06_class.s @@ -61,8 +61,8 @@ lbl_80858DF8: /* 80858DF8 38 60 00 00 */ li r3, 0 /* 80858DFC 4B 94 F9 E9 */ bl dKy_change_colpat__FUc lbl_80858E00: -/* 80858E00 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80858E04 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80858E00 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80858E04 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80858E08 2C 00 00 04 */ cmpwi r0, 4 /* 80858E0C 40 82 02 0C */ bne lbl_80859018 /* 80858E10 38 C0 00 00 */ li r6, 0 @@ -254,8 +254,8 @@ lbl_808590AC: /* 808590C4 80 81 00 24 */ lwz r4, 0x24(r1) /* 808590C8 4B A6 EE ED */ bl setSnowPower__10Z2EnvSeMgrFSc lbl_808590CC: -/* 808590CC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 808590D0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 808590CC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 808590D0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 808590D4 7C 00 07 75 */ extsb. r0, r0 /* 808590D8 41 82 00 3C */ beq lbl_80859114 /* 808590DC 2C 00 00 03 */ cmpwi r0, 3 diff --git a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s index 6b52d10d62..12ce798cb8 100644 --- a/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag06/d_a_kytag06/daKytag06_type_11_Execute__FP13kytag06_class.s @@ -9,8 +9,8 @@ lbl_8085912C: /* 80859148 4B 7D 38 35 */ bl getLayerNo__14dComIfG_play_cFi /* 8085914C 2C 03 00 0E */ cmpwi r3, 0xe /* 80859150 40 82 00 44 */ bne lbl_80859194 -/* 80859154 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80859158 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80859154 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80859158 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085915C 7C 00 07 74 */ extsb r0, r0 /* 80859160 2C 00 00 08 */ cmpwi r0, 8 /* 80859164 41 82 00 28 */ beq lbl_8085918C diff --git a/asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Execute__FP13kytag07_class.s b/asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Execute__FP13kytag07_class.s index a0a06518ce..de0e90e1f7 100644 --- a/asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Execute__FP13kytag07_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Execute__FP13kytag07_class.s @@ -20,8 +20,8 @@ lbl_8085A280: lbl_8085A2C8: /* 8085A2C8 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 8085A2CC 7C 04 07 74 */ extsb r4, r0 -/* 8085A2D0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085A2D4 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085A2D0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085A2D4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085A2D8 7C 00 07 74 */ extsb r0, r0 /* 8085A2DC 7C 04 00 00 */ cmpw r4, r0 /* 8085A2E0 41 82 00 1C */ beq lbl_8085A2FC diff --git a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s b/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s index 5f8d1de86f..32a17d6dab 100644 --- a/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag11/d_a_kytag11/daKytag11_Execute__FP13kytag11_class.s @@ -33,8 +33,8 @@ lbl_80529598: /* 80529598 88 9D 05 72 */ lbz r4, 0x572(r29) /* 8052959C 28 04 00 FF */ cmplwi r4, 0xff /* 805295A0 41 82 00 2C */ beq lbl_805295CC -/* 805295A4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 805295A8 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 805295A4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 805295A8 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 805295AC 7C A5 07 74 */ extsb r5, r5 /* 805295B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 805295B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -64,8 +64,8 @@ lbl_8052960C: /* 8052960C 88 9D 05 73 */ lbz r4, 0x573(r29) /* 80529610 28 04 00 FF */ cmplwi r4, 0xff /* 80529614 41 82 00 2C */ beq lbl_80529640 -/* 80529618 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8052961C 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80529618 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8052961C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80529620 7C A5 07 74 */ extsb r5, r5 /* 80529624 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 80529628 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_arrival__FP13kytag12_class.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_arrival__FP13kytag12_class.s index 90c689a772..1ae76bdcf7 100644 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_arrival__FP13kytag12_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_arrival__FP13kytag12_class.s @@ -855,8 +855,8 @@ lbl_8085DE24: /* 8085DE2C 41 80 F4 A8 */ blt lbl_8085D2D4 /* 8085DE30 2C 16 00 00 */ cmpwi r22, 0 /* 8085DE34 41 82 00 38 */ beq lbl_8085DE6C -/* 8085DE38 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085DE3C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085DE38 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085DE3C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085DE40 2C 00 00 0B */ cmpwi r0, 0xb /* 8085DE44 40 82 00 10 */ bne lbl_8085DE54 /* 8085DE48 38 00 00 3C */ li r0, 0x3c diff --git a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_standard__FP13kytag12_class.s b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_standard__FP13kytag12_class.s index d4c0e32a0c..3a41855a34 100644 --- a/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_standard__FP13kytag12_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag12/d_a_kytag12/daKytag12_Execute_standard__FP13kytag12_class.s @@ -1053,8 +1053,8 @@ lbl_8085CC38: /* 8085CC4C A8 0F 05 78 */ lha r0, 0x578(r15) /* 8085CC50 2C 00 00 00 */ cmpwi r0, 0 /* 8085CC54 40 82 00 34 */ bne lbl_8085CC88 -/* 8085CC58 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085CC5C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085CC58 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085CC5C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085CC60 7C 00 07 74 */ extsb r0, r0 /* 8085CC64 2C 00 00 0B */ cmpwi r0, 0xb /* 8085CC68 41 82 00 0C */ beq lbl_8085CC74 diff --git a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s index 0f39a28874..9d02e676f2 100644 --- a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s +++ b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Create__FP10fopAc_ac_c.s @@ -17,8 +17,8 @@ lbl_8086023C: lbl_80860248: /* 80860248 88 1F 04 BA */ lbz r0, 0x4ba(r31) /* 8086024C 7C 04 07 74 */ extsb r4, r0 -/* 80860250 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80860254 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80860250 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80860254 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80860258 7C 00 07 74 */ extsb r0, r0 /* 8086025C 7C 04 00 00 */ cmpw r4, r0 /* 80860260 41 82 00 0C */ beq lbl_8086026C diff --git a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s index f896ce5115..218400cbf4 100644 --- a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute__FP13kytag13_class.s @@ -4,8 +4,8 @@ lbl_808601C0: /* 808601C8 90 01 00 14 */ stw r0, 0x14(r1) /* 808601CC 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 808601D0 7C 05 07 74 */ extsb r5, r0 -/* 808601D4 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 808601D8 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 808601D4 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 808601D8 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 808601DC 7C 00 07 74 */ extsb r0, r0 /* 808601E0 7C 05 00 00 */ cmpw r5, r0 /* 808601E4 40 82 00 08 */ bne lbl_808601EC diff --git a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute_standard__FP13kytag13_class.s b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute_standard__FP13kytag13_class.s index 6abedc8e53..99a6b1f71a 100644 --- a/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute_standard__FP13kytag13_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag13/d_a_kytag13/daKytag13_Execute_standard__FP13kytag13_class.s @@ -90,8 +90,8 @@ lbl_8085F3B8: /* 8085F40C 88 9C 05 7A */ lbz r4, 0x57a(r28) /* 8085F410 28 04 00 FF */ cmplwi r4, 0xff /* 8085F414 41 82 00 34 */ beq lbl_8085F448 -/* 8085F418 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085F41C 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085F418 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085F41C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085F420 7C A5 07 74 */ extsb r5, r5 /* 8085F424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 8085F428 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -212,8 +212,8 @@ lbl_8085F448: /* 8085F5F0 3C 60 80 86 */ lis r3, d_a_kytag13__stringBase0@ha /* 0x80860538@ha */ /* 8085F5F4 3B 63 05 38 */ addi r27, r3, d_a_kytag13__stringBase0@l /* 0x80860538@l */ /* 8085F5F8 C3 FF 00 2C */ lfs f31, 0x2c(r31) -/* 8085F5FC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085F600 3A A3 0D 64 */ addi r21, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 8085F5FC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085F600 3A A3 0D 64 */ addi r21, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 8085F604 1E D7 00 38 */ mulli r22, r23, 0x38 /* 8085F608 48 00 0A E4 */ b lbl_808600EC lbl_8085F60C: @@ -222,8 +222,8 @@ lbl_8085F60C: /* 8085F614 4B B0 93 81 */ bl strcmp /* 8085F618 2C 03 00 00 */ cmpwi r3, 0 /* 8085F61C 40 82 00 34 */ bne lbl_8085F650 -/* 8085F620 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085F624 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085F620 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085F624 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085F628 7C 00 07 75 */ extsb. r0, r0 /* 8085F62C 40 82 00 24 */ bne lbl_8085F650 /* 8085F630 2C 17 00 64 */ cmpwi r23, 0x64 @@ -317,8 +317,8 @@ lbl_8085F680: /* 8085F788 4B B0 92 0D */ bl strcmp /* 8085F78C 2C 03 00 00 */ cmpwi r3, 0 /* 8085F790 40 82 08 F8 */ bne lbl_80860088 -/* 8085F794 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085F798 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085F794 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085F798 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085F79C 7C 00 07 75 */ extsb. r0, r0 /* 8085F7A0 40 82 08 E8 */ bne lbl_80860088 /* 8085F7A4 2C 17 00 19 */ cmpwi r23, 0x19 @@ -419,8 +419,8 @@ lbl_8085F8BC: lbl_8085F914: /* 8085F914 FF 80 D8 90 */ fmr f28, f27 /* 8085F918 FF A0 D8 90 */ fmr f29, f27 -/* 8085F91C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085F920 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085F91C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085F920 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085F924 7C 00 07 75 */ extsb. r0, r0 /* 8085F928 40 82 00 10 */ bne lbl_8085F938 /* 8085F92C C3 9F 00 60 */ lfs f28, 0x60(r31) @@ -825,8 +825,8 @@ lbl_8085FE54: /* 8085FEEC 4B B0 8A A9 */ bl strcmp /* 8085FEF0 2C 03 00 00 */ cmpwi r3, 0 /* 8085FEF4 40 82 01 80 */ bne lbl_80860074 -/* 8085FEF8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8085FEFC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8085FEF8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8085FEFC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8085FF00 7C 00 07 75 */ extsb. r0, r0 /* 8085FF04 40 82 01 70 */ bne lbl_80860074 /* 8085FF08 2C 17 00 14 */ cmpwi r23, 0x14 diff --git a/asm/rel/d/a/kytag/d_a_kytag14/d_a_kytag14/daKytag14_Execute__FP13kytag14_class.s b/asm/rel/d/a/kytag/d_a_kytag14/d_a_kytag14/daKytag14_Execute__FP13kytag14_class.s index 9085539a93..1d5892900e 100644 --- a/asm/rel/d/a/kytag/d_a_kytag14/d_a_kytag14/daKytag14_Execute__FP13kytag14_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag14/d_a_kytag14/daKytag14_Execute__FP13kytag14_class.s @@ -58,8 +58,8 @@ lbl_80529A6C: /* 80529A6C 88 9B 05 6E */ lbz r4, 0x56e(r27) /* 80529A70 28 04 00 FF */ cmplwi r4, 0xff /* 80529A74 41 82 00 30 */ beq lbl_80529AA4 -/* 80529A78 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80529A7C 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80529A78 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80529A7C 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80529A80 7C A5 07 74 */ extsb r5, r5 /* 80529A84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 80529A88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ @@ -74,8 +74,8 @@ lbl_80529AA4: /* 80529AA4 88 9B 05 6F */ lbz r4, 0x56f(r27) /* 80529AA8 28 04 00 FF */ cmplwi r4, 0xff /* 80529AAC 41 82 00 30 */ beq lbl_80529ADC -/* 80529AB0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80529AB4 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80529AB0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80529AB4 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80529AB8 7C A5 07 74 */ extsb r5, r5 /* 80529ABC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 80529AC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s index 9473de92ed..dc287e88b3 100644 --- a/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s +++ b/asm/rel/d/a/kytag/d_a_kytag16/d_a_kytag16/daKytag16_Execute__FP13kytag16_class.s @@ -51,8 +51,8 @@ lbl_80860D08: /* 80860D14 88 9E 05 73 */ lbz r4, 0x573(r30) /* 80860D18 28 04 00 FF */ cmplwi r4, 0xff /* 80860D1C 41 82 00 2C */ beq lbl_80860D48 -/* 80860D20 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80860D24 88 A3 0D 64 */ lbz r5, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80860D20 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80860D24 88 A3 0D 64 */ lbz r5, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80860D28 7C A5 07 74 */ extsb r5, r5 /* 80860D2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ /* 80860D30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ diff --git a/asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv.s b/asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv.s index afe5acb6c4..8719819e20 100644 --- a/asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv.s +++ b/asm/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans/checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv.s @@ -16,8 +16,8 @@ lbl_80964D20: /* 80964D58 4B A0 3C 3D */ bl strcmp /* 80964D5C 2C 03 00 00 */ cmpwi r3, 0 /* 80964D60 40 82 00 18 */ bne lbl_80964D78 -/* 80964D64 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80964D68 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80964D64 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80964D68 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80964D6C 2C 00 00 01 */ cmpwi r0, 1 /* 80964D70 40 82 00 08 */ bne lbl_80964D78 /* 80964D74 3B E0 00 01 */ li r31, 1 diff --git a/asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/setStaggerParam__15daNpc_Kakashi_cFP10fopAc_ac_c.s b/asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/setStaggerParam__15daNpc_Kakashi_cFP10fopAc_ac_c.s index 266a2f7c76..4921b0c687 100644 --- a/asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/setStaggerParam__15daNpc_Kakashi_cFP10fopAc_ac_c.s +++ b/asm/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi/setStaggerParam__15daNpc_Kakashi_cFP10fopAc_ac_c.s @@ -60,8 +60,8 @@ lbl_8054CF6C: /* 8054CF7C B0 1D 13 8C */ sth r0, 0x138c(r29) lbl_8054CF80: /* 8054CF80 38 00 00 05 */ li r0, 5 -/* 8054CF84 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8054CF88 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8054CF84 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8054CF88 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8054CF8C C3 FF 00 F4 */ lfs f31, 0xf4(r31) /* 8054CF90 48 00 00 60 */ b lbl_8054CFF0 lbl_8054CF94: @@ -75,8 +75,8 @@ lbl_8054CF94: /* 8054CFB0 40 82 00 1C */ bne lbl_8054CFCC lbl_8054CFB4: /* 8054CFB4 38 00 00 08 */ li r0, 8 -/* 8054CFB8 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8054CFBC 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8054CFB8 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8054CFBC 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 8054CFC0 38 00 00 01 */ li r0, 1 /* 8054CFC4 98 1D 13 92 */ stb r0, 0x1392(r29) /* 8054CFC8 48 00 00 28 */ b lbl_8054CFF0 @@ -87,8 +87,8 @@ lbl_8054CFCC: /* 8054CFD8 7C 00 F0 40 */ cmplw r0, r30 /* 8054CFDC 40 82 00 10 */ bne lbl_8054CFEC /* 8054CFE0 38 00 00 05 */ li r0, 5 -/* 8054CFE4 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 8054CFE8 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 8054CFE4 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 8054CFE8 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ lbl_8054CFEC: /* 8054CFEC C3 FF 00 F4 */ lfs f31, 0xf4(r31) lbl_8054CFF0: diff --git a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/action__FP12npc_ks_class.s b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/action__FP12npc_ks_class.s index 6a6fc43c76..54a74e04dd 100644 --- a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/action__FP12npc_ks_class.s +++ b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/action__FP12npc_ks_class.s @@ -330,8 +330,8 @@ lbl_80A5AC74: /* 80A5AC7C D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80A5AC80 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 80A5AC84 7C 18 07 74 */ extsb r24, r0 -/* 80A5AC88 3C 60 80 45 */ lis r3, struct_80450D64+0x2@ha /* 0x80450D66@ha */ -/* 80A5AC8C 8A E3 0D 66 */ lbz r23, struct_80450D64+0x2@l(r3) /* 0x80450D66@l */ +/* 80A5AC88 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x2@ha /* 0x80450D66@ha */ +/* 80A5AC8C 8A E3 0D 66 */ lbz r23, mStayNo__20dStage_roomControl_c+0x2@l(r3) /* 0x80450D66@l */ /* 80A5AC90 7E F7 07 74 */ extsb r23, r23 /* 80A5AC94 7C 18 B8 00 */ cmpw r24, r23 /* 80A5AC98 41 82 00 C8 */ beq lbl_80A5AD60 diff --git a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/npc_ks_home__FP12npc_ks_class.s b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/npc_ks_home__FP12npc_ks_class.s index 94b8bb257e..c0efbc36d8 100644 --- a/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/npc_ks_home__FP12npc_ks_class.s +++ b/asm/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks/npc_ks_home__FP12npc_ks_class.s @@ -73,8 +73,8 @@ lbl_80A4B8AC: /* 80A4B8C0 4B FF D7 95 */ bl checkDoorDemo__Fv /* 80A4B8C4 2C 03 00 00 */ cmpwi r3, 0 /* 80A4B8C8 41 82 01 34 */ beq lbl_80A4B9FC -/* 80A4B8CC 3C 60 80 45 */ lis r3, struct_80450D64+0x2@ha /* 0x80450D66@ha */ -/* 80A4B8D0 38 63 0D 66 */ addi r3, r3, struct_80450D64+0x2@l /* 0x80450D66@l */ +/* 80A4B8CC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x2@ha /* 0x80450D66@ha */ +/* 80A4B8D0 38 63 0D 66 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x2@l /* 0x80450D66@l */ /* 80A4B8D4 88 63 00 00 */ lbz r3, 0(r3) /* 80A4B8D8 7C 63 07 74 */ extsb r3, r3 /* 80A4B8DC 88 1E 04 E2 */ lbz r0, 0x4e2(r30) diff --git a/asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/cutHaveFavorToAsk__13daNpc_Pouya_cFi.s b/asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/cutHaveFavorToAsk__13daNpc_Pouya_cFi.s index ef72a647a1..8a457889ca 100644 --- a/asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/cutHaveFavorToAsk__13daNpc_Pouya_cFi.s +++ b/asm/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya/cutHaveFavorToAsk__13daNpc_Pouya_cFi.s @@ -443,8 +443,8 @@ lbl_80AB043C: /* 80AB0468 D0 19 06 1C */ stfs f0, 0x61c(r25) /* 80AB046C 48 00 00 18 */ b lbl_80AB0484 lbl_80AB0470: -/* 80AB0470 3C 60 80 45 */ lis r3, struct_80450BE4+0x2@ha /* 0x80450BE6@ha */ -/* 80AB0474 88 03 0B E6 */ lbz r0, struct_80450BE4+0x2@l(r3) /* 0x80450BE6@l */ +/* 80AB0470 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x2@ha /* 0x80450BE6@ha */ +/* 80AB0474 88 03 0B E6 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2@l(r3) /* 0x80450BE6@l */ /* 80AB0478 28 00 00 00 */ cmplwi r0, 0 /* 80AB047C 40 82 00 08 */ bne lbl_80AB0484 /* 80AB0480 3B C0 00 01 */ li r30, 1 diff --git a/asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/setRoomInf__13daNpc_Shop0_cFv.s b/asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/setRoomInf__13daNpc_Shop0_cFv.s index 21503607c5..60bc47ac13 100644 --- a/asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/setRoomInf__13daNpc_Shop0_cFv.s +++ b/asm/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0/setRoomInf__13daNpc_Shop0_cFv.s @@ -30,8 +30,8 @@ lbl_80AEB6DC: /* 80AEB74C 98 7D 04 8D */ stb r3, 0x48d(r29) /* 80AEB750 48 00 00 10 */ b lbl_80AEB760 lbl_80AEB754: -/* 80AEB754 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80AEB758 8B C3 0D 64 */ lbz r30, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80AEB754 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80AEB758 8B C3 0D 64 */ lbz r30, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80AEB75C 7F DE 07 74 */ extsb r30, r30 lbl_80AEB760: /* 80AEB760 9B DD 04 8C */ stb r30, 0x48c(r29) diff --git a/asm/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk/executeWolfPerch__10daNPC_TK_cFv.s b/asm/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk/executeWolfPerch__10daNPC_TK_cFv.s index dccc558dc7..edae50fd0b 100644 --- a/asm/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk/executeWolfPerch__10daNPC_TK_cFv.s +++ b/asm/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk/executeWolfPerch__10daNPC_TK_cFv.s @@ -374,8 +374,8 @@ lbl_80B08924: /* 80B0893C 4B 86 00 59 */ bl strcmp /* 80B08940 2C 03 00 00 */ cmpwi r3, 0 /* 80B08944 40 82 00 48 */ bne lbl_80B0898C -/* 80B08948 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80B0894C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80B08948 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80B0894C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80B08950 7C 00 07 75 */ extsb. r0, r0 /* 80B08954 40 82 00 38 */ bne lbl_80B0898C /* 80B08958 38 60 00 00 */ li r3, 0 diff --git a/asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/cutMeetingAgain__11daNpc_Uri_cFi.s b/asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/cutMeetingAgain__11daNpc_Uri_cFi.s index ccf760aea4..557eb7ce22 100644 --- a/asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/cutMeetingAgain__11daNpc_Uri_cFi.s +++ b/asm/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri/cutMeetingAgain__11daNpc_Uri_cFi.s @@ -174,8 +174,8 @@ lbl_80B29E1C: /* 80B29E2C 40 80 00 08 */ bge lbl_80B29E34 /* 80B29E30 48 00 00 54 */ b lbl_80B29E84 lbl_80B29E34: -/* 80B29E34 3C 60 80 45 */ lis r3, struct_80450BE4+0x2@ha /* 0x80450BE6@ha */ -/* 80B29E38 88 03 0B E6 */ lbz r0, struct_80450BE4+0x2@l(r3) /* 0x80450BE6@l */ +/* 80B29E34 3C 60 80 45 */ lis r3, mBlureFlag__13mDoGph_gInf_c+0x2@ha /* 0x80450BE6@ha */ +/* 80B29E38 88 03 0B E6 */ lbz r0, mBlureFlag__13mDoGph_gInf_c+0x2@l(r3) /* 0x80450BE6@l */ /* 80B29E3C 28 00 00 00 */ cmplwi r0, 0 /* 80B29E40 41 82 00 44 */ beq lbl_80B29E84 /* 80B29E44 3B A0 00 01 */ li r29, 1 diff --git a/asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/Execute__16daObj_AutoMata_cFv.s b/asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/Execute__16daObj_AutoMata_cFv.s index 5c2081a622..145da8c272 100644 --- a/asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/Execute__16daObj_AutoMata_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata/Execute__16daObj_AutoMata_cFv.s @@ -9,8 +9,8 @@ lbl_80BA60D4: /* 80BA60F0 3B E3 6C 10 */ addi r31, r3, m__22daObj_AutoMata_Param_c@l /* 0x80BA6C10@l */ /* 80BA60F4 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 80BA60F8 7C 04 07 74 */ extsb r4, r0 -/* 80BA60FC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80BA6100 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80BA60FC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80BA6100 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80BA6104 7C 00 07 74 */ extsb r0, r0 /* 80BA6108 7C 04 00 00 */ cmpw r4, r0 /* 80BA610C 40 82 02 74 */ bne lbl_80BA6380 diff --git a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CreateInit_LightBall__12daObjCarry_cFv.s b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CreateInit_LightBall__12daObjCarry_cFv.s index c382dfede4..014d459b3d 100644 --- a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CreateInit_LightBall__12daObjCarry_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/CreateInit_LightBall__12daObjCarry_cFv.s @@ -11,8 +11,8 @@ lbl_804709DC: /* 80470A00 81 8C 00 14 */ lwz r12, 0x14(r12) /* 80470A04 7D 89 03 A6 */ mtctr r12 /* 80470A08 4E 80 04 21 */ bctrl -/* 80470A0C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470A10 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470A0C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470A10 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470A14 7C 00 07 75 */ extsb. r0, r0 /* 80470A18 41 82 00 10 */ beq lbl_80470A28 /* 80470A1C 80 1F 04 9C */ lwz r0, 0x49c(r31) diff --git a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallA__12daObjCarry_cFv.s b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallA__12daObjCarry_cFv.s index 4181001516..e759ef92fe 100644 --- a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallA__12daObjCarry_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallA__12daObjCarry_cFv.s @@ -27,8 +27,8 @@ lbl_80470CF0: /* 80470D54 7F 83 E3 78 */ mr r3, r28 /* 80470D58 38 80 27 40 */ li r4, 0x2740 /* 80470D5C 4B BC 3C 49 */ bl offEventBit__11dSv_event_cFUs -/* 80470D60 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470D64 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470D60 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470D64 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470D68 7C 00 07 74 */ extsb r0, r0 /* 80470D6C 2C 00 00 33 */ cmpwi r0, 0x33 /* 80470D70 40 82 00 14 */ bne lbl_80470D84 @@ -68,8 +68,8 @@ lbl_80470DE0: /* 80470DE0 7F A3 EB 78 */ mr r3, r29 /* 80470DE4 38 80 00 01 */ li r4, 1 /* 80470DE8 4B BA BD 61 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci -/* 80470DEC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470DF0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470DEC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470DF0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470DF4 7C 00 07 75 */ extsb. r0, r0 /* 80470DF8 40 82 02 B8 */ bne lbl_804710B0 /* 80470DFC 3C 60 80 47 */ lis r3, s_setA_sub__FPvPv@ha /* 0x8046F59C@ha */ @@ -109,8 +109,8 @@ lbl_80470E1C: /* 80470E80 4B BC 3B 3D */ bl isEventBit__11dSv_event_cCFUs /* 80470E84 2C 03 00 00 */ cmpwi r3, 0 /* 80470E88 40 82 00 38 */ bne lbl_80470EC0 -/* 80470E8C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470E90 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470E8C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470E90 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470E94 2C 00 00 33 */ cmpwi r0, 0x33 /* 80470E98 41 82 02 18 */ beq lbl_804710B0 /* 80470E9C 7F E3 FB 78 */ mr r3, r31 @@ -129,8 +129,8 @@ lbl_80470EC0: /* 80470EC8 4B BC 3A F5 */ bl isEventBit__11dSv_event_cCFUs /* 80470ECC 2C 03 00 00 */ cmpwi r3, 0 /* 80470ED0 41 82 00 14 */ beq lbl_80470EE4 -/* 80470ED4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470ED8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470ED4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470ED8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470EDC 7C 00 07 75 */ extsb. r0, r0 /* 80470EE0 40 82 00 AC */ bne lbl_80470F8C lbl_80470EE4: @@ -139,8 +139,8 @@ lbl_80470EE4: /* 80470EEC 4B BC 3A D1 */ bl isEventBit__11dSv_event_cCFUs /* 80470EF0 2C 03 00 00 */ cmpwi r3, 0 /* 80470EF4 41 82 00 20 */ beq lbl_80470F14 -/* 80470EF8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470EFC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470EF8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470EFC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470F00 7C 00 07 74 */ extsb r0, r0 /* 80470F04 2C 00 00 01 */ cmpwi r0, 1 /* 80470F08 41 82 00 0C */ beq lbl_80470F14 @@ -152,8 +152,8 @@ lbl_80470F14: /* 80470F1C 4B BC 3A A1 */ bl isEventBit__11dSv_event_cCFUs /* 80470F20 2C 03 00 00 */ cmpwi r3, 0 /* 80470F24 41 82 00 14 */ beq lbl_80470F38 -/* 80470F28 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470F2C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470F28 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470F2C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470F30 2C 00 00 33 */ cmpwi r0, 0x33 /* 80470F34 40 82 00 58 */ bne lbl_80470F8C lbl_80470F38: @@ -162,8 +162,8 @@ lbl_80470F38: /* 80470F40 4B BC 3A 7D */ bl isEventBit__11dSv_event_cCFUs /* 80470F44 2C 03 00 00 */ cmpwi r3, 0 /* 80470F48 41 82 00 14 */ beq lbl_80470F5C -/* 80470F4C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470F50 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470F4C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470F50 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470F54 2C 00 00 34 */ cmpwi r0, 0x34 /* 80470F58 40 82 00 34 */ bne lbl_80470F8C lbl_80470F5C: @@ -172,8 +172,8 @@ lbl_80470F5C: /* 80470F64 4B BC 3A 59 */ bl isEventBit__11dSv_event_cCFUs /* 80470F68 2C 03 00 00 */ cmpwi r3, 0 /* 80470F6C 41 82 00 50 */ beq lbl_80470FBC -/* 80470F70 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470F74 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470F70 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470F74 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470F78 7C 00 07 74 */ extsb r0, r0 /* 80470F7C 2C 00 00 04 */ cmpwi r0, 4 /* 80470F80 41 82 00 3C */ beq lbl_80470FBC @@ -195,8 +195,8 @@ lbl_80470FB4: /* 80470FB4 38 60 00 05 */ li r3, 5 /* 80470FB8 48 00 01 7C */ b lbl_80471134 lbl_80470FBC: -/* 80470FBC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80470FC0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80470FBC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80470FC0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80470FC4 7C 00 07 75 */ extsb. r0, r0 /* 80470FC8 40 82 00 C4 */ bne lbl_8047108C /* 80470FCC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -259,8 +259,8 @@ lbl_8047108C: /* 80471094 38 60 00 05 */ li r3, 5 /* 80471098 48 00 00 9C */ b lbl_80471134 lbl_8047109C: -/* 8047109C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804710A0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8047109C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804710A0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804710A4 98 1D 04 E2 */ stb r0, 0x4e2(r29) /* 804710A8 88 1D 04 E2 */ lbz r0, 0x4e2(r29) /* 804710AC 98 1D 04 8C */ stb r0, 0x48c(r29) diff --git a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallB__12daObjCarry_cFv.s b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallB__12daObjCarry_cFv.s index 84db348cd1..69019d3e41 100644 --- a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallB__12daObjCarry_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/checkCreate_LightBallB__12daObjCarry_cFv.s @@ -27,8 +27,8 @@ lbl_8047114C: /* 804711B0 7F 83 E3 78 */ mr r3, r28 /* 804711B4 38 80 27 20 */ li r4, 0x2720 /* 804711B8 4B BC 37 ED */ bl offEventBit__11dSv_event_cFUs -/* 804711BC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804711C0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804711BC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804711C0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804711C4 7C 00 07 74 */ extsb r0, r0 /* 804711C8 2C 00 00 33 */ cmpwi r0, 0x33 /* 804711CC 40 82 00 14 */ bne lbl_804711E0 @@ -68,8 +68,8 @@ lbl_8047123C: /* 8047123C 7F A3 EB 78 */ mr r3, r29 /* 80471240 38 80 00 01 */ li r4, 1 /* 80471244 4B BA B9 05 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci -/* 80471248 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8047124C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471248 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8047124C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80471250 7C 00 07 75 */ extsb. r0, r0 /* 80471254 40 82 02 B8 */ bne lbl_8047150C /* 80471258 3C 60 80 47 */ lis r3, s_setB_sub__FPvPv@ha /* 0x8046F610@ha */ @@ -109,8 +109,8 @@ lbl_80471278: /* 804712DC 4B BC 36 E1 */ bl isEventBit__11dSv_event_cCFUs /* 804712E0 2C 03 00 00 */ cmpwi r3, 0 /* 804712E4 40 82 00 38 */ bne lbl_8047131C -/* 804712E8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804712EC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804712E8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804712EC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804712F0 2C 00 00 34 */ cmpwi r0, 0x34 /* 804712F4 41 82 02 18 */ beq lbl_8047150C /* 804712F8 7F E3 FB 78 */ mr r3, r31 @@ -129,8 +129,8 @@ lbl_8047131C: /* 80471324 4B BC 36 99 */ bl isEventBit__11dSv_event_cCFUs /* 80471328 2C 03 00 00 */ cmpwi r3, 0 /* 8047132C 41 82 00 14 */ beq lbl_80471340 -/* 80471330 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80471334 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471330 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80471334 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80471338 7C 00 07 75 */ extsb. r0, r0 /* 8047133C 40 82 00 AC */ bne lbl_804713E8 lbl_80471340: @@ -139,8 +139,8 @@ lbl_80471340: /* 80471348 4B BC 36 75 */ bl isEventBit__11dSv_event_cCFUs /* 8047134C 2C 03 00 00 */ cmpwi r3, 0 /* 80471350 41 82 00 20 */ beq lbl_80471370 -/* 80471354 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80471358 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471354 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80471358 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8047135C 7C 00 07 74 */ extsb r0, r0 /* 80471360 2C 00 00 01 */ cmpwi r0, 1 /* 80471364 41 82 00 0C */ beq lbl_80471370 @@ -152,8 +152,8 @@ lbl_80471370: /* 80471378 4B BC 36 45 */ bl isEventBit__11dSv_event_cCFUs /* 8047137C 2C 03 00 00 */ cmpwi r3, 0 /* 80471380 41 82 00 14 */ beq lbl_80471394 -/* 80471384 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80471388 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471384 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80471388 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8047138C 2C 00 00 33 */ cmpwi r0, 0x33 /* 80471390 40 82 00 58 */ bne lbl_804713E8 lbl_80471394: @@ -162,8 +162,8 @@ lbl_80471394: /* 8047139C 4B BC 36 21 */ bl isEventBit__11dSv_event_cCFUs /* 804713A0 2C 03 00 00 */ cmpwi r3, 0 /* 804713A4 41 82 00 14 */ beq lbl_804713B8 -/* 804713A8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804713AC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804713A8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804713AC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804713B0 2C 00 00 34 */ cmpwi r0, 0x34 /* 804713B4 40 82 00 34 */ bne lbl_804713E8 lbl_804713B8: @@ -172,8 +172,8 @@ lbl_804713B8: /* 804713C0 4B BC 35 FD */ bl isEventBit__11dSv_event_cCFUs /* 804713C4 2C 03 00 00 */ cmpwi r3, 0 /* 804713C8 41 82 00 50 */ beq lbl_80471418 -/* 804713CC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804713D0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804713CC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804713D0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 804713D4 7C 00 07 74 */ extsb r0, r0 /* 804713D8 2C 00 00 04 */ cmpwi r0, 4 /* 804713DC 41 82 00 3C */ beq lbl_80471418 @@ -195,8 +195,8 @@ lbl_80471410: /* 80471410 38 60 00 05 */ li r3, 5 /* 80471414 48 00 01 7C */ b lbl_80471590 lbl_80471418: -/* 80471418 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8047141C 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471418 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8047141C 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80471420 7C 00 07 75 */ extsb. r0, r0 /* 80471424 40 82 00 C4 */ bne lbl_804714E8 /* 80471428 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -259,8 +259,8 @@ lbl_804714E8: /* 804714F0 38 60 00 05 */ li r3, 5 /* 804714F4 48 00 00 9C */ b lbl_80471590 lbl_804714F8: -/* 804714F8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804714FC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804714F8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804714FC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80471500 98 1D 04 E2 */ stb r0, 0x4e2(r29) /* 80471504 88 1D 04 E2 */ lbz r0, 0x4e2(r29) /* 80471508 98 1D 04 8C */ stb r0, 0x48c(r29) diff --git a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/draw__12daObjCarry_cFv.s b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/draw__12daObjCarry_cFv.s index ecc775ffc3..8cbd2b03e7 100644 --- a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/draw__12daObjCarry_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/draw__12daObjCarry_cFv.s @@ -62,8 +62,8 @@ lbl_80472538: lbl_8047253C: /* 8047253C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80472540 41 82 01 24 */ beq lbl_80472664 -/* 80472544 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80472548 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80472544 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80472548 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8047254C 7C 00 07 75 */ extsb. r0, r0 /* 80472550 40 82 01 14 */ bne lbl_80472664 /* 80472554 80 7A 05 70 */ lwz r3, 0x570(r26) diff --git a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/execute__12daObjCarry_cFv.s b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/execute__12daObjCarry_cFv.s index efa73f4835..3430c4f895 100644 --- a/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/execute__12daObjCarry_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry/execute__12daObjCarry_cFv.s @@ -418,8 +418,8 @@ lbl_80471ED0: lbl_80471ED4: /* 80471ED4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80471ED8 41 82 00 20 */ beq lbl_80471EF8 -/* 80471EDC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80471EE0 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80471EDC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80471EE0 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80471EE4 7C 00 07 75 */ extsb. r0, r0 /* 80471EE8 40 82 00 10 */ bne lbl_80471EF8 lbl_80471EEC: diff --git a/asm/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor/create__12daObjCdoor_cFv.s b/asm/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor/create__12daObjCdoor_cFv.s index da1b659e06..8f4a253048 100644 --- a/asm/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor/create__12daObjCdoor_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor/create__12daObjCdoor_cFv.s @@ -73,8 +73,8 @@ lbl_80BC7040: /* 80BC7040 80 7E 05 A8 */ lwz r3, 0x5a8(r30) /* 80BC7044 38 03 00 24 */ addi r0, r3, 0x24 /* 80BC7048 90 1E 05 04 */ stw r0, 0x504(r30) -/* 80BC704C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80BC7050 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80BC704C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80BC7050 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80BC7054 98 1E 04 8C */ stb r0, 0x48c(r30) /* 80BC7058 80 7E 05 A8 */ lwz r3, 0x5a8(r30) /* 80BC705C 80 83 00 04 */ lwz r4, 4(r3) diff --git a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s index 5dd58b964c..10629c9566 100644 --- a/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace/create__12daObjDigpl_cFv.s @@ -86,8 +86,8 @@ lbl_8057C070: /* 8057C0D4 D0 1E 05 3C */ stfs f0, 0x53c(r30) /* 8057C0D8 C0 1E 05 58 */ lfs f0, 0x558(r30) /* 8057C0DC D0 1E 05 40 */ stfs f0, 0x540(r30) -/* 8057C0E0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8057C0E4 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8057C0E0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8057C0E4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8057C0E8 98 1E 04 8C */ stb r0, 0x48c(r30) /* 8057C0EC 7F C3 F3 78 */ mr r3, r30 /* 8057C0F0 C0 3F 00 00 */ lfs f1, 0(r31) diff --git a/asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/create__13daObjFchain_cFv.s b/asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/create__13daObjFchain_cFv.s index de4f8c3e47..eb1ca54755 100644 --- a/asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/create__13daObjFchain_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain/create__13daObjFchain_cFv.s @@ -86,8 +86,8 @@ lbl_80BE619C: /* 80BE61B8 38 60 00 05 */ li r3, 5 /* 80BE61BC 48 00 01 34 */ b lbl_80BE62F0 lbl_80BE61C0: -/* 80BE61C0 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80BE61C4 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80BE61C0 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80BE61C4 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80BE61C8 98 1E 04 8C */ stb r0, 0x48c(r30) /* 80BE61CC 93 DE 05 80 */ stw r30, 0x580(r30) /* 80BE61D0 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) diff --git a/asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/create__15daObj_ItaMato_cFv.s b/asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/create__15daObj_ItaMato_cFv.s index 9f851baea2..fa3245c0e0 100644 --- a/asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/create__15daObj_ItaMato_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato/create__15daObj_ItaMato_cFv.s @@ -222,8 +222,8 @@ lbl_80C29A40: /* 80C29A78 4B 73 EF 1D */ bl strcmp /* 80C29A7C 2C 03 00 00 */ cmpwi r3, 0 /* 80C29A80 40 82 00 1C */ bne lbl_80C29A9C -/* 80C29A84 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80C29A88 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80C29A84 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80C29A88 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80C29A8C 2C 00 00 01 */ cmpwi r0, 1 /* 80C29A90 40 82 00 0C */ bne lbl_80C29A9C /* 80C29A94 38 00 00 01 */ li r0, 1 diff --git a/asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/Execute__15daObj_KBacket_cFv.s b/asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/Execute__15daObj_KBacket_cFv.s index 183d156967..5bc44e17a1 100644 --- a/asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/Execute__15daObj_KBacket_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket/Execute__15daObj_KBacket_cFv.s @@ -779,8 +779,8 @@ lbl_805871F0: /* 805872AC 48 00 03 15 */ bl setEnvTevColor__15daObj_KBacket_cFv /* 805872B0 7F 63 DB 78 */ mr r3, r27 /* 805872B4 48 00 03 69 */ bl setRoomNo__15daObj_KBacket_cFv -/* 805872B8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 805872BC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 805872B8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 805872BC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 805872C0 7C 03 07 74 */ extsb r3, r0 /* 805872C4 88 1B 04 E2 */ lbz r0, 0x4e2(r27) /* 805872C8 7C 00 07 74 */ extsb r0, r0 diff --git a/asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/daObj_Kbox_Execute__FP14obj_kbox_class.s b/asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/daObj_Kbox_Execute__FP14obj_kbox_class.s index 74ccb56937..3c413eeda0 100644 --- a/asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/daObj_Kbox_Execute__FP14obj_kbox_class.s +++ b/asm/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox/daObj_Kbox_Execute__FP14obj_kbox_class.s @@ -55,8 +55,8 @@ lbl_80C3E948: /* 80C3E9B0 7F E3 FB 78 */ mr r3, r31 /* 80C3E9B4 4B FF ED 99 */ bl break_eff__FP14obj_kbox_class /* 80C3E9B8 38 00 00 03 */ li r0, 3 -/* 80C3E9BC 3C 60 80 45 */ lis r3, struct_80451124+0x1@ha /* 0x80451125@ha */ -/* 80C3E9C0 98 03 11 25 */ stb r0, struct_80451124+0x1@l(r3) /* 0x80451125@l */ +/* 80C3E9BC 3C 60 80 45 */ lis r3, pauseTimer__9dScnPly_c+0x1@ha /* 0x80451125@ha */ +/* 80C3E9C0 98 03 11 25 */ stb r0, pauseTimer__9dScnPly_c+0x1@l(r3) /* 0x80451125@l */ /* 80C3E9C4 3C 60 00 08 */ lis r3, 0x0008 /* 0x0008014E@ha */ /* 80C3E9C8 38 03 01 4E */ addi r0, r3, 0x014E /* 0x0008014E@l */ /* 80C3E9CC 90 01 00 08 */ stw r0, 8(r1) diff --git a/asm/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge/checkE3Special__14daObjRBridge_cFv.s b/asm/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge/checkE3Special__14daObjRBridge_cFv.s index 9714a722ea..9cc1a35d22 100644 --- a/asm/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge/checkE3Special__14daObjRBridge_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge/checkE3Special__14daObjRBridge_cFv.s @@ -11,8 +11,8 @@ lbl_80595F84: /* 80595FA8 4B DD 29 ED */ bl strcmp /* 80595FAC 2C 03 00 00 */ cmpwi r3, 0 /* 80595FB0 40 82 00 1C */ bne lbl_80595FCC -/* 80595FB4 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80595FB8 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80595FB4 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80595FB8 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80595FBC 2C 00 00 07 */ cmpwi r0, 7 /* 80595FC0 40 82 00 0C */ bne lbl_80595FCC /* 80595FC4 38 60 00 01 */ li r3, 1 diff --git a/asm/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten/Execute__13daObj_Roten_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten/Execute__13daObj_Roten_cFPPA3_A4_f.s index 1a41be8319..d3066c7e62 100644 --- a/asm/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten/Execute__13daObj_Roten_cFPPA3_A4_f.s +++ b/asm/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten/Execute__13daObj_Roten_cFPPA3_A4_f.s @@ -9,8 +9,8 @@ lbl_80CC1038: /* 80CC1054 88 03 05 C4 */ lbz r0, 0x5c4(r3) /* 80CC1058 28 00 00 00 */ cmplwi r0, 0 /* 80CC105C 41 82 00 B0 */ beq lbl_80CC110C -/* 80CC1060 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80CC1064 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80CC1060 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80CC1064 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80CC1068 88 63 00 00 */ lbz r3, 0(r3) /* 80CC106C 7C 63 07 75 */ extsb. r3, r3 /* 80CC1070 41 82 00 54 */ beq lbl_80CC10C4 diff --git a/asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Execute__14daObj_Sekizo_cFPPA3_A4_f.s b/asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Execute__14daObj_Sekizo_cFPPA3_A4_f.s index 1d70a13009..67a7dd2c82 100644 --- a/asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Execute__14daObj_Sekizo_cFPPA3_A4_f.s +++ b/asm/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo/Execute__14daObj_Sekizo_cFPPA3_A4_f.s @@ -6,8 +6,8 @@ lbl_80CCDE3C: /* 80CCDE4C 7C 7F 1B 78 */ mr r31, r3 /* 80CCDE50 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 80CCDE54 7C 06 07 74 */ extsb r6, r0 -/* 80CCDE58 3C A0 80 45 */ lis r5, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80CCDE5C 88 05 0D 64 */ lbz r0, struct_80450D64+0x0@l(r5) /* 0x80450D64@l */ +/* 80CCDE58 3C A0 80 45 */ lis r5, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80CCDE5C 88 05 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r5) /* 0x80450D64@l */ /* 80CCDE60 7C 00 07 74 */ extsb r0, r0 /* 80CCDE64 7C 06 00 00 */ cmpw r6, r0 /* 80CCDE68 40 82 00 74 */ bne lbl_80CCDEDC diff --git a/asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/Execute__14daObj_SMTile_cFv.s b/asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/Execute__14daObj_SMTile_cFv.s index 4da5d481f2..5d3f11f26e 100644 --- a/asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/Execute__14daObj_SMTile_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile/Execute__14daObj_SMTile_cFv.s @@ -9,8 +9,8 @@ lbl_80CDD71C: /* 80CDD738 3B E3 E3 5C */ addi r31, r3, m__20daObj_SMTile_Param_c@l /* 0x80CDE35C@l */ /* 80CDD73C 88 1E 04 BA */ lbz r0, 0x4ba(r30) /* 80CDD740 7C 04 07 74 */ extsb r4, r0 -/* 80CDD744 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80CDD748 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80CDD744 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80CDD748 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80CDD74C 7C 00 07 74 */ extsb r0, r0 /* 80CDD750 7C 04 00 00 */ cmpw r4, r0 /* 80CDD754 40 82 03 28 */ bne lbl_80CDDA7C diff --git a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/actionRun__14daObjSwBallB_cFv.s b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/actionRun__14daObjSwBallB_cFv.s index f8760f8661..ed45f5e2ee 100644 --- a/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/actionRun__14daObjSwBallB_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB/actionRun__14daObjSwBallB_cFv.s @@ -96,8 +96,8 @@ lbl_80CF5010: /* 80CF5020 C0 1E 00 3C */ lfs f0, 0x3c(r30) /* 80CF5024 80 7F 05 88 */ lwz r3, 0x588(r31) /* 80CF5028 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 80CF502C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80CF5030 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80CF502C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80CF5030 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80CF5034 7C 00 07 75 */ extsb. r0, r0 /* 80CF5038 41 82 00 20 */ beq lbl_80CF5058 /* 80CF503C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ @@ -137,8 +137,8 @@ lbl_80CF50B8: /* 80CF50BC 4B 31 83 6D */ bl play__14mDoExt_baseAnmFv /* 80CF50C0 2C 03 00 00 */ cmpwi r3, 0 /* 80CF50C4 41 82 01 18 */ beq lbl_80CF51DC -/* 80CF50C8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80CF50CC 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80CF50C8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80CF50CC 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80CF50D0 7C 00 07 75 */ extsb. r0, r0 /* 80CF50D4 40 82 00 CC */ bne lbl_80CF51A0 /* 80CF50D8 80 1F 05 9C */ lwz r0, 0x59c(r31) diff --git a/asm/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain/create__13daObjWchain_cFv.s b/asm/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain/create__13daObjWchain_cFv.s index 71b6ea4759..08c98616b1 100644 --- a/asm/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain/create__13daObjWchain_cFv.s +++ b/asm/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain/create__13daObjWchain_cFv.s @@ -88,8 +88,8 @@ lbl_80D300EC: /* 80D30108 38 60 00 05 */ li r3, 5 /* 80D3010C 48 00 02 50 */ b lbl_80D3035C lbl_80D30110: -/* 80D30110 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D30114 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80D30110 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D30114 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80D30118 98 1D 04 8C */ stb r0, 0x48c(r29) /* 80D3011C C0 1D 04 D0 */ lfs f0, 0x4d0(r29) /* 80D30120 D0 1D 05 50 */ stfs f0, 0x550(r29) diff --git a/asm/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato/Execute__15daTag_AllMato_cFv.s b/asm/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato/Execute__15daTag_AllMato_cFv.s index 09707d7235..4b394c2e20 100644 --- a/asm/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato/Execute__15daTag_AllMato_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato/Execute__15daTag_AllMato_cFv.s @@ -7,8 +7,8 @@ lbl_804876B8: /* 804876CC 7C 7B 1B 78 */ mr r27, r3 /* 804876D0 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 804876D4 7C 05 07 74 */ extsb r5, r0 -/* 804876D8 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 804876DC 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 804876D8 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 804876DC 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 804876E0 7C 00 07 74 */ extsb r0, r0 /* 804876E4 7C 05 00 00 */ cmpw r5, r0 /* 804876E8 40 82 05 58 */ bne lbl_80487C40 diff --git a/asm/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera/execute__11daTag_Cam_cFv.s b/asm/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera/execute__11daTag_Cam_cFv.s index ff6f767891..1b8d8e2b14 100644 --- a/asm/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera/execute__11daTag_Cam_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera/execute__11daTag_Cam_cFv.s @@ -9,8 +9,8 @@ lbl_80489F74: /* 80489F90 3B E4 A5 90 */ addi r31, r4, lit_3874@l /* 0x8048A590@l */ /* 80489F94 88 03 04 E2 */ lbz r0, 0x4e2(r3) /* 80489F98 7C 05 07 74 */ extsb r5, r0 -/* 80489F9C 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80489FA0 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 80489F9C 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80489FA0 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 80489FA4 7C 00 07 74 */ extsb r0, r0 /* 80489FA8 7C 05 00 00 */ cmpw r5, r0 /* 80489FAC 41 82 00 0C */ beq lbl_80489FB8 diff --git a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s b/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s index 356c5b0eef..5730903e92 100644 --- a/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint/execute__11daTag_Chk_cFv.s @@ -9,8 +9,8 @@ lbl_8048A6F8: /* 8048A714 3B E3 AC 28 */ addi r31, r3, lit_3769@l /* 0x8048AC28@l */ /* 8048A718 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 8048A71C 7C 05 07 74 */ extsb r5, r0 -/* 8048A720 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048A724 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8048A720 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048A724 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8048A728 7C 00 07 74 */ extsb r0, r0 /* 8048A72C 7C 05 00 00 */ cmpw r5, r0 /* 8048A730 41 82 00 0C */ beq lbl_8048A73C diff --git a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s index cf38bc8974..d5fa3e64a1 100644 --- a/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_event/d_a_tag_event/execute__13daTag_Event_cFv.s @@ -4,8 +4,8 @@ lbl_8048B6D4: /* 8048B6DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8048B6E0 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 8048B6E4 7C 05 07 74 */ extsb r5, r0 -/* 8048B6E8 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048B6EC 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048B6E8 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048B6EC 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048B6F0 7C 00 07 74 */ extsb r0, r0 /* 8048B6F4 7C 05 00 00 */ cmpw r5, r0 /* 8048B6F8 41 82 00 0C */ beq lbl_8048B704 diff --git a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s index dc7f2c0464..e06a7dbae9 100644 --- a/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt/execute__11daTag_Evt_cFv.s @@ -22,8 +22,8 @@ lbl_8048BA0C: /* 8048BA5C D0 03 05 54 */ stfs f0, 0x554(r3) /* 8048BA60 C0 03 05 40 */ lfs f0, 0x540(r3) /* 8048BA64 D0 03 05 58 */ stfs f0, 0x558(r3) -/* 8048BA68 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048BA6C 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048BA68 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048BA6C 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048BA70 98 03 04 E2 */ stb r0, 0x4e2(r3) /* 8048BA74 88 83 05 E4 */ lbz r4, 0x5e4(r3) /* 8048BA78 7C 80 07 75 */ extsb. r0, r4 diff --git a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s index 5782d6cdde..c75e965dac 100644 --- a/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea/Execute__15daTag_EvtArea_cFv.s @@ -7,8 +7,8 @@ lbl_8048C730: /* 8048C744 7C 7F 1B 78 */ mr r31, r3 /* 8048C748 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 8048C74C 7C 05 07 74 */ extsb r5, r0 -/* 8048C750 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048C754 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048C750 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048C754 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048C758 7C 00 07 74 */ extsb r0, r0 /* 8048C75C 7C 05 00 00 */ cmpw r5, r0 /* 8048C760 40 82 01 18 */ bne lbl_8048C878 diff --git a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s index c2e2b0de47..6365b1532c 100644 --- a/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg/Execute__14daTag_EvtMsg_cFv.s @@ -12,8 +12,8 @@ lbl_8048D01C: /* 8048D044 3B DF 4F F8 */ addi r30, r31, 0x4ff8 /* 8048D048 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 8048D04C 7C 05 07 74 */ extsb r5, r0 -/* 8048D050 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048D054 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048D050 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048D054 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048D058 7C 00 07 74 */ extsb r0, r0 /* 8048D05C 7C 05 00 00 */ cmpw r5, r0 /* 8048D060 40 82 02 A0 */ bne lbl_8048D300 diff --git a/asm/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl/execute__12daTag_Howl_cFv.s b/asm/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl/execute__12daTag_Howl_cFv.s index 680f4d551b..d655935de6 100644 --- a/asm/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl/execute__12daTag_Howl_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl/execute__12daTag_Howl_cFv.s @@ -4,8 +4,8 @@ lbl_8048D9C4: /* 8048D9CC 90 01 00 14 */ stw r0, 0x14(r1) /* 8048D9D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8048D9D4 7C 7F 1B 78 */ mr r31, r3 -/* 8048D9D8 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048D9DC 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048D9D8 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048D9DC 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048D9E0 98 03 04 E2 */ stb r0, 0x4e2(r3) /* 8048D9E4 38 00 00 00 */ li r0, 0 /* 8048D9E8 90 03 05 5C */ stw r0, 0x55c(r3) diff --git a/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitFall__15daTagKagoFall_cFv.s b/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitFall__15daTagKagoFall_cFv.s index fa9870278b..16eded630e 100644 --- a/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitFall__15daTagKagoFall_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitFall__15daTagKagoFall_cFv.s @@ -267,8 +267,8 @@ lbl_80D5A5A0: /* 80D5A604 4B 2C CB 6D */ bl dStage_changeScene__FifUlScsi /* 80D5A608 48 00 00 54 */ b lbl_80D5A65C lbl_80D5A60C: -/* 80D5A60C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D5A610 8B 83 0D 64 */ lbz r28, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80D5A60C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D5A610 8B 83 0D 64 */ lbz r28, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80D5A614 7F 9C 07 74 */ extsb r28, r28 /* 80D5A618 38 60 00 00 */ li r3, 0 /* 80D5A61C 4B 2D 23 61 */ bl getLayerNo__14dComIfG_play_cFi diff --git a/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitRiver__15daTagKagoFall_cFv.s b/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitRiver__15daTagKagoFall_cFv.s index 96f77e7113..6f1bba27c7 100644 --- a/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitRiver__15daTagKagoFall_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall/actionWaitRiver__15daTagKagoFall_cFv.s @@ -241,8 +241,8 @@ lbl_80D5A14C: /* 80D5A1A0 4B 2C CF D1 */ bl dStage_changeScene__FifUlScsi /* 80D5A1A4 48 00 00 54 */ b lbl_80D5A1F8 lbl_80D5A1A8: -/* 80D5A1A8 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D5A1AC 8B 63 0D 64 */ lbz r27, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 80D5A1A8 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D5A1AC 8B 63 0D 64 */ lbz r27, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80D5A1B0 7F 7B 07 74 */ extsb r27, r27 /* 80D5A1B4 38 60 00 00 */ li r3, 0 /* 80D5A1B8 4B 2D 27 C5 */ bl getLayerNo__14dComIfG_play_cFi diff --git a/asm/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg/Execute__12daTag_KMsg_cFv.s b/asm/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg/Execute__12daTag_KMsg_cFv.s index 28c6c9038e..5689f3919e 100644 --- a/asm/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg/Execute__12daTag_KMsg_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg/Execute__12daTag_KMsg_cFv.s @@ -12,8 +12,8 @@ lbl_8048E010: /* 8048E038 3B 80 00 00 */ li r28, 0 /* 8048E03C 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 8048E040 7C 05 07 74 */ extsb r5, r0 -/* 8048E044 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048E048 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048E044 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048E048 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048E04C 7C 00 07 74 */ extsb r0, r0 /* 8048E050 7C 05 00 00 */ cmpw r5, r0 /* 8048E054 40 82 08 40 */ bne lbl_8048E894 diff --git a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s index 8b169c1d26..213a7f52cd 100644 --- a/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern/Execute__15daTag_Lantern_cFv.s @@ -76,8 +76,8 @@ lbl_8048EEAC: /* 8048EEF8 98 7F 04 8D */ stb r3, 0x48d(r31) /* 8048EEFC 48 00 00 10 */ b lbl_8048EF0C lbl_8048EF00: -/* 8048EF00 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048EF04 8B A3 0D 64 */ lbz r29, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 8048EF00 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048EF04 8B A3 0D 64 */ lbz r29, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 8048EF08 7F BD 07 74 */ extsb r29, r29 lbl_8048EF0C: /* 8048EF0C 9B BF 04 8C */ stb r29, 0x48c(r31) diff --git a/asm/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg/execute__11daTag_Msg_cFv.s b/asm/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg/execute__11daTag_Msg_cFv.s index 91839bddf6..2104908cca 100644 --- a/asm/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg/execute__11daTag_Msg_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg/execute__11daTag_Msg_cFv.s @@ -6,8 +6,8 @@ lbl_8048F9E8: /* 8048F9F8 4B ED 27 D9 */ bl _savegpr_26 /* 8048F9FC 7C 7D 1B 78 */ mr r29, r3 /* 8048FA00 3B C0 00 01 */ li r30, 1 -/* 8048FA04 3C 80 80 45 */ lis r4, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 8048FA08 88 04 0D 64 */ lbz r0, struct_80450D64+0x0@l(r4) /* 0x80450D64@l */ +/* 8048FA04 3C 80 80 45 */ lis r4, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 8048FA08 88 04 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r4) /* 0x80450D64@l */ /* 8048FA0C 98 03 04 E2 */ stb r0, 0x4e2(r3) /* 8048FA10 C0 43 04 D8 */ lfs f2, 0x4d8(r3) /* 8048FA14 3C 80 80 49 */ lis r4, lit_3757@ha /* 0x8049017C@ha */ diff --git a/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/Execute__17daTag_MynaLight_cFv.s b/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/Execute__17daTag_MynaLight_cFv.s index c2dbd1f6ae..506e0f6b34 100644 --- a/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/Execute__17daTag_MynaLight_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/Execute__17daTag_MynaLight_cFv.s @@ -61,8 +61,8 @@ lbl_80D5CCD0: /* 80D5CCD0 88 1E 05 79 */ lbz r0, 0x579(r30) /* 80D5CCD4 28 00 00 00 */ cmplwi r0, 0 /* 80D5CCD8 41 82 00 A0 */ beq lbl_80D5CD78 -/* 80D5CCDC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D5CCE0 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80D5CCDC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D5CCE0 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80D5CCE4 88 63 00 00 */ lbz r3, 0(r3) /* 80D5CCE8 7C 63 07 75 */ extsb. r3, r3 /* 80D5CCEC 41 82 00 4C */ beq lbl_80D5CD38 diff --git a/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/setTurnOnOffChange__17daTag_MynaLight_cFv.s b/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/setTurnOnOffChange__17daTag_MynaLight_cFv.s index 2b6741ef9d..584d02c76e 100644 --- a/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/setTurnOnOffChange__17daTag_MynaLight_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light/setTurnOnOffChange__17daTag_MynaLight_cFv.s @@ -18,8 +18,8 @@ lbl_80D5CE40: /* 80D5CE80 88 1E 05 79 */ lbz r0, 0x579(r30) /* 80D5CE84 28 00 00 00 */ cmplwi r0, 0 /* 80D5CE88 41 82 01 B8 */ beq lbl_80D5D040 -/* 80D5CE8C 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D5CE90 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80D5CE8C 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D5CE90 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80D5CE94 88 63 00 00 */ lbz r3, 0(r3) /* 80D5CE98 7C 63 07 75 */ extsb. r3, r3 /* 80D5CE9C 41 82 00 4C */ beq lbl_80D5CEE8 @@ -131,8 +131,8 @@ lbl_80D5CFE0: /* 80D5D038 90 7E 05 74 */ stw r3, 0x574(r30) /* 80D5D03C 48 00 00 F0 */ b lbl_80D5D12C lbl_80D5D040: -/* 80D5D040 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D5D044 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80D5D040 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D5D044 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80D5D048 88 63 00 00 */ lbz r3, 0(r3) /* 80D5D04C 7C 63 07 75 */ extsb. r3, r3 /* 80D5D050 41 82 00 4C */ beq lbl_80D5D09C diff --git a/asm/rel/d/a/tag/d_a_tag_push/d_a_tag_push/Execute__12daTag_Push_cFv.s b/asm/rel/d/a/tag/d_a_tag_push/d_a_tag_push/Execute__12daTag_Push_cFv.s index 306cde21b8..58d377419a 100644 --- a/asm/rel/d/a/tag/d_a_tag_push/d_a_tag_push/Execute__12daTag_Push_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_push/d_a_tag_push/Execute__12daTag_Push_cFv.s @@ -7,8 +7,8 @@ lbl_804904DC: /* 804904F0 7C 7E 1B 78 */ mr r30, r3 /* 804904F4 88 03 04 BA */ lbz r0, 0x4ba(r3) /* 804904F8 7C 04 07 74 */ extsb r4, r0 -/* 804904FC 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80490500 88 03 0D 64 */ lbz r0, struct_80450D64+0x0@l(r3) /* 0x80450D64@l */ +/* 804904FC 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80490500 88 03 0D 64 */ lbz r0, mStayNo__20dStage_roomControl_c+0x0@l(r3) /* 0x80450D64@l */ /* 80490504 7C 00 07 74 */ extsb r0, r0 /* 80490508 7C 04 00 00 */ cmpw r4, r0 /* 8049050C 40 82 01 94 */ bne lbl_804906A0 diff --git a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s index 5acd5ace15..071ca40fa9 100644 --- a/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s +++ b/asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/execute__14daTagRestart_cFv.s @@ -45,8 +45,8 @@ lbl_80D60560: /* 80D6060C C0 1D 05 8C */ lfs f0, 0x58c(r29) /* 80D60610 FC 00 10 40 */ fcmpo cr0, f0, f2 /* 80D60614 40 81 01 0C */ ble lbl_80D60720 -/* 80D60618 3C 60 80 45 */ lis r3, struct_80450D64+0x0@ha /* 0x80450D64@ha */ -/* 80D6061C 38 63 0D 64 */ addi r3, r3, struct_80450D64+0x0@l /* 0x80450D64@l */ +/* 80D60618 3C 60 80 45 */ lis r3, mStayNo__20dStage_roomControl_c+0x0@ha /* 0x80450D64@ha */ +/* 80D6061C 38 63 0D 64 */ addi r3, r3, mStayNo__20dStage_roomControl_c+0x0@l /* 0x80450D64@l */ /* 80D60620 88 63 00 00 */ lbz r3, 0(r3) /* 80D60624 7C 63 07 74 */ extsb r3, r3 /* 80D60628 88 1D 05 68 */ lbz r0, 0x568(r29) diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h index 8259b27c94..e6bf5bb59a 100644 --- a/include/JSystem/J2DGraph/J2DOrthoGraph.h +++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h @@ -15,9 +15,15 @@ public: /* 802E97B4 */ virtual void setPort(); /* 802E9C88 */ virtual s32 getGrafType() const { return 1; } /* 802E9840 */ virtual void setLookat(); + f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); } f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); } + void setOrtho(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5) { + JGeometry::TBox2 ortho(param_0, param_1, param_0 + param_2, param_1 + param_3); + setOrtho(ortho, param_4, param_5); + } + private: /* 0xBC */ JGeometry::TBox2 mOrtho; /* 0xCC */ f32 mNear; diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index c2af88aa20..6653617fc8 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -134,6 +134,7 @@ public: void animationTransform(); void updateTransform(const J2DAnmTransform* transform); void setUserInfo(u64 info) { mUserInfoTag = info; } + const Mtx* getMtx() const { return &mPositionMtx; } static JGeometry::TBox2 static_mBounds; diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index ba81b38f62..6535cfc1eb 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -40,8 +40,8 @@ public: /* 80254408 */ virtual bool setBlack(JUtility::TColor); /* 80186C84 */ virtual void setWhite(JUtility::TColor); /* 8019230C */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 801DFA34 */ virtual void getBlack() const; - /* 801DFA28 */ virtual void getWhite() const; + /* 801DFA34 */ virtual JUtility::TColor getBlack() const; + /* 801DFA28 */ virtual JUtility::TColor getWhite() const; /* 8025602C */ virtual bool getMaterial() const; /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2 const&, ResFONT const*, char const*, s16, diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index ce4ab4b4e5..778236d80f 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -12,13 +12,9 @@ public: /* 0x00 */ Vec mLightPosition; /* 0x0C */ Vec mLightDirection; - /* 0x18 */ _GXColor mColor; - /* 0x1C */ f32 mA0; - /* 0x20 */ f32 mA1; - /* 0x24 */ f32 mA2; - /* 0x28 */ f32 mK0; - /* 0x2C */ f32 mK1; - /* 0x30 */ f32 mK2; + /* 0x18 */ GXColor mColor; + /* 0x1C */ Vec mCosAtten; + /* 0x28 */ Vec mDistAtten; }; // Size = 0x34 extern "C" extern J3DLightInfo const j3dDefaultLightInfo; diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h index aa8c84480f..d6fbdfed73 100644 --- a/include/JSystem/JSupport/JSUMemoryStream.h +++ b/include/JSystem/JSupport/JSUMemoryStream.h @@ -4,11 +4,11 @@ #include "JSystem/JSupport/JSURandomInputStream.h" #include "dolphin/types.h" -class JSUMemoryInputStream : JSURandomInputStream { +class JSUMemoryInputStream : public JSURandomInputStream { public: JSUMemoryInputStream(const void* res, u32 size) { setBuffer(res, size); } - /* 802552B8 */ ~JSUMemoryInputStream() {} + /* 802552B8 */ virtual ~JSUMemoryInputStream() {} /* 802DC520 */ void setBuffer(void const*, s32); /* 802DC534 */ u32 readData(void*, s32); /* 802DC5AC */ s32 seekPos(s32, JSUStreamSeekFrom); diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 49a5a0315e..707b63e2f8 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -26,8 +26,7 @@ enum { }; } -extern bool struct_80451500; -extern bool struct_80451501; // sResetOccured +extern bool sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset; struct JUTGamePadRecordBase { virtual void unk0() {} @@ -75,7 +74,7 @@ public: PADSetAnalogMode(mode); } - static void clearResetOccurred() { struct_80451501 = false; } + static void clearResetOccurred() { C3ButtonReset::sResetOccurred = false; } static void setResetCallback(callbackFn callback, void* param_0) { C3ButtonReset::sCallback = callback; @@ -165,6 +164,8 @@ public: static void* sCallbackArg; static OSTime sThreshold; static s32 sResetOccurredPort; + static bool sResetOccurred; + static bool sResetSwitchPushing; /* 0x0 */ bool mReset; }; // Size: 0x4 diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index 135b9d6968..5a1ec56f38 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -47,7 +47,7 @@ public: void setHeightVolMod(bool, u32); void setTimeProcVolMod(bool, u32); void processBgmFramework(); - void checkBgmIDPlaying(u32); + bool checkBgmIDPlaying(u32); void getChildTrackVolume(JAISoundHandle*, int); void setChildTrackVolume(JAISoundHandle*, int, float, u32, float, float); void resetBattleBgmParams(); @@ -122,4 +122,179 @@ private: /* 0xD0 */ u8 mFlags; }; // Size = 0xD4 +enum Z2BgmID { + Z2BGM_FIELD_LINK_DAY = 0x1000000, + Z2BGM_FIELD_LINK_NIGHT = 0x1000001, + Z2BGM_FIELD = 0x1000002, + Z2BGM_DUNGEON = 0x1000003, + Z2BGM_HORSE_BATTLE = 0x1000004, + Z2BGM_TOAL_VILLEGE = 0x1000005, + Z2BGM_COWBOY_GAME = 0x1000006, + Z2BGM_FACE_OFF_BATTLE = 0x1000007, + Z2BGM_BOOMERAMG_MONKEY = 0x1000008, + Z2BGM_DUNGEON_FOREST = 0x1000009, + Z2BGM_ITEM_GET = 0x100000A, + Z2BGM_ITEM_GET_MINI = 0x100000B, + Z2BGM_BOSSBABA_0 = 0x100000C, + Z2BGM_BOSSBABA_1 = 0x100000D, + Z2BGM_BOSSBABA_2 = 0x100000E, + Z2BGM_BATTLE_NORMAL = 0x100000F, + Z2BGM_RANCH = 0x1000010, + Z2BGM_WILD_GOAT = 0x1000011, + Z2BGM_OPEN_BOX = 0x1000012, + Z2BGM_GAME_OVER = 0x1000013, + Z2BGM_ITEM_GET_ME = 0x1000014, + Z2BGM_HORSE_BATTLE_D02 = 0x1000015, + Z2BGM_TWILIGHT = 0x1000016, + Z2BGM_EVENT01 = 0x1000017, + Z2BGM_DUNGEON_LV2 = 0x1000018, + Z2BGM_TOAL_NIGHT = 0x1000019, + Z2BGM_DEATH_MOUNTAIN01 = 0x100001A, + Z2BGM_BATTLE_TWILIGHT = 0x100001B, + Z2BGM_HEART_GET = 0x100001C, + Z2BGM_MAGNE_GORON = 0x100001D, + Z2BGM_SHOP01 = 0x100001E, + Z2BGM_SHOP02 = 0x100001F, + Z2BGM_DUNGEON_LV3 = 0x1000020, + Z2BGM_MAGNE_GORON_D01 = 0x1000021, + Z2BGM_MAGNE_GORON_D02 = 0x1000022, + Z2BGM_FILONE_FOREST = 0x1000023, + Z2BGM_SUMO = 0x1000024, + Z2BGM_BOSSFIREMAN_0 = 0x1000025, + Z2BGM_KAKARIKO = 0x1000026, + Z2BGM_DEKUTOAD = 0x1000027, + Z2BGM_DEKUTOAD_D01 = 0x1000028, + Z2BGM_RODEO = 0x1000029, + Z2BGM_BOSSFIREMAN_1 = 0x100002A, + Z2BGM_SUMO_D1 = 0x100002B, + Z2BGM_INDOOR = 0x100002C, + Z2BGM_DUNGEON_LV4 = 0x100002D, + Z2BGM_STATUE_GAME = 0x100002E, + Z2BGM_EVENT02 = 0x100002F, + Z2BGM_BOSS_OCTAEEL_0 = 0x1000030, + Z2BGM_BOSS_OCTAEEL_1 = 0x1000031, + Z2BGM_BOSS_OCTAEEL_D01 = 0x1000032, + Z2BGM_BOSS_OCTAEEL_D02 = 0x1000033, + Z2BGM_DESERT = 0x1000034, + Z2BGM_ZORA_VILLAGE = 0x1000035, + Z2BGM_BRIDGE_ON_FIRE = 0x1000036, + Z2BGM_DUNGEON_LV5 = 0x1000037, + Z2BGM_DEMO10 = 0x1000038, + Z2BGM_VARIANT = 0x1000039, + Z2BGM_CARGO_GAME_TW = 0x100003A, + Z2BGM_CASTLE_TOWN = 0x100003B, + Z2BGM_DUNGEON_LV6 = 0x100003C, + Z2BGM_DUNGEON_LV7 = 0x100003D, + Z2BGM_DUNGEON_LV8 = 0x100003E, + Z2BGM_DUNGEON_LV9_02 = 0x100003F, + Z2BGM_DEATH_MOUNTAIN02 = 0x1000040, + Z2BGM_HOLY_FOREST = 0x1000041, + Z2BGM_FISHING = 0x1000042, + Z2BGM_FISHING_BARE = 0x1000043, + Z2BGM_FISHING_GET1 = 0x1000044, + Z2BGM_FISHING_GET2 = 0x1000045, + Z2BGM_FISHING_GET3 = 0x1000046, + Z2BGM_LUTERA1 = 0x1000047, + Z2BGM_LUTERA2 = 0x1000048, + Z2BGM_FISHING_HIT = 0x1000049, + Z2BGM_SNOW_MOUNTAIN = 0x100004A, + Z2BGM_SNOW_BOARD = 0x100004B, + Z2BGM_BOSS_SNOWWOMAN_0 = 0x100004C, + Z2BGM_BOSS_SNOWWOMAN_1 = 0x100004D, + Z2BGM_DEMO08 = 0x100004E, + Z2BGM_DEMO13_SEQ = 0x100004F, + Z2BGM_CHURCH1 = 0x1000050, + Z2BGM_CHURCH2 = 0x1000051, + Z2BGM_HOWL_TOBIKUSA = 0x1000052, + Z2BGM_HOWL_UMAKUSA = 0x1000053, + Z2BGM_HOWL_ZELDASONG = 0x1000054, + Z2BGM_HOWL_LIGHT_PRLD = 0x1000055, + Z2BGM_HIDDEN_VIL_D1 = 0x1000056, + Z2BGM_HIDDEN_VILLAGE = 0x1000057, + Z2BGM_SHOP_CELEB = 0x1000058, + Z2BGM_SHOP_MARO = 0x1000059, + Z2BGM_LAKE = 0x100005A, + Z2BGM_STONE_ZELDASONG = 0x100005B, + Z2BGM_STONE_LIGHT_PRLD = 0x100005C, + Z2BGM_BOSS_SNOWWOMAN_D1 = 0x100005D, + Z2BGM_ROOM_2 = 0x100005E, + Z2BGM_MIDNA_SOS = 0x100005F, + Z2BGM_FORTUNE = 0x1000060, + Z2BGM_IB_MBOSS = 0x1000061, + Z2BGM_BOSS_ZANT = 0x1000062, + Z2BGM_IB_MBOSS_D01 = 0x1000063, + Z2BGM_SUMOMO = 0x1000064, + Z2BGM_RAKKA_HOUSE = 0x1000065, + Z2BGM_LIGHT_PRLD_DUO = 0x1000066, + Z2BGM_SOUL_REQ_STONE = 0x1000067, + Z2BGM_SOUL_REQ_HOWL = 0x1000068, + Z2BGM_SOUL_REQ_DUO = 0x1000069, + Z2BGM_LUTERA_DEMO = 0x100006A, + Z2BGM_TEMPLE_OF_TIME = 0x100006B, + Z2BGM_TN_MBOSS = 0x100006C, + Z2BGM_OBACHAN = 0x100006D, + Z2BGM_RIVER_GAME = 0x100006E, + Z2BGM_GG_MBOSS = 0x100006F, + Z2BGM_OUGI_TRAINING = 0x1000070, + Z2BGM_HEALING_STONE = 0x1000071, + Z2BGM_HEALING_HOWL = 0x1000072, + Z2BGM_HEALING_DUO = 0x1000073, + Z2BGM_NEW_01_STONE = 0x1000074, + Z2BGM_NEW_01_HOWL = 0x1000075, + Z2BGM_NEW_01_DUO = 0x1000076, + Z2BGM_SUB_DUNGEON = 0x1000077, + Z2BGM_WCS_GAME = 0x1000078, + Z2BGM_WCS_D01 = 0x1000079, + Z2BGM_MINIGAME_ROOM = 0x100007A, + Z2BGM_NEW_02_STONE = 0x100007B, + Z2BGM_NEW_02_HOWL = 0x100007C, + Z2BGM_NEW_02_DUO = 0x100007D, + Z2BGM_NEW_03_STONE = 0x100007E, + Z2BGM_NEW_03_HOWL = 0x100007F, + Z2BGM_NEW_03_DUO = 0x1000080, + Z2BGM_ITEM_GET_INSECT = 0x1000081, + Z2BGM_ITEM_GET_SMELL = 0x1000082, + Z2BGM_ITEM_GET_POU = 0x1000083, + Z2BGM_GG_MBOSS_D01 = 0x1000084, + Z2BGM_P_ZANT = 0x1000085, + Z2BGM_VS_GANON_01 = 0x1000086, + Z2BGM_VS_GANON_02 = 0x1000087, + Z2BGM_VS_GANON_04 = 0x1000088, + Z2BGM_HARAGIGANT_D01 = 0x1000089, + Z2BGM_HARAGIGANT_D02 = 0x100008A, + Z2BGM_HARAGIGANT_BTL01 = 0x100008B, + Z2BGM_HARAGIGANT_BTL02 = 0x100008C, + Z2BGM_DRAGON_D01 = 0x100008D, + Z2BGM_DRAGON_D02 = 0x100008E, + Z2BGM_DRAGON_BTL01 = 0x100008F, + Z2BGM_DRAGON_BTL02 = 0x1000090, + Z2BGM_KOROKORO_GAME = 0x1000091, + Z2BGM_YAMIMUSHI_B_D01 = 0x1000092, + Z2BGM_GOMA_D01 = 0x1000093, + Z2BGM_GOMA_BTL01 = 0x1000094, + Z2BGM_GOMA_BTL02 = 0x1000095, + Z2BGM_FACE_OFF_BATTLE2 = 0x1000096, + Z2BGM_FACE_OFF_BATTLE3 = 0x1000097, + Z2BGM_SNOWBOARD_WIN = 0x1000098, + Z2BGM_SNOWBOARD_LOSE = 0x1000099, + Z2BGM_INDOOR_03 = 0x100009A, + Z2BGM_INDOOR_04 = 0x100009B, + Z2BGM_MINIGAME_WIN01 = 0x100009C, + Z2BGM_MINIGAME_WIN02 = 0x100009D, + Z2BGM_POSTMAN = 0x100009E, + Z2BGM_EVENT05 = 0x100009F, + Z2BGM_ITEM_GET_ME_S = 0x10000A0, + Z2BGM_D30_01_NEXT_REQ = 0x10000A1, + Z2BGM_D30_02_NEXT_REQ = 0x10000A2, + Z2BGM_TARO_RESCUE = 0x10000A3, + Z2BGM_KOMONJO_GET_INTRO = 0x10000A4, + Z2BGM_RIVER_GAME_00 = 0x10000A5, + Z2BGM_ZORA_D01 = 0x10000A6, + Z2BGM_SUMO_D02 = 0x10000A7, + Z2BGM_TN_MBOSS_LV9 = 0x10000A8, + Z2BGM_MENU_SELECT = 0x10000A9, + Z2BGM_TEMP = 0x10000AA, + Z2BGM_TEMP_O = 0x10000AB +}; + #endif /* Z2SEQMGR_H */ diff --git a/include/d/bg/d_bg_s.h b/include/d/bg/d_bg_s.h index 4d253890ba..deb17d3027 100644 --- a/include/d/bg/d_bg_s.h +++ b/include/d/bg/d_bg_s.h @@ -80,8 +80,8 @@ public: bool GetMonkeyBarsCode(cBgS_PolyInfo const&); bool GetUnderwaterRoofCode(cBgS_PolyInfo const&); s32 GetWallCode(cBgS_PolyInfo const&); - BOOL GetPolyAtt0(cBgS_PolyInfo const&); - bool GetPolyAtt1(cBgS_PolyInfo const&); + int GetPolyAtt0(cBgS_PolyInfo const&); + int GetPolyAtt1(cBgS_PolyInfo const&); bool GetGroundCode(cBgS_PolyInfo const&); s32 GetCamMoveBG(cBgS_PolyInfo const&); s32 GetRoomCamId(cBgS_PolyInfo const&); diff --git a/include/d/bg/d_bg_w.h b/include/d/bg/d_bg_w.h index ba45b4412f..d8cdabd50b 100644 --- a/include/d/bg/d_bg_w.h +++ b/include/d/bg/d_bg_w.h @@ -125,8 +125,8 @@ public: virtual bool GetUnderwaterRoofCode(int) = 0; virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0; - virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0; - virtual bool GetPolyAtt1(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 void GetIronBallThrough(int) = 0; virtual u32 GetAttackThrough(int) = 0; @@ -225,8 +225,8 @@ public: /* 8007B4B4 */ virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&); /* 8007B6AC */ virtual void GetLinkNo(cBgS_PolyInfo const&); /* 8007B6D8 */ virtual s32 GetWallCode(cBgS_PolyInfo const&); - /* 8007B704 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&); - /* 8007B734 */ virtual bool GetPolyAtt1(cBgS_PolyInfo const&); + /* 8007B704 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&); + /* 8007B734 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&); /* 8007B760 */ virtual bool GetGroundCode(cBgS_PolyInfo const&); /* 8007B7DC */ virtual void GetIronBallThrough(int); /* 8007B800 */ virtual u32 GetAttackThrough(int); diff --git a/include/d/bg/d_bg_w_base.h b/include/d/bg/d_bg_w_base.h index 6f30556ce2..1cbf808f7a 100644 --- a/include/d/bg/d_bg_w_base.h +++ b/include/d/bg/d_bg_w_base.h @@ -66,8 +66,8 @@ public: virtual bool GetMonkeyBarsCode(cBgS_PolyInfo const&) = 0; virtual void GetLinkNo(cBgS_PolyInfo const&) = 0; virtual s32 GetWallCode(cBgS_PolyInfo const&) = 0; - virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&) = 0; - virtual bool GetPolyAtt1(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 void GetIronBallThrough(int) = 0; virtual u32 GetAttackThrough(int) = 0; diff --git a/include/d/bg/d_bg_w_kcol.h b/include/d/bg/d_bg_w_kcol.h index 76263d508d..924474ce35 100644 --- a/include/d/bg/d_bg_w_kcol.h +++ b/include/d/bg/d_bg_w_kcol.h @@ -62,8 +62,8 @@ public: /* 80082B3C */ virtual void GetMonkeyBarsCode(cBgS_PolyInfo const&); /* 80082D24 */ virtual void GetLinkNo(cBgS_PolyInfo const&); /* 80082D54 */ virtual s32 GetWallCode(cBgS_PolyInfo const&); - /* 80082D84 */ virtual BOOL GetPolyAtt0(cBgS_PolyInfo const&); - /* 80082DB4 */ virtual void GetPolyAtt1(cBgS_PolyInfo const&); + /* 80082D84 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&); + /* 80082DB4 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&); /* 80082DE4 */ virtual void GetGroundCode(cBgS_PolyInfo const&); /* 80082E14 */ virtual void GetIronBallThrough(int); /* 80082E40 */ virtual void GetAttackThrough(int); diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 4165f2dd6a..d9d978e58b 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -796,6 +796,7 @@ void dComIfGs_setWarpItemData(char const* stage, cXyz pos, s16 angle, s8 roomNo, 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); inline void dComIfGs_init() { g_dComIfG_gameInfo.info.init(); @@ -1298,6 +1299,14 @@ inline u8 dComIfGs_getDataNum() { return g_dComIfG_gameInfo.info.getDataNum(); } +inline void dComIfGs_setDataNum(u8 num) { + return g_dComIfG_gameInfo.info.setDataNum(num); +} + +inline void dComIfGs_setNewFile(u8 file) { + return g_dComIfG_gameInfo.info.setNewFile(file); +} + inline char* dComIfGs_getPlayerName() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().getLinkName(); } @@ -1469,12 +1478,6 @@ inline void dComIfGs_setMemoryToCard(u8* p_saveData, int dataNum) { } -inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) { - g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); -} -inline void i_dComIfGp_setItemRupeeCount(int amount) { - g_dComIfG_gameInfo.play.setItemRupeeCount(amount); -} void dComIfGp_setSelectItem(int index); s32 dComIfGp_offHeapLockFlag(int flag); void dComIfGp_createSubExpHeap2D(); @@ -1502,6 +1505,13 @@ void dComIfGp_world_dark_set(u8); u8 dComIfGp_getNowLevel(); void dComIfGp_calcNowRegion(); +inline void i_dComIfGp_setItemLifeCount(float amount, u8 type) { + g_dComIfG_gameInfo.play.setItemLifeCount(amount, type); +} +inline void i_dComIfGp_setItemRupeeCount(int amount) { + g_dComIfG_gameInfo.play.setItemRupeeCount(amount); +} + inline dStage_startStage_c* dComIfGp_getStartStage() { return g_dComIfG_gameInfo.play.getStartStage(); } @@ -1914,6 +1924,22 @@ inline stage_stag_info_class* dComIfGp_getStageStagInfo() { return g_dComIfG_gameInfo.play.getStage().getStagInfo(); } +inline stage_envr_info_class* dComIfGp_getStageEnvrInfo() { + return g_dComIfG_gameInfo.play.getStage().getEnvrInfo(); +} + +inline stage_palette_info_class* dComIfGp_getStagePaletteInfo() { + return g_dComIfG_gameInfo.play.getStage().getPaletteInfo(); +} + +inline stage_pselect_info_class* dComIfGp_getStagePselectInfo() { + return g_dComIfG_gameInfo.play.getStage().getPselectInfo(); +} + +inline stage_vrbox_info_class* dComIfGp_getStageVrboxcolInfo() { + return g_dComIfG_gameInfo.play.getStage().getVrboxInfo(); +} + inline u8 dComIfGp_isHeapLockFlag() { return g_dComIfG_gameInfo.play.isHeapLockFlag(); } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 3a91c9252b..07811d479d 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -30,6 +30,15 @@ public: /* 0x1D */ u8 mFlagID; }; // Size: 0x20 +enum StageType { + /* 0x0 */ ST_FIELD, + /* 0x1 */ ST_DUNGEON, + /* 0x2 */ ST_ROOM, + /* 0x3 */ ST_BOSS_ROOM, + /* 0x4 */ ST_CASTLE_TOWN, + /* 0x5 */ ST_CLOUD_SEA, +}; + struct stage_stag_info_class { /* 0x00 */ f32 field_0x0; /* 0x04 */ f32 field_0x4; @@ -95,8 +104,8 @@ struct stage_map_info_dummy_class { }; struct stage_envr_info_class { - // Env -}; + /* 0x0 */ u8 field_0x0[0x41]; +}; // Size: 0x41 struct stage_camera2_data_class { /* 0x00 */ int field_0x0; @@ -658,11 +667,11 @@ public: STATIC_ASSERT(sizeof(dStage_roomStatus_c) == 0x404); -extern s8 struct_80450D64; // gStayNo -extern s8 gLastStayNo; -extern s8 gNextStayNo; -extern s8 gTimePass; -extern u8 data_80450D68; +extern s8 mStayNo__20dStage_roomControl_c; // gStayNo +extern s8 mOldStayNo__20dStage_roomControl_c; +extern s8 mNextStayNo__20dStage_roomControl_c; +extern s8 m_time_pass__20dStage_roomControl_c; +extern u8 mNoChangeRoom__20dStage_roomControl_c; class dStage_roomControl_c { public: @@ -701,7 +710,7 @@ public: /* 8025BAAC */ void setZoneNo(int, int); static s32 GetTimePass(); - static s8 getStayNo() { return struct_80450D64; } + static s8 getStayNo() { return mStayNo; } static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; } static s8 getMemoryBlockID(int i_roomNo) { return mStatus[i_roomNo].mMemBlockID; } dKy_tevstr_c* getTevStr(int i_roomNo) { return &mStatus[i_roomNo].mKyTevStr; } @@ -714,7 +723,7 @@ public: static char* getArcBankName() { return mArcBankName; } static void setRoomReadId(s8 id) { data_804505F0 = id; } static s8 getRoomReadId() { return data_804505F0; } - static void offNoChangeRoom() { data_80450D68 = false; } + static void offNoChangeRoom() { mNoChangeRoom = false; } static void setProcID(u32 id) { mProcID = id; } static u32 getProcID() { return mProcID; } static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; } @@ -733,6 +742,11 @@ public: static char* mArcBankName; static char* mArcBankData; static roomDzs_c m_roomDzs; + static s8 mStayNo; + static s8 mOldStayNo; + static s8 mNextStayNo; + static s8 m_time_pass; + static u8 mNoChangeRoom; private: /* 0x0 */ u8 field_0x0[4]; @@ -911,6 +925,10 @@ inline s32 i_dStage_stagInfo_GetSaveTbl(stage_stag_info_class* param_0) { return param_0->field_0x09 >> 1 & 0x1f; } +inline s8 dStage_stagInfo_GetTimeH(stage_stag_info_class* p_info) { + return p_info->field_0x0c >> 8; +} + inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) { return p_info->field_0xb & 0xF; } diff --git a/include/d/file/d_file_sel_info.h b/include/d/file/d_file_sel_info.h index ac71a85d7e..ac5a790d69 100644 --- a/include/d/file/d_file_sel_info.h +++ b/include/d/file/d_file_sel_info.h @@ -18,6 +18,10 @@ public: /* 801924A0 */ virtual ~dFile_info_c(); + void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; } + CPaneMgrAlpha* getDatBase() { return mDatBase; } + CPaneMgrAlpha* getNoDatBase() { return mNoDatBase; } + private: /* 0x04 */ JKRArchive* mArchive; /* 0x08 */ dDlst_FileInfo_c mFileInfo; diff --git a/include/d/file/d_file_sel_warning.h b/include/d/file/d_file_sel_warning.h index 01af1edf80..8353dcdc79 100644 --- a/include/d/file/d_file_sel_warning.h +++ b/include/d/file/d_file_sel_warning.h @@ -20,6 +20,11 @@ public: /* 80192240 */ void setFontColor(JUtility::TColor, JUtility::TColor); /* 80191C18 */ virtual ~dFile_warning_c(); + + u8 getStatus() { return mStatus; } + + u8 field_0x4[0x3D - 0x4]; + /* 0x3D */ u8 mStatus; }; #endif /* D_FILE_D_FILE_SEL_WARNING_H */ diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 27f9c97011..2269ffa588 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -27,24 +27,32 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0); void dKy_depth_dist_set(void* param_0); void dKy_instant_rainchg(); void dKy_instant_timechg(f32); +static void dKy_set_vrboxsoracol_ratio(f32 ratio); +static void dKy_set_vrboxkumocol_ratio(f32 ratio); +void dKy_actor_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3); +void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 param_2); +static void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3); + struct LIGHT_INFLUENCE { - /* 800CFC7C */ ~LIGHT_INFLUENCE(); - /* 8019F4F8 */ LIGHT_INFLUENCE(); + /* 800CFC7C */ ~LIGHT_INFLUENCE() {} + /* 8019F4F8 */ LIGHT_INFLUENCE() {} /* 0x00 */ cXyz mPosition; /* 0x0C */ GXColorS10 mColor; /* 0x14 */ f32 mPow; - /* 0x18 */ f32 mFluctuation; // ? - /* 0x1C */ int field_0x1c; + /* 0x18 */ f32 mFluctuation; + /* 0x1C */ int mIndex; }; struct WIND_INFLUENCE { - /* 0x00 */ cXyz field_0x00; - /* 0x0C */ cXyz field_0x0c; - /* 0x18 */ u8 field_0x18[0xC]; + /* 0x00 */ cXyz mPosition; + /* 0x0C */ cXyz mDirection; + /* 0x18 */ f32 mRadius; + /* 0x1C */ f32 mStrength; + /* 0x20 */ f32 field_0x20; /* 0x24 */ int field_0x24; - /* 0x28 */ u8 field_0x28; + /* 0x28 */ u8 mConstant; /* 0x29 */ u8 field_0x29; }; @@ -52,15 +60,18 @@ struct WIND_INF_ENTITY { /* 8019F4B8 */ ~WIND_INF_ENTITY(); /* 8019F4F4 */ WIND_INF_ENTITY(); - /* 0x00 */ u8 field_0x0[0x10]; - /* 0x10 */ WIND_INFLUENCE field_0x10; + /* 0x00 */ u8 mInUse; + /* 0x04 */ f32 mMinRadius; + /* 0x08 */ f32 mSpeed; + /* 0x0C */ f32 mStrengthMaxVel; + /* 0x10 */ WIND_INFLUENCE mInfluence; }; // Size: 0x3C struct EFLIGHT_PROC { - /* 0x00 */ u8 field_0x0; - /* 0x01 */ u8 field_0x1; - /* 0x04 */ int field_0x4; - /* 0x08 */ u8 field_0x8[0x20]; // LIGHT_INFLUENCE? + /* 0x00 */ u8 mState; + /* 0x01 */ u8 mFrame; + /* 0x04 */ int mLightType; + /* 0x08 */ LIGHT_INFLUENCE field_0x8; }; struct SND_INFLUENCE { @@ -88,8 +99,7 @@ struct DUNGEON_LIGHT { /* 0x24 */ u8 mAngleAttenuation; /* 0x25 */ u8 mDistAttenuation; /* 0x26 */ u8 field_0x26[6]; - /* 0x2C */ // LIGHT_INFLUENCE field_0x2c; this breaks ctor for some reason - u8 field_0x2c[0x20]; + /* 0x2C */ LIGHT_INFLUENCE field_0x2c; }; // Size: 0x4C struct BOSS_LIGHT { @@ -115,10 +125,10 @@ struct GB_WIND_INFLUENCE { }; struct EF_THUNDER { - /* 0x00 */ u8 field_0x0; - /* 0x01 */ u8 field_0x1; + /* 0x00 */ u8 mStatus; + /* 0x01 */ u8 mStateTimer; /* 0x02 */ u8 field_0x2; - /* 0x04 */ int field_0x4; + /* 0x04 */ int mMode; /* 0x08 */ f32 field_0x8; /* 0x0C */ f32 field_0xc; /* 0x10 */ f32 field_0x10; @@ -126,7 +136,7 @@ struct EF_THUNDER { /* 0x18 */ f32 field_0x18; /* 0x1C */ f32 field_0x1c; /* 0x20 */ u8 field_0x20[4]; - /* 0x24 */ u8 field_0x24[0x20]; // LIGHT_INFLUENCE? + /* 0x24 */ LIGHT_INFLUENCE mLightInfluence; }; struct GB_MAPLE_COL_CHANGE { @@ -135,20 +145,42 @@ struct GB_MAPLE_COL_CHANGE { /* 0x00 */ J3DLightObj field_0x0; }; // Size: 0x74 +// most of these members are guesses, fix later +struct LightStatus { + /* 0x00 */ Vec field_0x0; + /* 0x0C */ Vec field_0xc; + /* 0x18 */ GXColor field_0x18; + /* 0x1C */ Vec field_0x1c; + /* 0x28 */ Vec field_0x28; + /* 0x34 */ f32 field_0x34; + /* 0x38 */ Vec mLightDir; + /* 0x44 */ f32 mCutoff; + /* 0x48 */ GXSpotFn mSpotFn; + /* 0x4C */ f32 mRefDist; + /* 0x50 */ f32 mRefBrightness; + /* 0x54 */ GXDistAttnFn mDistFn; + /* 0x58 */ u32 field_0x58[2][6]; //? + /* 0x88 */ f32 field_0x88; + /* 0x8C */ f32 field_0x8c; + /* 0x90 */ f32 field_0x90; + /* 0x94 */ f32 field_0x94; + /* 0x98 */ u32 field_0x98[2][8]; //? + /* 0xD8 */ f32 field_0xd8; + /* 0xDC */ f32 field_0xdc; + /* 0xE0 */ f32 field_0xe0; + /* 0xE4 */ f32 field_0xe4; +}; // Size: 0xE8 + class dKy_tevstr_c { public: - /* 0x000 */ J3DLightObj field_0x000; + /* 0x000 */ J3DLightObj mLightObj; /* 0x074 */ J3DLightObj field_0x074[6]; /* 0x32C */ cXyz field_0x32c; - /* 0x338 */ cXyz field_0x338; + /* 0x338 */ cXyz mLightPosWorld; /* 0x344 */ f32 field_0x344; - /* 0x348 */ GXColorS10 field_0x348; - /* 0x350 */ int field_0x350; - /* 0x354 */ int field_0x354; - /* 0x358 */ u16 field_0x358; - /* 0x35A */ u16 field_0x35a; - /* 0x35C */ u16 field_0x35c; - /* 0x35E */ u16 field_0x35e; + /* 0x348 */ GXColorS10 mColorC0; + /* 0x350 */ GXColorS10 mColorK0; + /* 0x358 */ GXColorS10 mFogColor; /* 0x360 */ u8 field_0x360; /* 0x361 */ u8 field_0x361; /* 0x362 */ u8 field_0x362; @@ -157,28 +189,54 @@ public: /* 0x365 */ u8 field_0x365; /* 0x366 */ u8 field_0x366; /* 0x367 */ u8 field_0x367; - /* 0x368 */ f32 field_0x368; - /* 0x36C */ f32 field_0x36c; + /* 0x368 */ f32 mFogStartZ; + /* 0x36C */ f32 mFogEndZ; /* 0x370 */ f32 field_0x370; /* 0x374 */ f32 field_0x374; /* 0x378 */ u16 field_0x378; /* 0x37A */ u8 field_0x37a; - /* 0x37B */ u8 field_0x37b; - /* 0x37C */ u8 field_0x37c; - /* 0x37D */ u8 field_0x37d; - /* 0x37E */ u8 field_0x37e; - /* 0x37F */ u8 field_0x37f; - /* 0x380 */ u8 field_0x380; - /* 0x381 */ u8 field_0x381; - /* 0x382 */ u8 field_0x382; - /* 0x383 */ u8 field_0x383; + /* 0x37B */ u8 mInitTimer; + /* 0x37C */ u8 mEnvrIdxCurr; + /* 0x37D */ u8 mEnvrIdxPrev; + /* 0x37E */ u8 mColpatCurr; + /* 0x37F */ u8 mColpatPrev; + /* 0x380 */ s8 mRoomNo; + /* 0x381 */ u8 mEnvrIdxOverride; + /* 0x382 */ u8 mLightMode; + /* 0x383 */ u8 mInitType; /* 0x384 */ u8 field_0x384; /* 0x385 */ u8 field_0x385; -}; // Size = 0x388? +}; // Size = 0x388 STATIC_ASSERT(sizeof(dKy_tevstr_c) == 0x388); class fopAc_ac_c; +class dKyd_lightSchejule; +class stage_palette_info_class; +class stage_pselect_info_class; +class stage_envr_info_class; +class stage_vrbox_info_class; +class stage_plight_info_class; + +struct dKy_pol_arg_struct { + u8 data[8]; +}; + +struct dKy_color_data_struct { + u8 data[8]; +}; + +struct dKy_pol_efftbl_struct { + u8 data[8]; +}; + +struct dKy_pol_effcol_struct { + u8 data[8]; +}; + +struct dKy_pol_sound_struct { + u8 data[8]; +}; class dScnKy_env_light_c { public: @@ -215,26 +273,26 @@ public: public: /* 0x0000 */ // vtable - /* 0x0004 */ void* mpDmPalet; - /* 0x0008 */ void* mpDmPselect; - /* 0x000C */ void* mpDmEnvr; - /* 0x0010 */ void* mpDmVrbox; - /* 0x0014 */ void* mpSchedule; - /* 0x0018 */ u8 field_0x18[0x20]; // LIGHT_INFLUENCE? - /* 0x0038 */ LIGHT_INFLUENCE field_0x38[30]; + /* 0x0004 */ stage_palette_info_class* mpDmPalet; + /* 0x0008 */ stage_pselect_info_class* mpDmPselect; + /* 0x000C */ stage_envr_info_class* mpDmEnvr; + /* 0x0010 */ stage_vrbox_info_class* mpDmVrbox; + /* 0x0014 */ dKyd_lightSchejule* mpSchedule; + /* 0x0018 */ LIGHT_INFLUENCE mBaseLightInfluence; + /* 0x0038 */ LIGHT_INFLUENCE mLightInfluence[30]; /* 0x03F8 */ LIGHT_INFLUENCE* mPointLight[100]; /* 0x0588 */ LIGHT_INFLUENCE* mEfPLight[5]; /* 0x059C */ u8 field_0x59c[400]; /* 0x072C */ LIGHT_INFLUENCE* field_0x72c[5]; - /* 0x0740 */ u8 field_0x740[0x20]; // LIGHT_INFLUENCE? + /* 0x0740 */ LIGHT_INFLUENCE field_0x740; /* 0x0760 */ u8 field_0x760[4]; /* 0x0764 */ LIGHT_INFLUENCE mBGpartsActiveLight[2]; - /* 0x07A4 */ EFLIGHT_PROC field_0x7a4; - /* 0x07CC */ void* stagPlightInfo; // might be part of EFLIGHT_PROC + /* 0x07A4 */ EFLIGHT_PROC mSwordLight; + /* 0x07CC */ stage_plight_info_class* stagPlightInfo; // might be part of EFLIGHT_PROC /* 0x07D0 */ WIND_INFLUENCE* mPntWind[30]; - /* 0x0848 */ WIND_INF_ENTITY field_0x848[5]; + /* 0x0848 */ WIND_INF_ENTITY mWindInfluenceEntity[5]; /* 0x0974 */ SND_INFLUENCE mSound; - /* 0x098C */ u8 field_0x98c; + /* 0x098C */ u8 field_0x98c; // often set to room no /* 0x0990 */ DALKMIST_INFLUENCE* mDalkmistInf[10]; /* 0x09B8 */ DUNGEON_LIGHT mDungeonLights[8]; /* 0x0C18 */ BOSS_LIGHT field_0x0c18[8]; @@ -244,42 +302,42 @@ public: /* 0x0E60 */ f32 field_0xe60; /* 0x0E64 */ u16 field_0xe64; /* 0x0E66 */ u16 field_0xe66; - /* 0x0E68 */ s16 field_0xe68; - /* 0x0E6A */ s16 field_0xe6a; + /* 0x0E68 */ s16 mEvtWindAngleX; + /* 0x0E6A */ s16 mEvtWindAngleY; /* 0x0E6C */ u8 field_0xe6c; - /* 0x0E6D */ u8 field_0xe6d; - /* 0x0E6E */ u8 field_0xe6e; // E5C - E6E might all be part of GB_WIND_INFLUENCE + /* 0x0E6D */ u8 mEvtWindSet; + /* 0x0E6E */ u8 mTeachWindExist; /* 0x0E6F */ u8 field_0xe6f; - /* 0x0E70 */ bool mSunPacketEnabled; + /* 0x0E70 */ bool mSunInitialized; /* 0x0E74 */ dKankyo_sun_Packet* mpSunPacket; /* 0x0E78 */ dKankyo_sunlenz_Packet* mpSunLenzPacket; - /* 0x0E7C */ bool mRainPacketEnabled; + /* 0x0E7C */ bool mRainInitialized; /* 0x0E80 */ int mRainCount; /* 0x0E84 */ dKankyo_rain_Packet* mpRainPacket; - /* 0x0E88 */ bool mSnowPacketEnabled; + /* 0x0E88 */ bool mSnowInitialized; /* 0x0E8C */ int mSnowCount; /* 0x0E90 */ u8 field_0xe90; /* 0x0E91 */ u8 field_0xe91; /* 0x0E92 */ bool field_0xe92; /* 0x0E94 */ dKankyo_snow_Packet* mpSnowPacket; - /* 0x0E98 */ bool mStarPacketEnabled; + /* 0x0E98 */ bool mStarInitialized; /* 0x0E9C */ int mStarCount; /* 0x0EA0 */ f32 mStarDensity; /* 0x0EA4 */ dKankyo_star_Packet* mpStarPacket; - /* 0x0EA8 */ bool mHousiPacketEnabled; + /* 0x0EA8 */ bool mHousiInitialized; /* 0x0EA9 */ u8 field_0xea9; - /* 0x0EAC */ int field_0xeac; + /* 0x0EAC */ int mHousiCount; /* 0x0EB0 */ dKankyo_housi_Packet* mpHousiPacket; - /* 0x0EB4 */ u8 mCloudPacketEnabled; - /* 0x0EB5 */ u8 field_0xeb5; - /* 0x0EB8 */ int field_0xeb8; + /* 0x0EB4 */ u8 mCloudInitialized; + /* 0x0EB5 */ u8 mMoyaMode; + /* 0x0EB8 */ int mMoyaCount; /* 0x0EBC */ f32 field_0xebc; /* 0x0EC0 */ dKankyo_cloud_Packet* mpCloudPacket; - /* 0x0EC4 */ u8 field_0xec4; - /* 0x0EC8 */ int field_0xec8; + /* 0x0EC4 */ u8 mVrkumoStatus; + /* 0x0EC8 */ int mVrkumoCount; /* 0x0ECC */ f32 field_0xecc; /* 0x0ED0 */ dKankyo_vrkumo_Packet* mpVrkumoPacket; - /* 0x0ED4 */ EF_THUNDER field_0xed4; + /* 0x0ED4 */ EF_THUNDER mThunderEff; /* 0x0F18 */ u8 field_0xf18[4]; /* 0x0F1C */ dKankyo_shstar_Packet* mpShstarPacket; /* 0x0F20 */ u8 mOdourPacketStatus; @@ -300,10 +358,10 @@ public: /* 0x1038 */ u8 field_0x1038; /* 0x103C */ int field_0x103c; /* 0x1040 */ u8 field_0x1040[4]; - /* 0x1044 */ u8 mMudPacketEnabled; + /* 0x1044 */ u8 mMudInitialized; /* 0x1048 */ int field_0x1048; /* 0x104C */ dKankyo_mud_Packet* mpMudPacket; - /* 0x1050 */ u8 mEvilPacketEnabled; + /* 0x1050 */ u8 mEvilInitialized; /* 0x1051 */ u8 field_0x1051; /* 0x1054 */ int field_0x1054; /* 0x1058 */ dKankyo_evil_Packet* mpEvilPacket; @@ -312,10 +370,10 @@ public: /* 0x1064 */ f32 field_0x1064; /* 0x1068 */ f32 field_0x1068; /* 0x106C */ f32 field_0x106c; - /* 0x1070 */ cXyz field_0x1070; + /* 0x1070 */ cXyz mSunPos2; /* 0x107C */ cXyz mPLightNearPos; - /* 0x1088 */ cXyz field_0x1088; - /* 0x1094 */ cXyz field_0x1094; + /* 0x1088 */ cXyz mSunPos; + /* 0x1094 */ cXyz mMoonPos; /* 0x10A0 */ cXyz field_0x10a0; /* 0x10AC */ GXFogAdjTable mXFogTbl; /* 0x10C0 */ GXColorS10 mSkyColor; @@ -346,58 +404,40 @@ public: /* 0x1122 */ s16 mTerrainAmbienceBG3_G; /* 0x1124 */ s16 mTerrainAmbienceBG3_B; /* 0x1126 */ s16 mFakeFogA; - /* 0x1128 */ _GXColorS10 field_0x1128; + /* 0x1128 */ GXColorS10 field_0x1128; /* 0x1130 */ u8 field_0x1130[0x28]; - /* 0x1158 */ _GXColorS10 mFogColor; - /* 0x1160 */ s16 field_0x1160; - /* 0x1162 */ s16 field_0x1162; - /* 0x1164 */ s16 field_0x1164; - /* 0x1166 */ u8 field_0x1166[10]; - /* 0x1170 */ s16 field_0x1170; - /* 0x1172 */ s16 field_0x1172; - /* 0x1174 */ s16 field_0x1174; - /* 0x1176 */ u8 field_0x1176[10]; - /* 0x1180 */ s16 field_0x1180; - /* 0x1182 */ s16 field_0x1182; - /* 0x1184 */ s16 field_0x1184; - /* 0x1186 */ u8 field_0x1186[10]; - /* 0x1190 */ s16 field_0x1190; - /* 0x1192 */ s16 field_0x1192; - /* 0x1194 */ s16 field_0x1194; - /* 0x1196 */ u8 field_0x1196[10]; - /* 0x11A0 */ s16 field_0x11a0; - /* 0x11A2 */ s16 field_0x11a2; - /* 0x11A4 */ s16 field_0x11a4; - /* 0x11A6 */ u8 field_0x11a6[10]; - /* 0x11B0 */ s16 field_0x11b0; - /* 0x11B2 */ s16 field_0x11b2; - /* 0x11B4 */ s16 field_0x11b4; - /* 0x11B6 */ s16 field_0x11b6; - /* 0x11B8 */ s16 field_0x11b8; - /* 0x11BA */ s16 field_0x11ba; - /* 0x11BC */ s16 field_0x11bc; - /* 0x11BE */ u8 field_0x11be[2]; - /* 0x11C0 */ s16 field_0x11c0; - /* 0x11C2 */ s16 field_0x11c2; - /* 0x11C4 */ s16 field_0x11c4; + /* 0x1158 */ GXColorS10 mFogColor; + /* 0x1160 */ GXColorS10 mActorAddColAmb; + /* 0x1168 */ u8 field_0x1168[8]; + /* 0x1170 */ GXColorS10 mBgAddColAmb; + /* 0x1178 */ u8 field_0x1178[8]; + /* 0x1180 */ GXColorS10 mBg1AddColAmb; + /* 0x1188 */ u8 field_0x1188[8]; + /* 0x1190 */ GXColorS10 mBg2AddColAmb; + /* 0x1198 */ u8 field_0x1198[8]; + /* 0x11A0 */ GXColorS10 mBg3AddColAmb; + /* 0x11A8 */ u8 field_0x11a8[8]; + /* 0x11B0 */ GXColorS10 mFogAddCol; + /* 0x11B8 */ GXColorS10 mVrboxAddcolSky0; + /* 0x11C0 */ GXColorS10 mVrboxAddcolKasumi; /* 0x11C8 */ f32 field_0x11c8; /* 0x11CC */ f32 field_0x11cc; /* 0x11D0 */ f32 field_0x11d0; - /* 0x11D4 */ f32 field_0x11d4; - /* 0x11D8 */ f32 field_0x11d8; - /* 0x11DC */ f32 field_0x11dc; - /* 0x11E0 */ f32 field_0x11e0; + /* 0x11D4 */ f32 mDiceWeatherChangeTime; + /* 0x11D8 */ f32 mDiceWeatherTime; + /* 0x11DC */ f32 mColPatBlend; + /* 0x11E0 */ f32 mColPatBlendGather; /* 0x11E4 */ f32 mFogNear; /* 0x11E8 */ f32 mFogFar; /* 0x11EC */ f32 field_0x11ec; /* 0x11F0 */ f32 field_0x11f0; /* 0x11F4 */ f32 field_0x11f4; - /* 0x11F8 */ f32 field_0x11f8; - /* 0x11FC */ f32 field_0x11fc; - /* 0x1200 */ f32 field_0x1200; - /* 0x1204 */ f32 field_0x1204; - /* 0x1208 */ f32 field_0x1208; - /* 0x120C */ f32 field_0x120c; + /* 0x11F8 */ f32 mColAllcolRatio; + /* 0x11FC */ f32 mColActColRatio; + /* 0x1200 */ f32 mColBgColRatio; + /* 0x1204 */ f32 mColFogColRatio; + /* 0x1208 */ f32 mColVrboxSoraColRatio; + /* 0x120C */ f32 mColVrboxKumocolRatio; /* 0x1210 */ f32 field_0x1210; /* 0x1214 */ f32 mAllcolRatio; /* 0x1218 */ f32 mActcolRatio; @@ -428,59 +468,59 @@ public: /* 0x127C */ f32 field_0x127c; /* 0x1280 */ int field_0x1280; /* 0x1284 */ u8 field_0x1284[4]; - /* 0x1288 */ int field_0x1288; + /* 0x1288 */ u32 mMoyaSE; /* 0x128C */ u8 field_0x128c[12]; - /* 0x1298 */ int field_0x1298; - /* 0x129C */ int field_0x129c; + /* 0x1298 */ int mDiceWeatherCounter; + /* 0x129C */ int mRainCountOrig; /* 0x12A0 */ int field_0x12a0; - /* 0x12A4 */ int field_0x12a4; - /* 0x12A8 */ int field_0x12a8; + /* 0x12A4 */ int mPlayerPLightIdx; + /* 0x12A8 */ int mPlayerEfLightIdx; /* 0x12AC */ u8 field_0x12ac[4]; /* 0x12B0 */ int field_0x12b0; - /* 0x12B4 */ int field_0x12b4; + /* 0x12B4 */ int mSchbitTimer; /* 0x12B8 */ u8 field_0x12b8[4]; - /* 0x12BC */ u16 field_0x12bc; + /* 0x12BC */ u16 mFogAdjCenter; /* 0x12BE */ u16 mDate; /* 0x12C0 */ u16 mActorLightEffect; - /* 0x12C2 */ u8 field_0x12c2; - /* 0x12C3 */ u8 field_0x12c3; - /* 0x12C4 */ u8 field_0x12c4; - /* 0x12C5 */ u8 mWeatherPalette; + /* 0x12C2 */ u8 mColPatPrev; + /* 0x12C3 */ u8 mColPatCurr; + /* 0x12C4 */ u8 mColpatPrevGather; + /* 0x12C5 */ u8 mColpatCurrGather; /* 0x12C6 */ s8 mNowRoom; - /* 0x12C7 */ u8 field_0x12c7; - /* 0x12C8 */ u8 field_0x12c8; - /* 0x12C9 */ u8 field_0x12c9; - /* 0x12CA */ u8 field_0x12ca; - /* 0x12CB */ u8 field_0x12cb; + /* 0x12C7 */ u8 mEnvrIdxCurr; + /* 0x12C8 */ u8 mColpatWeather; + /* 0x12C9 */ u8 mDiceWeatherMode; + /* 0x12CA */ u8 mDiceWeatherState; + /* 0x12CB */ u8 mDiceWeatherCurrPattern; /* 0x12CC */ u8 field_0x12cc; - /* 0x12CD */ u8 field_0x12cd; - /* 0x12CE */ u8 field_0x12ce; - /* 0x12CF */ u8 field_0x12cf; - /* 0x12D0 */ u8 field_0x12d0; + /* 0x12CD */ u8 mColPatMode; + /* 0x12CE */ u8 mColPatModeGather; + /* 0x12CF */ u8 mFogAdjEnable; + /* 0x12D0 */ u8 mFogAdjTableType; /* 0x12D1 */ u8 mItemGetCol_chg; - /* 0x12D2 */ u8 field_0x12d2; - /* 0x12D3 */ u8 field_0x12d3; - /* 0x12D4 */ bool field_0x12d4; // related to vrbox color - /* 0x12D5 */ u8 field_0x12d5; + /* 0x12D2 */ u8 mInitAnmTimer; + /* 0x12D3 */ u8 mSchBit; + /* 0x12D4 */ bool mVrboxInvisible; + /* 0x12D5 */ u8 mContrastFlag; /* 0x12D6 */ u8 field_0x12d6; /* 0x12D7 */ u8 mShadowMode; /* 0x12D8 */ u8 mCameraInWater; - /* 0x12DC */ void* mResPolEfftbl; - /* 0x12E0 */ void* mResPolEffcol; - /* 0x12E4 */ void* mResPolEfftbl2; - /* 0x12E8 */ void* mResPolEffcol2; - /* 0x12EC */ void* mResPolSound; - /* 0x12F0 */ void* mResPolArg; - /* 0x12F4 */ void* mResColorDataTbl; + /* 0x12DC */ dKy_pol_efftbl_struct* mResPolEfftbl; + /* 0x12E0 */ dKy_pol_effcol_struct* mResPolEffcol; + /* 0x12E4 */ dKy_pol_efftbl_struct* mResPolEfftbl2; + /* 0x12E8 */ dKy_pol_effcol_struct* mResPolEffcol2; + /* 0x12EC */ dKy_pol_sound_struct* mResPolSound; + /* 0x12F0 */ dKy_pol_arg_struct* mResPolArg; + /* 0x12F4 */ dKy_color_data_struct* mResColorDataTbl; /* 0x12F8 */ s8 mFogDensity; /* 0x12F9 */ u8 field_0x12f9; /* 0x12FA */ u8 field_0x12fa; /* 0x12FB */ u8 field_0x12fb; - /* 0x12FC */ u8 field_0x12fc; + /* 0x12FC */ s8 field_0x12fc; /* 0x12FD */ u8 mDarktimeWeek; /* 0x12FE */ u8 field_0x12fe; - /* 0x1300 */ u16 field_0x1300; - /* 0x1302 */ u16 field_0x1302; + /* 0x1300 */ s16 field_0x1300; + /* 0x1302 */ s16 field_0x1302; /* 0x1304 */ f32 mWaterSurfaceShineRate; /* 0x1308 */ u8 field_0x1308; /* 0x1309 */ u8 field_0x1309; diff --git a/include/d/kankyo/d_kankyo_wether.h b/include/d/kankyo/d_kankyo_wether.h index 92bcb7de63..d97b55a70b 100644 --- a/include/d/kankyo/d_kankyo_wether.h +++ b/include/d/kankyo/d_kankyo_wether.h @@ -19,13 +19,15 @@ static void dKyw_wind_init(); static void dKyw_pntwind_init(); f32 dKyw_get_wind_pow(); static void squal_proc(); +void dKyw_rain_set(int count); +void dKyw_wind_set(); class dKankyo_sun_Packet : public J3DPacket { public: virtual void draw(); virtual ~dKankyo_sun_Packet(); - /* 0x10 */ cXyz field_0x10[2]; + /* 0x10 */ cXyz mPos[2]; /* 0x28 */ u8 field_0x28; /* 0x29 */ u8 field_0x29; /* 0x2C */ u8* mpResMoon; @@ -54,29 +56,35 @@ public: virtual void draw(); virtual ~dKankyo_sunlenz_Packet(); - /* 0x10 */ GXColor field_0x10; + /* 0x10 */ GXColor mColor; /* 0x14 */ u8* mpResBall; /* 0x18 */ u8 field_0x18[4]; /* 0x1C */ u8* mpResRing_A; /* 0x20 */ u8* mpResLenz; - /* 0x24 */ cXyz field_0x24[8]; + /* 0x24 */ cXyz mPositions[8]; /* 0x84 */ u8 field_0x84[8]; /* 0x8C */ f32 field_0x8c; /* 0x90 */ f32 field_0x90; /* 0x94 */ u8 field_0x94[4]; /* 0x98 */ f32 field_0x98; /* 0x9C */ u8 field_0x9c[2]; - /* 0x9E */ u8 field_0x9e; + /* 0x9E */ bool mDrawLenzInSky; }; // Size: 0xA0 struct RAIN_EFF { /* 80056CD0 */ ~RAIN_EFF(); /* 80056D0C */ RAIN_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; - /* 0x1C */ u8 field_0x1c[0x1c]; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; + /* 0x1C */ f32 field_0x1c; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 field_0x24; + /* 0x28 */ f32 mAlpha; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ s16 mTimer; }; // Size: 0x38 class dKankyo_rain_Packet : public J3DPacket { @@ -85,20 +93,39 @@ public: virtual ~dKankyo_rain_Packet(); private: - /* 0x0010 */ u8* field_0x10; - /* 0x0014 */ u8 field_0x14[4]; - /* 0x0018 */ RAIN_EFF field_0x18[250]; - /* 0x36C8 */ u8 field_0x36c8[0x50]; + /* 0x0010 */ u8* mpTex; + /* 0x0014 */ u8* mpTex2; + /* 0x0018 */ RAIN_EFF mRainEff[250]; + /* 0x36C8 */ f32 field_0x36c8; + /* 0x36CC */ f32 field_0x36cc; + /* 0x36D0 */ s16 mRainCount; + /* 0x36D2 */ u8 field_0x36D2[6]; + /* 0x36D8 */ cXyz mCamEyePos; + /* 0x36E4 */ cXyz mCamCenterPos; + /* 0x36F0 */ cXyz mCenterDelta; + /* 0x36FC */ f32 mCenterDeltaMul; + /* 0x3700 */ f32 field_0x3700; + /* 0x3704 */ f32 mSibukiAlpha; + /* 0x3708 */ f32 mOverheadFade; + /* 0x370C */ f32 mFwdFade1; + /* 0x3710 */ f32 mFwdFade2; + /* 0x3714 */ u8 mStatus; }; // Size: 0x3718 struct SNOW_EFF { /* 80056D58 */ ~SNOW_EFF(); /* 80056D94 */ SNOW_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; - /* 0x1C */ u8 field_0x1c[0x1c]; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; + /* 0x1C */ f32 mPosWaveX; + /* 0x20 */ f32 mPosWaveZ; + /* 0x24 */ f32 mGravity; + /* 0x28 */ f32 mWindSpeed; + /* 0x2C */ f32 mScale; + /* 0x30 */ u8 field_0x30[4]; + /* 0x34 */ s16 mTimer; }; // Size: 0x38 class dKankyo_snow_Packet : public J3DPacket { @@ -107,8 +134,8 @@ public: virtual ~dKankyo_snow_Packet(); private: - /* 0x10 */ u8* field_0x10; - /* 0x14 */ SNOW_EFF field_0x14[500]; + /* 0x10 */ u8* mpTex; + /* 0x14 */ SNOW_EFF mSnowEff[500]; }; struct STAR_EFF { @@ -135,11 +162,14 @@ struct HOUSI_EFF { /* 80056EA8 */ ~HOUSI_EFF(); /* 80056EE4 */ HOUSI_EFF(); - /* 0x00 */ u8 field_0x0; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; - /* 0x1C */ cXyz field_0x1c; - /* 0x28 */ u8 field_0x28[0x28]; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; + /* 0x1C */ cXyz mSpeed; + /* 0x28 */ cXyz mScale; + /* 0x34 */ u8 field_0x34[0x40 - 0x34]; + /* 0x40 */ f32 mAlpha; + /* 0x44 */ u8 field_0x44[0x50 - 0x44]; }; // Size: 0x50 class dKankyo_housi_Packet : public J3DPacket { @@ -149,7 +179,7 @@ public: /* 0x0010 */ cXyz field_0x10; /* 0x001C */ u8* mpResTex; - /* 0x0020 */ HOUSI_EFF field_0x18[300]; + /* 0x0020 */ HOUSI_EFF mHousiEff[300]; /* 0x5DE0 */ u8 field_0x5de0[8]; /* 0x5DE8 */ f32 field_0x5de8; /* 0x5DEC */ u8 field_0x5dec[4]; @@ -159,10 +189,10 @@ struct CLOUD_EFF { /* 80056E38 */ ~CLOUD_EFF(); /* 80056E74 */ CLOUD_EFF(); - /* 0x00 */ u8 field_0x0; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; - /* 0x1C */ cXyz field_0x1c; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; + /* 0x1C */ cXyz mPntWindSpeed; /* 0x28 */ u8 field_0x28[0x10]; }; // Size: 0x38 @@ -172,18 +202,21 @@ public: virtual ~dKankyo_cloud_Packet(); /* 0x10 */ u8* mpResTex; - /* 0x14 */ int field_0x14; - /* 0x18 */ CLOUD_EFF field_0x18[50]; + /* 0x14 */ int mCount; + /* 0x18 */ CLOUD_EFF mCloudEff[50]; }; // Size: 0xB08 struct VRKUMO_EFF { /* 80056F18 */ ~VRKUMO_EFF(); /* 80056F54 */ VRKUMO_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; - /* 0x1C */ u8 field_0x1c[0x10]; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; + /* 0x1C */ f32 mHeight; + /* 0x20 */ f32 mAlpha; + /* 0x24 */ f32 mDistFalloff; + /* 0x28 */ f32 mSpeed; }; // Size: 0x2C class dKankyo_vrkumo_Packet : public J3DPacket { @@ -192,11 +225,11 @@ public: virtual ~dKankyo_vrkumo_Packet(); private: - /* 0x0010 */ GXColor field_0x10; + /* 0x0010 */ GXColor mColor; /* 0x0014 */ u8* mpResCloudtx_01; /* 0x0018 */ u8* mpResCloudtx_02; /* 0x001C */ u8* mpResCloudtx_03; - /* 0x0020 */ VRKUMO_EFF field_0x20[100]; + /* 0x0020 */ VRKUMO_EFF mVrkumoEff[100]; /* 0x1150 */ f32 field_0x1150; /* 0x1154 */ f32 field_0x1154; }; // Size: 0x1158 @@ -208,9 +241,9 @@ struct EF_ODOUR_EFF { /* 80056F8C */ ~EF_ODOUR_EFF(); /* 80056FC8 */ EF_ODOUR_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; /* 0x1C */ u8 field_0x1c[0x14]; }; // Size: 0x30 @@ -220,7 +253,7 @@ public: virtual ~dKankyo_odour_Packet(); /* 0x00010 */ u8* mpResTex; - /* 0x00014 */ EF_ODOUR_EFF field_0x18[2000]; + /* 0x00014 */ EF_ODOUR_EFF mOdourEff[2000]; /* 0x17714 */ u8 field_0x17714[0x14]; }; // Size: 0x17728 @@ -228,9 +261,9 @@ struct EF_MUD_EFF { /* 80056FFC */ ~EF_MUD_EFF(); /* 80057038 */ EF_MUD_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; /* 0x1C */ cXyz field_0x1c; /* 0x28 */ u8 field_0x28[0x20]; }; // Size: 0x48 @@ -250,9 +283,9 @@ struct EF_EVIL_EFF { /* 8005706C */ ~EF_EVIL_EFF(); /* 800570A8 */ EF_EVIL_EFF(); - /* 0x00 */ u8 field_0x0[4]; - /* 0x04 */ cXyz field_0x04; - /* 0x10 */ cXyz field_0x10; + /* 0x00 */ u8 mStatus; + /* 0x04 */ cXyz mPosition; + /* 0x10 */ cXyz mBasePos; /* 0x1C */ csXyz field_0x1c; /* 0x22 */ u8 field_0x22[0x22]; }; // Size: 0x44 diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h index e141f1de06..fa344b3f13 100644 --- a/include/d/menu/d_menu_save.h +++ b/include/d/menu/d_menu_save.h @@ -61,6 +61,17 @@ public: class dMenu_save_c { public: + enum { + TYPE_DEFAULT = 1, + TYPE_WHITE_EVENT = 3, + TYPE_BLACK_EVENT + }; + + enum { + CURSOR_NO, + CURSOR_YES, + }; + enum { /* 0x00 */ PROC_SAVE_QUESTION, /* 0x01 */ PROC_SAVE_QUESTION2, @@ -211,7 +222,7 @@ public: /* 801F4724 */ void yesnoCancelAnmSet(); /* 801F47DC */ void saveYesNoCancelMove(); /* 801F485C */ void headerTxtSet(u16); - /* 801F4928 */ void headerTxtChangeAnm(); + /* 801F4928 */ bool headerTxtChangeAnm(); /* 801F4A10 */ void errDispInitSet(int); /* 801F4B84 */ void msgWindowInitOpen(); /* 801F4D10 */ void msgWindowOpen(); @@ -223,25 +234,25 @@ public: /* 801F5190 */ bool errorTxtChangeAnm(); /* 801F5278 */ void saveSelectOpenInit(); /* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int); - /* 801F53D4 */ void selectDataBaseMoveAnm(); + /* 801F53D4 */ bool selectDataBaseMoveAnm(); /* 801F54C0 */ void saveSelectOpenAnmSet(); /* 801F5508 */ void selectDataMoveAnmInitSet(int, int); - /* 801F5600 */ void selectDataMoveAnm(); - /* 801F5744 */ void yesnoMenuMoveAnmInitSet(int, int, u8); + /* 801F5600 */ bool selectDataMoveAnm(); + /* 801F5744 */ void yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2); /* 801F58C8 */ bool yesnoMenuMoveAnm(); - /* 801F5AE4 */ void yesnoSelectMoveAnm(u8); + /* 801F5AE4 */ bool yesnoSelectMoveAnm(u8); /* 801F5D84 */ void yesnoCursorShow(); /* 801F5EF4 */ void errorMoveAnmInitSet(int, int); - /* 801F5F84 */ void errorMoveAnm(); + /* 801F5F84 */ bool errorMoveAnm(); /* 801F60A4 */ void modoruTxtDispAnmInit(u8); - /* 801F6120 */ void modoruTxtDispAnm(); + /* 801F6120 */ bool modoruTxtDispAnm(); /* 801F61FC */ void ketteiTxtDispAnmInit(u8); /* 801F6278 */ bool ketteiTxtDispAnm(); /* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8); - /* 801F6390 */ void selectWakuAlpahAnm(u8); + /* 801F6390 */ bool selectWakuAlpahAnm(u8); /* 801F6458 */ void selFileCursorShow(); /* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8); - /* 801F6654 */ void yesnoWakuAlpahAnm(u8); + /* 801F6654 */ bool yesnoWakuAlpahAnm(u8); /* 801F67B8 */ void dataSave(); /* 801F67F0 */ void setSaveData(); /* 801F6954 */ void setInitSaveData(); @@ -258,7 +269,7 @@ private: /* 0x0008 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x000C */ STControl* stick; /* 0x0010 */ dDlst_MenuSaveExplain_c mMenuSaveExplain; - /* 0x0018 */ dDlst_MenuSave_c mMenuSave; + /* 0x0018 */ dDlst_MenuSave_c mSaveSel; /* 0x002C */ dSelect_cursor_c* mSelIcon; /* 0x0030 */ dFile_warning_c* mWarning; /* 0x0034 */ dFile_info_c* mFileInfo[3]; @@ -267,81 +278,85 @@ private: /* 0x0048 */ J2DAnmTransformKey* field_0x48; /* 0x004C */ J2DAnmTransformKey* field_0x4c; /* 0x0050 */ s32 field_0x50; - /* 0x0054 */ u8 field_0x54; - /* 0x0058 */ CPaneMgr* field_0x58; - /* 0x005C */ int field_0x5c; - /* 0x0060 */ int field_0x60; + /* 0x0054 */ u8 mSelectedFile; + /* 0x0055 */ u8 mLastSelFile; + /* 0x0058 */ CPaneMgr* mpSelectMoveBase; + /* 0x005C */ int mDataBaseMoveAnmFrame; + /* 0x0060 */ int mDataBaseMoveFrameMax; /* 0x0064 */ u8 field_0x64; /* 0x0065 */ u8 field_0x65; - /* 0x0068 */ CPaneMgr* field_0x68[3]; - /* 0x0074 */ u8 field_0x74[0x10]; - /* 0x0084 */ CPaneMgr* field_0x84[2]; - /* 0x008C */ u8 field_0x8c[0x10]; + /* 0x0068 */ CPaneMgr* mpSelData[3]; + /* 0x0074 */ int field_0x74[3]; + /* 0x0080 */ int field_0x80; + /* 0x0084 */ CPaneMgr* mpNoYes[2]; + /* 0x008C */ int field_0x8c[2]; + /* 0x0094 */ int mYesNoMoveAnmFrame; + /* 0x0098 */ int mYesNoMoveAnmMax; /* 0x009C */ u8 field_0x9c; /* 0x009D */ u8 field_0x9d; /* 0x009E */ u8 field_0x9e; - /* 0x00A0 */ int field_0xa0; + /* 0x00A0 */ J2DPane* field_0xa0; /* 0x00A4 */ u8 field_0xa4[0x10]; /* 0x00B4 */ J2DPane* field_0xb4; /* 0x00B8 */ int field_0xb8; /* 0x00BC */ int field_0xbc; - /* 0x00C0 */ CPaneMgr* field_0xc0[2]; - /* 0x00C8 */ char* field_0xc8[2]; - /* 0x00D0 */ u8 field_0xd0; - /* 0x00D1 */ u8 field_0xd1; + /* 0x00C0 */ CPaneMgrAlpha* mpErrTxtPane[2]; + /* 0x00C8 */ char* mpErrTxt[2]; + /* 0x00D0 */ u8 mErrTxtType; + /* 0x00D1 */ u8 mErrTxtAnmComplete; /* 0x00D2 */ u8 field_0xd2; /* 0x00D3 */ u8 field_0xd3; - /* 0x00D4 */ CPaneMgr* field_0xd4[3]; - /* 0x00E0 */ CPaneMgr* field_0xe0[3]; - /* 0x00EC */ CPaneMgr* field_0xec[3]; - /* 0x00F8 */ CPaneMgr* field_0xf8[3]; + /* 0x00D4 */ CPaneMgr* mpSelWakuMoyo[3]; + /* 0x00E0 */ CPaneMgr* mpSelWakuGold[3]; + /* 0x00EC */ CPaneMgr* mpSelWakuGold2[3]; + /* 0x00F8 */ CPaneMgr* mpBookWaku[3]; /* 0x0104 */ u8 field_0x104[3]; /* 0x0107 */ u8 field_0x107[3]; /* 0x010A */ u8 field_0x10a[3]; /* 0x010D */ u8 field_0x10d[11]; - /* 0x0118 */ CPaneMgr* field_0x118[2]; - /* 0x0120 */ CPaneMgr* field_0x120[2]; - /* 0x0128 */ CPaneMgr* field_0x128[2]; - /* 0x0130 */ u8 field_0x130[2]; - /* 0x0132 */ u8 field_0x132[2]; - /* 0x0134 */ u8 field_0x134[2]; - /* 0x0138 */ CPaneMgr* field_0x138[2]; - /* 0x0140 */ J2DAnmColorKey* field_0x140; - /* 0x0144 */ int field_0x144; - /* 0x0148 */ J2DAnmTextureSRTKey* field_0x148; - /* 0x014C */ int field_0x14c; + /* 0x0118 */ CPaneMgr* mNoYesBase[2]; + /* 0x0120 */ CPaneMgr* mNoYesGold[2]; + /* 0x0128 */ CPaneMgr* mNoYesGold2[2]; + /* 0x0130 */ u8 mNoYesWakuStartAlpha[2]; + /* 0x0132 */ u8 mNoYesWakuEndAlpha[2]; + /* 0x0134 */ u8 mNoYesWakuAnmTimer[2]; + /* 0x0138 */ CPaneMgr* mpNoYesTxt[2]; + /* 0x0140 */ J2DAnmColorKey* mpFileWakuAnm; + /* 0x0144 */ int mFileWakuAnmFrame; + /* 0x0148 */ J2DAnmTextureSRTKey* mpFileWakuRotAnm; + /* 0x014C */ int mFileWakuRotAnmFrame; /* 0x0150 */ J2DAnmColorKey* field_0x150; /* 0x0154 */ int field_0x154; /* 0x0158 */ J2DAnmTextureSRTKey* field_0x158; /* 0x015C */ int field_0x15c; /* 0x0160 */ J2DAnmTevRegKey* field_0x160; /* 0x0164 */ int field_0x164; - /* 0x0168 */ CPaneMgr* field_0x168[2]; - /* 0x0170 */ char* field_0x170[2]; - /* 0x0178 */ u8 field_0x178; - /* 0x0179 */ u8 field_0x179; + /* 0x0168 */ CPaneMgrAlpha* mpHeaderTxtPane[2]; + /* 0x0170 */ char* mpHeaderTxt[2]; + /* 0x0178 */ u8 mHeaderTxtType; // 0: Select Menu 1: YesNo Menu + /* 0x0179 */ u8 mHeaderAnmComplete; /* 0x017A */ u8 field_0x17a; /* 0x017B */ u8 field_0x17b; - /* 0x017C */ CPaneMgr* field_0x17c[3]; - /* 0x0188 */ CPaneMgr* field_0x188[3]; - /* 0x0194 */ CPaneMgr* field_0x194; - /* 0x0198 */ CPaneMgr* field_0x198; + /* 0x017C */ CPaneMgrAlpha* mpDataBase[3]; + /* 0x0188 */ CPaneMgrAlpha* mpNoDataBase[3]; + /* 0x0194 */ CPaneMgrAlpha* mpBBtnIcon; + /* 0x0198 */ CPaneMgrAlpha* mpABtnIcon; /* 0x019C */ u8 field_0x19c; /* 0x019D */ u8 field_0x19d; - /* 0x01A0 */ CPaneMgr* field_0x1a0; - /* 0x01A4 */ CPaneMgr* field_0x1a4; + /* 0x01A0 */ CPaneMgrAlpha* mpBackTxt; + /* 0x01A4 */ CPaneMgrAlpha* mpConfirmTxt; /* 0x01A8 */ u8 field_0x1a8; /* 0x01A9 */ u8 field_0x1a9; /* 0x01AA */ u8 field_0x1aa[3]; /* 0x01AD */ u8 field_0x1ad[3]; - /* 0x01B0 */ u8 field_0x1b0; + /* 0x01B0 */ u8 mDisplayMenu; /* 0x01B1 */ u8 field_0x1b1; /* 0x01B2 */ u8 mMenuProc; /* 0x01B3 */ u8 field_0x1b3; /* 0x01B4 */ u8 field_0x1b4; - /* 0x01B5 */ u8 field_0x1b5; - /* 0x01B6 */ u8 field_0x1b6; - /* 0x01B7 */ u8 field_0x1b7; + /* 0x01B5 */ u8 mErrProc; + /* 0x01B6 */ u8 mYesNoCursor; + /* 0x01B7 */ u8 mYesNoPrevCursor; /* 0x01B8 */ u8 field_0x1b8; /* 0x01B9 */ u8 field_0x1b9; /* 0x01BA */ u8 mSaveStatus; @@ -351,7 +366,7 @@ private: /* 0x01BE */ u8 field_0x1be; /* 0x01BF */ u8 field_0x1bf; /* 0x01C0 */ u8 field_0x1c0; - /* 0x01CC */ void (dMenu_save_c::*field_0x1cc)(); + /* 0x01CC */ void (dMenu_save_c::*mpErrFunc)(); /* 0x01D0 */ u8 mSaveBuffer[0xA94 * 3]; /* 0x218C */ dMsgScrnExplain_c* mpScrnExplain; /* 0x2190 */ u8 field_0x2190; diff --git a/include/d/meter/d_meter2_info.h b/include/d/meter/d_meter2_info.h index 237196040a..89a4644d7f 100644 --- a/include/d/meter/d_meter2_info.h +++ b/include/d/meter/d_meter2_info.h @@ -459,6 +459,10 @@ inline u8 dMeter2Info_getMiniGameItemSetFlag() { return g_meter2_info.getMiniGameItemSetFlag(); } +inline void dMeter2Info_setMiniGameItem(u8 item) { + g_meter2_info.setMiniGameItem(item); +} + inline void dMeter2Info_resetMiniGameItem(bool param_0) { g_meter2_info.resetMiniGameItem(param_0); } diff --git a/include/d/msg/d_msg_string.h b/include/d/msg/d_msg_string.h index 7c2d8eafe4..d9943b8384 100644 --- a/include/d/msg/d_msg_string.h +++ b/include/d/msg/d_msg_string.h @@ -4,9 +4,8 @@ #include "d/msg/d_msg_string_base.h" #include "d/msg/d_msg_out_font.h" -class dMsgString_c { +class dMsgString_c : public dMsgStringBase_c { public: - /* 80249C20 */ dMsgString_c(); /* 80249CA0 */ dMsgString_c(u8); /* 80249D28 */ ~dMsgString_c(); diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h index 9b948d2588..418abda8bc 100644 --- a/include/d/pane/d_pane_class.h +++ b/include/d/pane/d_pane_class.h @@ -25,11 +25,11 @@ public: /* 802545B0 */ void paneTrans(f32, f32); /* 80254638 */ void paneScale(f32, f32); /* 802547CC */ bool scaleAnime(s16, f32, f32, u8); - /* 802548BC */ void colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, + /* 802548BC */ bool colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, u8); - /* 80254C90 */ void getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); + /* 80254C90 */ Vec getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16); /* 80254EBC */ Vec getGlobalVtxCenter(J2DPane*, bool, s16); - /* 80254FB8 */ void getBounds(J2DPane*); + /* 80254FB8 */ JGeometry::TBox2* getBounds(J2DPane*); Vec getGlobalVtxCenter(bool param_0, s16 param_1) { return getGlobalVtxCenter(getPanePtr(), param_0, param_1); @@ -39,6 +39,7 @@ public: void scale(f32 h, f32 v) { getPanePtr()->scale(h, v); } void scaleAnimeStart(s16 v) { mScaleAnime = v; } + void colorAnimeStart(s16 start) { mColorAnime = start; } f32 getPosX() { return getPanePtr()->getBounds().i.x; } f32 getPosY() { return getPanePtr()->getBounds().i.y; } @@ -58,9 +59,11 @@ public: f32 getInitPosX() { return mInitPos.x; } f32 getInitPosY() { return mInitPos.y; } + JUtility::TColor getInitBlack() { return mInitBlack; } + private: /* 0x1C */ void* mpFirstStackSize; - /* 0x20 */ void* field_0x20; + /* 0x20 */ s16* field_0x20; /* 0x24 */ JGeometry::TVec2 mInitPos; /* 0x2C */ JGeometry::TVec2 mGlobalPos; /* 0x34 */ JGeometry::TVec2 mInitSize; diff --git a/include/d/pane/d_pane_class_alpha.h b/include/d/pane/d_pane_class_alpha.h index 5034f6c99d..79c67f6bf4 100644 --- a/include/d/pane/d_pane_class_alpha.h +++ b/include/d/pane/d_pane_class_alpha.h @@ -6,16 +6,6 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "dolphin/types.h" -struct CPaneMgrAlphaMorf { - /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*); - /* 80255CAC */ ~CPaneMgrAlphaMorf(); - /* 80255D48 */ void initiateAlphaMorf(); - /* 80255DD0 */ void setBackupAlpha(); - /* 80255E28 */ void setAlphaMorfRate(f32); - /* 80255E98 */ void childPaneBackupAlpha(J2DPane*); - /* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32); -}; - class CPaneMgrAlpha { public: /* 8025546C */ virtual ~CPaneMgrAlpha(); @@ -26,29 +16,47 @@ public: /* 802554E0 */ void initiateAlpha(J2DPane*, JKRExpHeap*); /* 802555C8 */ void show(); /* 80255608 */ void hide(); - /* 8025564C */ void isVisible(); + /* 8025564C */ bool isVisible(); /* 80255658 */ f32 rateCalc(s16, s16, u8); /* 802557D0 */ void setAlphaRate(f32); /* 80255828 */ f32 getAlphaRate(); - /* 80255878 */ void alphaAnime(s16, u8, u8, u8); - /* 80255964 */ void alphaAnimeLoop(s16, u8, u8, u8); + /* 80255878 */ bool alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType); + /* 80255964 */ bool alphaAnimeLoop(s16, u8, u8, u8); /* 80255A60 */ void childPaneCount(J2DPane*); /* 80255ACC */ void childPaneGetAlpha(J2DPane*); /* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8); - J2DPane* getPanePtr() { return (J2DPane*)mWindow; } + J2DPane* getPanePtr() { return mPane; } u8 getAlpha() { return getPanePtr()->getAlpha(); } s16 getAlphaTimer() { return mAlphaTimer; } void alphaAnimeStart(s16 start) { mAlphaTimer = start; } - /* 0x04 */ J2DWindow* mWindow; + /* 0x04 */ J2DPane* mPane; /* 0x08 */ JKRExpHeap* heap; /* 0x0C */ void* mpFirstStackAlpha; - /* 0x10 */ void* field_0x10; + /* 0x10 */ u8* field_0x10; /* 0x14 */ s16 mChildPaneCount; /* 0x16 */ s16 mAlphaTimer; /* 0x18 */ u8 mInitAlpha; /* 0x19 */ u8 mFlags; }; +class CPaneMgrAlphaMorf : public CPaneMgrAlpha { +public: + /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*); + /* 80255D48 */ void initiateAlphaMorf(); + /* 80255DD0 */ void setBackupAlpha(); + /* 80255E28 */ void setAlphaMorfRate(f32); + /* 80255E98 */ void childPaneBackupAlpha(J2DPane*); + /* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32); + + /* 80255CAC */ virtual ~CPaneMgrAlphaMorf(); + +private: + /* 0x1C */ void* mpFirstSaveAlpha; + /* 0x20 */ u8* field_0x20; + /* 0x24 */ void* mpFirstGetAlpha; + /* 0x28 */ u8* field_0x28; +}; + #endif /* D_PANE_D_PANE_CLASS_ALPHA_H */ diff --git a/include/d/s/d_s_play.h b/include/d/s/d_s_play.h index e75bc46f51..f1ceca75cd 100644 --- a/include/d/s/d_s_play.h +++ b/include/d/s/d_s_play.h @@ -57,8 +57,8 @@ private: /* 0x14 */ dScnPly_env_debugHIO_c mDebug; }; -extern s8 struct_80451124; -extern s8 data_80451125; // sPauseTimer +extern s8 pauseTimer__9dScnPly_c; +extern s8 nextPauseTimer__9dScnPly_c; // sPauseTimer class dScnPly_c : public scene_class { public: @@ -66,8 +66,11 @@ public: /* 80259AC4 */ bool resetGame(); /* 80259BFC */ void offReset(); - static bool isPause() { return struct_80451124 == 0; } - static void setPauseTimer(s8 time) { data_80451125 = time; } + static bool isPause() { return pauseTimer == 0; } + static void setPauseTimer(s8 time) { nextPauseTimer = time; } + + static s8 pauseTimer; + static s8 nextPauseTimer; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 17a72a4811..9669f98531 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -1085,9 +1085,11 @@ public: void initDan(s8 i_stage) { mDan.init(i_stage); } void resetDan() { mDan.reset(); } u8 getDataNum() const { return mDataNum; } + void setDataNum(u8 num) { mDataNum = num; } void removeZone(int zoneNo) { mZone[zoneNo].reset(); } void setNoFile(u8 file) { mNoFile = file; } u8 getNewFile() const { return mNewFile; } + void setNewFile(u8 file) { mNewFile |= file; } static const int MEMORY_SWITCH = 0x80; static const int DAN_SWITCH = 0x40; diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h index d815ffd033..932b72699d 100644 --- a/include/dolphin/gx/GX.h +++ b/include/dolphin/gx/GX.h @@ -923,6 +923,7 @@ void GXInitLightDistAttn(GXLightObj*, f32, f32, GXDistAttnFn); void GXInitLightPos(GXLightObj*, f32, f32, f32); void GXInitLightSpot(GXLightObj*, f32, GXSpotFn); void GXInvalidateTexAll(void); +void GXInitLightAttn(GXLightObj*, f32, f32, f32, f32, f32, f32); void GXLoadLightObjImm(GXLightObj*, GXLightID); void GXLoadPosMtxImm(Mtx, u32); void GXLoadNrmMtxImm(Mtx, u32); diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 5d9609065c..3898fe6db7 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -6,6 +6,9 @@ void mDoRst_reset(int, u32, int); void mDoRst_resetCallBack(int, void*); +extern bool SyncWidthSound; +extern u8 sDefaultDirection; + struct mDoRstData { /* 0x00 */ int mReset; /* 0x04 */ int mResetPrepare; @@ -54,6 +57,6 @@ public: static mDoRstData* mResetData; }; -extern u8 data_80450C88; +extern bool mDoDvdErr_initialized; #endif /* M_DO_M_DO_RESET_H */ diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index a1036204cf..1ba0605b3e 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -15,8 +15,6 @@ public: }; extern bool struct_80450BB8; // sInitFlag -extern bool data_80450bba; // sBgmSet -extern bool sResetFlag; class mDoAud_zelAudio_c { public: @@ -24,14 +22,18 @@ public: mDoAud_zelAudio_c() {} ~mDoAud_zelAudio_c() {} - static void onInitFlag() { struct_80450BB8 = true; } - static bool isInitFlag() { return struct_80450BB8; } - static bool isResetFlag() { return sResetFlag; } - static void onResetFlag() { sResetFlag = true; } - static void offResetFlag() { sResetFlag = false; } - static bool isBgmSet() { return data_80450bba; } - static void onBgmSet() { data_80450bba = true; } - static void offBgmSet() { data_80450bba = false; } + static void onInitFlag() { mInitFlag = true; } + static bool isInitFlag() { return mInitFlag; } + static bool isResetFlag() { return mResetFlag; } + static void onResetFlag() { mResetFlag = true; } + static void offResetFlag() { mResetFlag = false; } + static bool isBgmSet() { return mBgmSet; } + static void onBgmSet() { mBgmSet = true; } + static void offBgmSet() { mBgmSet = false; } + + static bool mInitFlag; + static bool mResetFlag; + static bool mBgmSet; Z2AudioMgr mAudioMgr; }; diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index a9875b6c8e..161420fca6 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -15,7 +15,7 @@ public: static void read(); static void convert(interface_of_controller_pad*, JUTGamePad*); static void LRlockCheck(interface_of_controller_pad*); - void recalibrate(); + static void recalibrate(); static interface_of_controller_pad& getCpadInfo(u32 pad) { return m_cpadInfo[pad]; } static JUTGamePad* getGamePad(u32 pad) { return m_gamePad[pad]; } diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index d4eb4bd6a9..5d01d10a2f 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -414,7 +414,7 @@ void mDoExt_setAraCacheSize(u32 param_0); struct JUTFont; JUTFont* mDoExt_getMesgFont(); -void mDoExt_getSubFont(); +JUTFont* mDoExt_getSubFont(); JUTFont* mDoExt_getRubyFont(); void mDoExt_removeSubFont(); diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 5806b380ff..32b4acb8e8 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -8,8 +8,8 @@ int mDoGph_Create(); -extern u8 struct_80450BE4; // Blure -extern u8 data_80450BE6; // Fade +extern u8 mBlureFlag__13mDoGph_gInf_c; // Blure +extern u8 mFade__13mDoGph_gInf_c; // Fade extern bool data_80450BE7; // AutoForcus struct ResTIMG; @@ -46,14 +46,16 @@ public: static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); } static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); } static void endFrame() { JFWDisplay::getManager()->endFrame(); } - static void offFade() { data_80450BE6 = 0; } - static u8 isFade() { return data_80450BE6; } - static void offBlure() { struct_80450BE4 = 0; } + static void offFade() { mFade = 0; } + static u8 isFade() { return mFade; } + static void offBlure() { mBlureFlag = false; } static void offAutoForcus() { data_80450BE7 = 0; } static void setTickRate(u32 rate) { JFWDisplay::getManager()->setTickRate(rate); } static void waitBlanking(int wait) { JFWDisplay::getManager()->waitBlanking(wait); } static f32 getWidthF() { return 608.0f; } static f32 getHeightF() { return 448.0f; } + static f32 getMinYF() { return 0.0f; } + static f32 getMinXF() { return 0.0f; } static int getMinY() { return 0; } static int getMinX() { return 0; } static int getMaxY() { return 448; } @@ -62,6 +64,7 @@ public: static void* getFrameBufferTex() { return mFrameBufferTex; } static void setFadeRate(f32 rate) { mFadeRate = rate; } static f32 getFadeRate() { return mFadeRate; } + static bloom_c* getBloom() { return &m_bloom; } static GXTexObj mFrameBufferTexObj; static GXTexObj mZbufferTexObj; @@ -76,6 +79,8 @@ public: static void* mZbufferTex; static f32 mFadeRate; static f32 mFadeSpeed; + static bool mBlureFlag; + static u8 mFade; }; #endif /* M_DO_M_DO_GRAPHIC_H */ diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index 6015b935fb..c006df31ec 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -63,10 +63,9 @@ struct mDoMain { static u8 mHeapBriefType; static OSTime sPowerOnTime; static OSTime sHungUpTime; + static s8 developmentMode; }; -extern s8 data_80450580; // Debug enabled - extern bool sOSReportDisabled; extern bool data_80450B99; extern bool data_80450B9A; diff --git a/include/msg/scrn/d_msg_scrn_explain.h b/include/msg/scrn/d_msg_scrn_explain.h index aaee0f0a7c..ea0b2c2e0b 100644 --- a/include/msg/scrn/d_msg_scrn_explain.h +++ b/include/msg/scrn/d_msg_scrn_explain.h @@ -32,7 +32,8 @@ public: /* 8023D538 */ virtual ~dMsgScrnExplain_c(); u8 getStatus() { return mStatus; } - void setForceSelect() { mForceSelect = 1; } + u8 getSelectCursor() { return mSelCursor; } + void onForceSelect() { mForceSelect = 1; } void setKeyWaitTimer(s16 timer) { mKeyWaitTimer = timer; } private: diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 92d6f91cc3..5c8d795c49 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -325,8 +325,8 @@ OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)((OS_BUS_CLOCK / 4) / 60) /* 80451500-80451504 -00001 0004+00 3/3 6/6 0/0 .sbss None */ /* 80451500 0001+00 data_80451500 None */ /* 80451501 0003+00 data_80451501 None */ -bool struct_80451500; -bool struct_80451501; +bool JUTGamePad::C3ButtonReset::sResetSwitchPushing; +bool JUTGamePad::C3ButtonReset::sResetOccurred; /* 80451504-80451508 000A04 0004+00 2/2 0/0 0/0 .sbss * sResetOccurredPort__Q210JUTGamePad13C3ButtonReset */ @@ -339,7 +339,7 @@ void JUTGamePad::checkResetCallback(OSTime holdTime) { return; } - struct_80451501 = true; + JUTGamePad::C3ButtonReset::sResetOccurred = true; JUTGamePad::C3ButtonReset::sResetOccurredPort = mPortNum; if (JUTGamePad::C3ButtonReset::sCallback != NULL) { @@ -380,7 +380,7 @@ void JUTGamePad::update() { if (field_0xa8 == 0 || (mButton.mButton & C3ButtonReset::sResetMaskPattern) != C3ButtonReset::sResetPattern) { mButtonReset.mReset = false; - } else if (!struct_80451501) { + } else if (!JUTGamePad::C3ButtonReset::sResetOccurred) { if (mButtonReset.mReset == true) { checkResetCallback(OSGetTime() - mResetTime); } else { @@ -425,19 +425,19 @@ asm void JUTGamePad::update() { /* 802E0FA4-802E1024 2DB8E4 0080+00 1/1 0/0 0/0 .text checkResetSwitch__10JUTGamePadFv */ void JUTGamePad::checkResetSwitch() { - if (!struct_80451501) { + if (!JUTGamePad::C3ButtonReset::sResetOccurred) { if (OSGetResetSwitchState()) { - struct_80451500 = true; + C3ButtonReset::sResetSwitchPushing = true; } else { - if (struct_80451500 == true) { - struct_80451501 = true; + if (C3ButtonReset::sResetSwitchPushing == true) { + C3ButtonReset::sResetOccurred = true; C3ButtonReset::sResetOccurredPort = -1; if (C3ButtonReset::sCallback != NULL) { C3ButtonReset::sCallback(-1, C3ButtonReset::sCallbackArg); } } - struct_80451500 = false; + C3ButtonReset::sResetSwitchPushing = false; } } } diff --git a/libs/SSystem/SComponent/c_API_controller_pad.cpp b/libs/SSystem/SComponent/c_API_controller_pad.cpp index 2d9ea9592c..764b1f7a94 100644 --- a/libs/SSystem/SComponent/c_API_controller_pad.cpp +++ b/libs/SSystem/SComponent/c_API_controller_pad.cpp @@ -6,51 +6,14 @@ #include "SSystem/SComponent/c_API_controller_pad.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct mDoCPd_c { - /* 80007D74 */ void recalibrate(); - - static u8 m_cpadInfo[256]; -}; - -// -// Forward References: -// - -extern "C" void cAPICPad_recalibrate__Fv(); -extern "C" void cAPICPad_ANY_BUTTON__FUl(); - -// -// External References: -// - -extern "C" void recalibrate__8mDoCPd_cFv(); -extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; - -// -// Declarations: -// +#include "m_Do/m_Do_controller_pad.h" /* 8026328C-802632AC 25DBCC 0020+00 0/0 3/3 0/0 .text cAPICPad_recalibrate__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void cAPICPad_recalibrate() { - nofralloc -#include "asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_recalibrate__Fv.s" +void cAPICPad_recalibrate() { + mDoCPd_c::recalibrate(); } -#pragma pop /* 802632AC-802632C8 25DBEC 001C+00 0/0 3/3 1/1 .text cAPICPad_ANY_BUTTON__FUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm u32 cAPICPad_ANY_BUTTON(u32 param_0) { - nofralloc -#include "asm/SSystem/SComponent/c_API_controller_pad/cAPICPad_ANY_BUTTON__FUl.s" +u32 cAPICPad_ANY_BUTTON(u32 portNo) { + return mDoCPd_c::getTrig(portNo) & (CButton::A | CButton::B | CButton::START); } -#pragma pop diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 158b8cda1f..34e68cc372 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -1062,7 +1062,7 @@ asm void Z2SeqMgr::processBgmFramework() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void Z2SeqMgr::checkBgmIDPlaying(u32 param_0) { +asm bool Z2SeqMgr::checkBgmIDPlaying(u32 param_0) { nofralloc #include "asm/Z2AudioLib/Z2SeqMgr/checkBgmIDPlaying__8Z2SeqMgrFUl.s" } diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index abdb41bf27..a194402f76 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -112,7 +112,7 @@ extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern Z2SeqMgr* data_80450B84; extern "C" extern Z2SeMgr* data_80450B88; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp index 6835f00e7b..7b10b7ace5 100644 --- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp +++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp @@ -542,7 +542,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp index 8745e05131..155e34a675 100644 --- a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp +++ b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp @@ -352,7 +352,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp index d322e0e762..6468138187 100644 --- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp +++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp @@ -743,7 +743,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp index 82cc960021..82ff1f62a5 100644 --- a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp +++ b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp @@ -642,10 +642,10 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp index a44d5a56fd..4c8ff926a8 100644 --- a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp +++ b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp @@ -736,7 +736,7 @@ extern "C" extern u32 g_blackColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp index 39ea41b561..c04e6d8235 100644 --- a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp +++ b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp @@ -655,7 +655,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void Obj_Damage__13daObjBHASHI_cF4cXyz(); diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 9c99d06370..5b8dbf5ddd 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -636,7 +636,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp index d42a01c8d8..7d01261359 100644 --- a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp +++ b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp @@ -673,7 +673,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp index 0c86eebdaf..b724807eaa 100644 --- a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp +++ b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp @@ -672,9 +672,9 @@ extern "C" extern u8 j3dSys[284]; extern "C" extern u8 j3dZModeTable[96]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void setOperate__9daB_YOI_cFi(); 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 51e9930260..e3a621e4c6 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 @@ -731,9 +731,9 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u8 data_804505F0[8]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450D68[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; +extern "C" extern u8 mNoChangeRoom__20dStage_roomControl_c[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void setSnortEffect__11daB_ZANTZ_cFi(); diff --git a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp index f1a723a252..8ee2162f9b 100644 --- a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp @@ -273,7 +273,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void getMagicSpeed__10daB_ZANT_cFv(); diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp index 0b0ef2a7e0..de09620152 100644 --- a/rel/d/a/d_a_arrow/d_a_arrow.cpp +++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp @@ -517,7 +517,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u32 __float_max; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 struct_80450D88[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_bullet/d_a_bullet.cpp b/rel/d/a/d_a_bullet/d_a_bullet.cpp index e9526b2178..817779fa8e 100644 --- a/rel/d/a/d_a_bullet/d_a_bullet.cpp +++ b/rel/d/a/d_a_bullet/d_a_bullet.cpp @@ -237,7 +237,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp index c3169838e5..7fa03a0217 100644 --- a/rel/d/a/d_a_canoe/d_a_canoe.cpp +++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp @@ -465,7 +465,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void BreakSet__15daObjGOMIKABE_cFv(); diff --git a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp index b1b8c0b6f2..629a5b6e2b 100644 --- a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp +++ b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp @@ -466,7 +466,7 @@ extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index 7eb3f039e4..1aea9a75b4 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -544,7 +544,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 Zero__5csXyz[4]; extern "C" void __register_global_object(); diff --git a/rel/d/a/d_a_demo00/d_a_demo00.cpp b/rel/d/a/d_a_demo00/d_a_demo00.cpp index e1a99c7529..a4f88c2ce7 100644 --- a/rel/d/a/d_a_demo00/d_a_demo00.cpp +++ b/rel/d/a/d_a_demo00/d_a_demo00.cpp @@ -488,7 +488,7 @@ extern "C" extern u32 g_saftyWhiteColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" void __register_global_object(); diff --git a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp index e190aaeb1d..7817666d95 100644 --- a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp +++ b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp @@ -274,7 +274,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/d_a_ep/d_a_ep.cpp b/rel/d/a/d_a_ep/d_a_ep.cpp index c4c60b59c3..49f19b4bd0 100644 --- a/rel/d/a/d_a_ep/d_a_ep.cpp +++ b/rel/d/a/d_a_ep/d_a_ep.cpp @@ -394,7 +394,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" f32 mSystemFar__14mDoLib_clipper; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp index 74aaecb3d7..4ca0c0d131 100644 --- a/rel/d/a/d_a_grass/d_a_grass.cpp +++ b/rel/d/a/d_a_grass/d_a_grass.cpp @@ -411,7 +411,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mSystemFar__14mDoLib_clipper; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_myObj__9daGrass_c[4]; extern "C" u8 m_grass__9daGrass_c[4]; extern "C" u8 m_flower__9daGrass_c[4]; diff --git a/rel/d/a/d_a_kago/d_a_kago.cpp b/rel/d/a/d_a_kago/d_a_kago.cpp index 64f3aa4fcd..933729a905 100644 --- a/rel/d/a/d_a_kago/d_a_kago.cpp +++ b/rel/d/a/d_a_kago/d_a_kago.cpp @@ -659,7 +659,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void setScoreCount__13daBalloon2D_cFUl(); diff --git a/rel/d/a/d_a_midna/d_a_midna.cpp b/rel/d/a/d_a_midna/d_a_midna.cpp index 95bdf6cf17..3dbae2a941 100644 --- a/rel/d/a/d_a_midna/d_a_midna.cpp +++ b/rel/d/a/d_a_midna/d_a_midna.cpp @@ -691,7 +691,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" extern u8 struct_804C6CD8[4]; 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 07b0059555..6cc02b802d 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 @@ -349,7 +349,7 @@ extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_clearColor[4]; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 m_myObj__6daMP_c[4]; extern "C" u8 sManager__10JFWDisplay[4]; extern "C" u8 sManager__8JUTVideo[4]; diff --git a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp index b85a5b0cee..eb82e1bff4 100644 --- a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp +++ b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp @@ -574,7 +574,7 @@ extern "C" u8 BaseY__4cXyz[12]; extern "C" u8 BaseZ__4cXyz[12]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); 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 3c73ddc8a8..8481cbf1ea 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -469,7 +469,7 @@ extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index 3d68f24ea3..22def51253 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -66,7 +66,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index 3bfe966cc5..da866719a8 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -113,7 +113,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp index 67025b8246..35ccb3e51e 100644 --- a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp @@ -384,7 +384,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_804E50A8[4]; diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index d2925f5a37..63acec4300 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -502,7 +502,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_80677D38[4]; diff --git a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp index a93de0fd9b..226765727f 100644 --- a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp +++ b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp @@ -576,7 +576,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" u32 mNextRoomNo__10dMapInfo_c; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp index 9a0ae434a7..ada5fa2a07 100644 --- a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp +++ b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp @@ -428,7 +428,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp index ec7ae1e7d9..7a16c9deb3 100644 --- a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp +++ b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp @@ -376,7 +376,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp index 13c37b7b36..d0423091f2 100644 --- a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp +++ b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp @@ -433,8 +433,8 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp index 2a92c32b61..b9488c2f90 100644 --- a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp +++ b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp @@ -511,7 +511,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp index e38952df21..d7ab6ac2dd 100644 --- a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp +++ b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp @@ -629,7 +629,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" extern u8 j3dZModeTable[96]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp index 8d2226ef72..378161a9f7 100644 --- a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp +++ b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp @@ -426,7 +426,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp index 67c3b8eee4..e1376a8e10 100644 --- a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp +++ b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp @@ -444,7 +444,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp index e942f0ee91..d6834e956c 100644 --- a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp +++ b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp @@ -527,7 +527,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp index 7355babd82..d4948a6ce5 100644 --- a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp +++ b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp @@ -486,7 +486,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_blackColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp index 6cb7cea55b..631591d61b 100644 --- a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp +++ b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp @@ -473,7 +473,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp index 76b0f4b02c..fec2bf646b 100644 --- a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp +++ b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp @@ -512,7 +512,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp index 44433a7744..bd97869081 100644 --- a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp +++ b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp @@ -468,7 +468,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp index d050cb948a..3e147d3983 100644 --- a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp @@ -332,7 +332,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp index 959e88d2e3..2a60527c4b 100644 --- a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp +++ b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp @@ -393,7 +393,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index a05fa9d411..c31c67ba0d 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -414,7 +414,7 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp index 916b201436..0b66dbc9b0 100644 --- a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp +++ b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp @@ -419,7 +419,7 @@ extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp index 174b908a7d..1517498b6d 100644 --- a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp +++ b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp @@ -620,7 +620,7 @@ extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp index 40ab83ecc7..5a2f896061 100644 --- a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp +++ b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp @@ -644,7 +644,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp index 6078bcce32..39fd96f24a 100644 --- a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp +++ b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp @@ -695,11 +695,11 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_blackColor; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern u8 struct_80450C98[4]; extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); extern "C" void BreakSet__13daObjH_Saku_cFv(); diff --git a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp index 199ad3af05..dbd5fb1745 100644 --- a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp +++ b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp @@ -500,7 +500,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp index 94cf3b5cdc..9341abc737 100644 --- a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp +++ b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp @@ -460,7 +460,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp index 5d44f75fc3..4e428e08e4 100644 --- a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp +++ b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp @@ -525,7 +525,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp index 2888ff1da7..1fde8b8dd9 100644 --- a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp +++ b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp @@ -424,7 +424,7 @@ extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index 280f34ac7b..4d47bde9df 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -311,7 +311,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp index ad46230fdc..cd3f166482 100644 --- a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp +++ b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp @@ -470,7 +470,7 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp index 09323a3c7d..41c8f4bc3b 100644 --- a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp +++ b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp @@ -461,7 +461,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 95112db622..0e55d0b12b 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -383,7 +383,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp index 79d70f3b5a..c5cb0bab99 100644 --- a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp +++ b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp @@ -337,7 +337,7 @@ extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u32 __float_nan; extern "C" u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index fdeed2e167..f61cadf1c9 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -58,7 +58,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp index 7ce86c3367..0339a8defe 100644 --- a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp +++ b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp @@ -65,7 +65,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 64cdfb542a..de075084c4 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -60,7 +60,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp index 6e50eaf772..2b165c5e54 100644 --- a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp +++ b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp @@ -117,7 +117,7 @@ extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp index 738838d570..58c566af02 100644 --- a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp +++ b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp @@ -168,7 +168,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 1a6b2d7de0..fd494c6152 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -128,7 +128,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index 4a484d7566..32d5cc2945 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -42,7 +42,7 @@ extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE(); extern "C" void cLib_addCalc__FPfffff(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp index 4d4585bd5a..c4a83680a3 100644 --- a/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp +++ b/rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp @@ -64,7 +64,7 @@ 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_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp index 64b3d24543..d3c7c12165 100644 --- a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp +++ b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp @@ -89,7 +89,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp index 8f0f4beb74..db938a6b39 100644 --- a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp +++ b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp @@ -114,7 +114,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index 80134be273..01faa09370 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -58,7 +58,7 @@ 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 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index 02d16aef86..db890c3bd5 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -59,7 +59,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp index 149dace1af..6b389d9459 100644 --- a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp +++ b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp @@ -773,7 +773,7 @@ extern "C" u8 mFindActorPtrs__8daNpcT_c[200]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mSrchName__8daNpcT_c[2 + 2 /* padding */]; extern "C" u8 mFindCount__8daNpcT_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp index bd9ceb6429..ccfe457549 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp @@ -643,7 +643,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp index 9cb8d28914..9221dc8ed6 100644 --- a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp +++ b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp @@ -631,7 +631,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" extern u32 __float_nan; extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp index 800cec5e48..752d99c7af 100644 --- a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp @@ -693,7 +693,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" extern u32 g_saftyWhiteColor; extern "C" extern u32 __float_nan; extern "C" f32 mFadeRate__13mDoGph_gInf_c; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp index 46e6de4649..54d90800d5 100644 --- a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp @@ -340,7 +340,7 @@ extern "C" extern void* __vt__9cCcD_Stts[8]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp index bc52e23aa1..d9d89c8d90 100644 --- a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp +++ b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp @@ -543,7 +543,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void getType__13daNpc_Hanjo_cFv(); extern "C" void __register_global_object(); diff --git a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp index ec10cf412f..282a16a3eb 100644 --- a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp +++ b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp @@ -729,7 +729,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp index 2c134e1910..8b9537bd9a 100644 --- a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp +++ b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp @@ -348,7 +348,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp index adc98d35da..cbd525200a 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp @@ -221,7 +221,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 struct_80BC7EB8[4]; diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index 36ffc5dac2..cd39f9ae8c 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -92,7 +92,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 g_whiteColor; extern "C" extern u32 __float_nan; extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp index 05458adde8..d24fa32e2f 100644 --- a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp @@ -183,7 +183,7 @@ extern "C" f32 Zero__4cXyz[3]; extern "C" extern u8 j3dSys[284]; extern "C" extern u32 g_whiteColor; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // diff --git a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp index 01c83cd044..9e168d992f 100644 --- a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp @@ -353,7 +353,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp index 2d9b252df4..3d1bb0e26b 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp @@ -355,7 +355,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp index cf5d36bf51..e8d594d27b 100644 --- a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp @@ -357,7 +357,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp index 22032c557a..ef23538c48 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp @@ -347,7 +347,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" extern u8 data_805980F8[4]; diff --git a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp index a7a1682065..aefcbf7304 100644 --- a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp +++ b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp @@ -172,7 +172,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp index b77d505370..ed3976c4e8 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp @@ -138,7 +138,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp index 76b7d4ab4a..6ff8ab4acd 100644 --- a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp @@ -204,7 +204,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __register_global_object(); diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index a657d4de4d..a63862f26c 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -203,7 +203,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp index dd6d1e38f6..6cb2965dd9 100644 --- a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp @@ -222,7 +222,7 @@ extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_whiteColor; extern "C" extern u32 __float_nan; extern "C" f32 mRoofY__11fopAcM_rc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; diff --git a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp index 21157fe895..8a8d87f7f8 100644 --- a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp @@ -206,7 +206,7 @@ extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // diff --git a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp index a91729f173..a1dcf00b7b 100644 --- a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp +++ b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp @@ -115,7 +115,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index 83fc02a596..57ea3e322c 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -56,7 +56,7 @@ extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp index 35b7191239..9f0b386c8a 100644 --- a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp +++ b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp @@ -130,7 +130,7 @@ 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 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp index c7babf5043..e4af50b172 100644 --- a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp +++ b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp @@ -143,7 +143,7 @@ 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 u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index 840c929538..0e4a5d4141 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -82,7 +82,7 @@ extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index c594e16097..71427727b1 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -131,7 +131,7 @@ extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index 1aa6eea779..5cf59b7b55 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -69,7 +69,7 @@ extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp index 16cd579fd2..a4f58dc1dc 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp @@ -134,7 +134,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u32 g_blackColor; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp index f70991acf6..41b54695fc 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp @@ -140,7 +140,7 @@ extern "C" void strlen(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index 88b37ecd30..08bc7efd4d 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -102,7 +102,7 @@ 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" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" void __register_global_object(); // diff --git a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp index 62675531d0..6316c7832f 100644 --- a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp +++ b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp @@ -142,7 +142,7 @@ 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 u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp index 48f808b79f..c6f0039fac 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp @@ -96,7 +96,7 @@ extern "C" void _restgpr_28(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // diff --git a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp index 6f96a018b1..d9f197d560 100644 --- a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp +++ b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp @@ -85,7 +85,7 @@ 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" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index 7a2adf3823..ec5321ba4e 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -79,7 +79,7 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 61a4c41c76..7be119fe41 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -18079,32 +18079,32 @@ int daAlink_c::checkItemSetButton(int i_itemNo) { /* 800C0284-800C02C8 0BABC4 0044+00 1/1 0/0 0/0 .text checkField__9daAlink_cFv */ bool daAlink_c::checkField() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 0; + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_FIELD; } /* 800C02C8-800C0310 0BAC08 0048+00 6/6 0/0 0/0 .text checkBossRoom__9daAlink_cFv */ bool daAlink_c::checkBossRoom() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 3; + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM; } /* 800C0310-800C0358 0BAC50 0048+00 4/4 0/0 0/0 .text checkDungeon__9daAlink_cFv */ bool daAlink_c::checkDungeon() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 1; + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON; } /* 800C0358-800C03A0 0BAC98 0048+00 3/3 0/0 0/0 .text checkCastleTown__9daAlink_cFv */ bool daAlink_c::checkCastleTown() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 4; + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CASTLE_TOWN; } /* 800C03A0-800C03E8 0BACE0 0048+00 6/6 0/0 1/1 .text checkCloudSea__9daAlink_cFv */ bool daAlink_c::checkCloudSea() { - return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == 5; + return dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_CLOUD_SEA; } /* 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()) == 2 || 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 */ @@ -19697,9 +19697,9 @@ asm void daAlink_c::setWaterDropColor(J3DGXColorS10 const* param_0) { /* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text initTevCustomColor__9daAlink_cFv */ void daAlink_c::initTevCustomColor() { mTevStr.field_0x367 = 0; - mTevStr.field_0x358 = 0; - mTevStr.field_0x35a = 0; - mTevStr.field_0x35c = 0; + mTevStr.mFogColor.r = 0; + mTevStr.mFogColor.g = 0; + mTevStr.mFogColor.b = 0; mTevStr.field_0x360 = 0; mTevStr.field_0x362 = 0; } @@ -20034,7 +20034,14 @@ daAlink_c::firePointEff_c::firePointEff_c() { } /* 800CFC7C-800CFCB8 0CA5BC 003C+00 0/0 2/2 0/0 .text __dt__15LIGHT_INFLUENCEFv */ -LIGHT_INFLUENCE::~LIGHT_INFLUENCE() {} +#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() {} diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index b412574cbd..e90e464386 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -83,7 +83,7 @@ extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 data_804505F0[8]; -extern "C" extern u8 data_80450D68[4]; +extern "C" extern u8 mNoChangeRoom__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 5998b2abf7..844c2b15d4 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -1775,22 +1775,22 @@ int daNpcT_c::draw(int param_0, int param_1, f32 param_2, GXColorS10* color, f32 return 1; } - mTevStr.field_0x358 = 0; - mTevStr.field_0x35a = 0; - mTevStr.field_0x35c = 0; - mTevStr.field_0x35e = 0; + mTevStr.mFogColor.r = 0; + mTevStr.mFogColor.g = 0; + mTevStr.mFogColor.b = 0; + mTevStr.mFogColor.a = 0; if (color != NULL) { - mTevStr.field_0x358 = color->r; - mTevStr.field_0x35a = color->g; - mTevStr.field_0x35c = color->b; - mTevStr.field_0x35e = color->a; + mTevStr.mFogColor.r = color->r; + mTevStr.mFogColor.g = color->g; + mTevStr.mFogColor.b = color->b; + mTevStr.mFogColor.a = color->a; } if (field_0xdb8 != 0 && mTimer != 0) { f32 r = (f32)field_0xdb8 / (f32)mTimer; if (!cM3d_IsZero(r)) { - mTevStr.field_0x358 = r * 20.0f; + mTevStr.mFogColor.r = r * 20.0f; } } else if (param_0 != 0) { mTevStr.field_0x35a = 20; @@ -1874,8 +1874,8 @@ asm int daNpcT_c::draw(int param_0, int param_1, f32 param_2, _GXColorS10* param /* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text setEnvTevColor__8daNpcT_cFv */ void daNpcT_c::setEnvTevColor() { - mTevStr.field_0x381 = dComIfG_Bgsp().GetPolyColor(field_0x930); - mTevStr.field_0x380 = dComIfG_Bgsp().GetRoomId(field_0x930); + mTevStr.mEnvrIdxOverride = dComIfG_Bgsp().GetPolyColor(field_0x930); + mTevStr.mRoomNo = dComIfG_Bgsp().GetRoomId(field_0x930); } /* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text setRoomNo__8daNpcT_cFv */ diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index a4b514c5aa..58aed46dea 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -543,23 +543,23 @@ s32 dBgS::GetWallCode(cBgS_PolyInfo const& poly) { } /* 80074E50-80074EA0 06F790 0050+00 0/0 29/29 28/28 .text GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo */ -BOOL dBgS::GetPolyAtt0(cBgS_PolyInfo const& poly) { +int dBgS::GetPolyAtt0(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->GetPolyAtt0(poly); } - return false; + return 0; } /* 80074EA0-80074EF0 06F7E0 0050+00 0/0 13/13 0/0 .text GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo */ -bool dBgS::GetPolyAtt1(cBgS_PolyInfo const& poly) { +int dBgS::GetPolyAtt1(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->GetPolyAtt1(poly); } - return false; + return 0; } /* 80074EF0-80074F40 06F830 0050+00 0/0 7/7 8/8 .text GetGroundCode__4dBgSFRC13cBgS_PolyInfo */ diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index 2a8c6dd59b..5dbf684e31 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -1167,7 +1167,7 @@ asm s32 dBgW::GetWallCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm BOOL dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { +asm int dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyAtt0__4dBgWFRC13cBgS_PolyInfo.s" } @@ -1177,7 +1177,7 @@ asm BOOL dBgW::GetPolyAtt0(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm bool dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { +asm int dBgW::GetPolyAtt1(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w/GetPolyAtt1__4dBgWFRC13cBgS_PolyInfo.s" } diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 73fad0f717..86f8b94d12 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -767,7 +767,7 @@ asm s32 dBgWKCol::GetWallCode(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm BOOL dBgWKCol::GetPolyAtt0(cBgS_PolyInfo const& param_0) { +asm int dBgWKCol::GetPolyAtt0(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetPolyAtt0__8dBgWKColFRC13cBgS_PolyInfo.s" } @@ -777,7 +777,7 @@ asm BOOL dBgWKCol::GetPolyAtt0(cBgS_PolyInfo const& param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dBgWKCol::GetPolyAtt1(cBgS_PolyInfo const& param_0) { +asm int dBgWKCol::GetPolyAtt1(cBgS_PolyInfo const& param_0) { nofralloc #include "asm/d/bg/d_bg_w_kcol/GetPolyAtt1__8dBgWKColFRC13cBgS_PolyInfo.s" } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 1c27da54d8..2a9a15fae5 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -816,7 +816,7 @@ extern "C" f32 Zero__4cXyz[3]; extern "C" u8 BaseY__4cXyz[12]; extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 stopStatus__10fopAc_ac_c[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index c4b58509b7..11400f2804 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -532,7 +532,7 @@ extern "C" extern u8 g_env_light[4880]; extern "C" extern u32 g_blackColor; extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 mEmitterMng__13dPa_control_c[4]; // diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index e304c32e04..f7c664ca82 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -109,7 +109,7 @@ extern "C" extern void* __vt__8cM3dGLin[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 92b3bb011a..24a1b87f31 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -170,7 +170,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 j3dSys[284]; extern "C" extern u8 g_clearColor[4]; extern "C" extern u8 data_80450688[8]; -extern "C" extern u8 struct_80450BB8[4]; +extern "C" extern u8 mInitFlag__17mDoAud_zelAudio_c[4]; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 5bf51bd45d..1e008668e9 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -402,7 +402,7 @@ extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" f32 Zero__4cXyz[3]; extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_object__7dDemo_c[4]; extern "C" extern u8 struct_80450F88[8]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 86e0369bbc..b36b703b5b 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -150,7 +150,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index cfbebadbe5..ae5c8f4e40 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -169,7 +169,7 @@ extern "C" u8 mGndCheck__11fopAcM_gc_c[84]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index ce833cde6e..2bfaf8446e 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -128,7 +128,7 @@ extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 struct_80451070[8]; // diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index ce00b54a32..23abd6e669 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -61,8 +61,8 @@ void dMdl_c::draw() { mpModelData->getMaterialNodePointer(mMaterialId)->loadSharedDL(); shape->loadPreDrawSetting(); - GXColor amb_color = {mpTevstr->field_0x348.r, mpTevstr->field_0x348.g, mpTevstr->field_0x348.b, - mpTevstr->field_0x348.a}; + GXColor amb_color = {mpTevstr->mColorC0.r, mpTevstr->mColorC0.g, mpTevstr->mColorC0.b, + mpTevstr->mColorC0.a}; GXSetChanAmbColor(GX_COLOR0A0, amb_color); GXSetChanMatColor(GX_COLOR0A0, g_whiteColor); dKy_setLight_nowroom_actor(mpTevstr); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 8f7fbaf781..ed36960c30 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -442,7 +442,7 @@ static u8 dStage_isBossStage(dStage_dt_c* stageDt) { return false; } - return dStage_stagInfo_GetSTType(pstag) == 3; + return dStage_stagInfo_GetSTType(pstag) == ST_BOSS_ROOM; } /* 80023F50-80023F84 01E890 0034+00 1/1 0/0 0/1 .text dStage_KeepDoorInfoInit__FP11dStage_dt_c */ @@ -503,40 +503,12 @@ void dStage_startStage_c::set(const char* i_Name, s8 i_RoomNo, s16 i_Point, s8 i /* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */ dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40]; -/* 80450D58-80450D60 000258 0008+00 1/1 0/0 0/0 .sbss tmp_name$4456 */ -static char tmp_name[8]; - -/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */ -u32 dStage_roomControl_c::mProcID; - -/* 80450D64-80450D68 -00001 0004+00 6/6 94/94 101/101 .sbss None */ -/* 80450D64 0001+00 data_80450D64 None */ -s8 struct_80450D64; - -/* 80450D65 0001+00 data_80450D65 None */ -s8 gLastStayNo; - -/* 80450D66 0001+00 data_80450D66 None */ -s8 gNextStayNo; - -/* 80450D67 0001+00 data_80450D67 None */ -s8 gTimePass; - -/* 80450D68-80450D6C 000268 0004+00 2/2 2/2 1/1 .sbss None */ -u8 data_80450D68; - -/* 80450D6C-80450D70 00026C 0004+00 1/1 2/2 0/0 .sbss mArcBankName__20dStage_roomControl_c */ -char* dStage_roomControl_c::mArcBankName; - -/* 80450D70-80450D74 000270 0004+00 1/1 1/1 0/0 .sbss mArcBankData__20dStage_roomControl_c */ -char* dStage_roomControl_c::mArcBankData; - /* 800241E8-80024338 01EB28 0150+00 1/1 0/0 0/4 .text init__20dStage_roomControl_cFv */ void dStage_roomControl_c::init() { - struct_80450D64 = -1; - gLastStayNo = -1; - gNextStayNo = -1; - data_80450D68 = 0; + mStayNo = -1; + mOldStayNo = -1; + mNextStayNo = -1; + mNoChangeRoom = 0; data_804505F0 = -1; if (dComIfGp_getStartStagePoint() >= 0 || dComIfGp_getStartStagePoint() == -4) { @@ -1610,20 +1582,20 @@ JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int i_roomNo) { /* 800243E8-80024424 01ED28 003C+00 2/2 0/0 0/0 .text setStayNo__20dStage_roomControl_cFi */ void dStage_roomControl_c::setStayNo(int stayNo) { - gLastStayNo = struct_80450D64; - struct_80450D64 = stayNo; - gNextStayNo = struct_80450D64; + mOldStayNo = mStayNo; + mStayNo = stayNo; + mNextStayNo = mStayNo; - if (struct_80450D64 < 0) { + if (mStayNo < 0) { return; } - onStatusDraw(struct_80450D64); + onStatusDraw(mStayNo); } /* 80024424-8002442C 01ED64 0008+00 0/0 0/0 1/1 .text setNextStayNo__20dStage_roomControl_cFi */ void dStage_roomControl_c::setNextStayNo(int nextStayNo) { - gNextStayNo = nextStayNo; + mNextStayNo = nextStayNo; } static int stayRoomCheck(int param_0, u8* param_1, int param_2) { @@ -1679,8 +1651,8 @@ void dStage_roomControl_c::zoneCountCheck(int stayNo) const { dComIfGs_clearRoomSwitch(status->mZoneNo); dComIfGs_clearRoomItem(status->mZoneNo); - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 0 && - stayNo != gLastStayNo) { + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_FIELD && + stayNo != mOldStayNo) { if (--status->mZoneCount == 0) { dComIfGs_removeZone(status->mZoneNo); status->mZoneNo = -1; @@ -1928,7 +1900,7 @@ static int dStage_roomInit(int stayNo) { /* 80024DB0-80024DB8 01F6F0 0008+00 2/2 0/0 0/0 .text SetTimePass__20dStage_roomControl_cFi */ void dStage_roomControl_c::SetTimePass(int isPassing) { - gTimePass = isPassing; + m_time_pass = isPassing; } roomRead_class* dStage_stageDt_c::getRoom() const { @@ -1948,6 +1920,8 @@ dStage_objectNameInf* dStage_searchName(char const* objName) { } static const char* dStage_getName(s16 procName, s8 subtype) { + static char tmp_name[8]; + dStage_objectNameInf* obj = &l_objectName[0]; char* tmp = NULL; @@ -1974,6 +1948,31 @@ const char* dStage_getName2(s16 procName, s8 subtype) { return dStage_getName(procName, subtype); } +/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */ +u32 dStage_roomControl_c::mProcID; + +/* 80450D64-80450D68 -00001 0004+00 6/6 94/94 101/101 .sbss None */ +/* 80450D64 0001+00 data_80450D64 None */ +s8 dStage_roomControl_c::mStayNo; + +/* 80450D65 0001+00 data_80450D65 None */ +s8 dStage_roomControl_c::mOldStayNo; + +/* 80450D66 0001+00 data_80450D66 None */ +s8 dStage_roomControl_c::mNextStayNo; + +/* 80450D67 0001+00 data_80450D67 None */ +s8 dStage_roomControl_c::m_time_pass; + +/* 80450D68-80450D6C 000268 0004+00 2/2 2/2 1/1 .sbss None */ +u8 dStage_roomControl_c::mNoChangeRoom; + +/* 80450D6C-80450D70 00026C 0004+00 1/1 2/2 0/0 .sbss mArcBankName__20dStage_roomControl_c */ +char* dStage_roomControl_c::mArcBankName; + +/* 80450D70-80450D74 000270 0004+00 1/1 1/1 0/0 .sbss mArcBankData__20dStage_roomControl_c */ +char* dStage_roomControl_c::mArcBankData; + /* 80024EFC-80024F98 01F83C 009C+00 7/7 0/0 0/0 .text * dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class */ static void dStage_actorCreate(stage_actor_data_class* param_0, fopAcM_prm_class* param_1) { @@ -2926,7 +2925,7 @@ void dStage_Delete() { strcmp(dComIfGp_getNextStageName(), dComIfGp_getStartStageName())) { dStage_roomControl_c::destroyMemoryBlock(); - if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == 1) { + if (dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) == ST_DUNGEON) { dRes_info_c* info = dComIfG_getStageResInfo("Stg_00"); *info->getArchiveName() = 'X'; dComIfGp_setOldMulti(); diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index 3781dafe96..6726996672 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -61,10 +61,6 @@ extern "C" void _restgpr_28(); extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern bool data_80450680; -// -// Declarations: -// - /* ############################################################################################## */ /* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss mTypeGroupData__7dTres_c */ dTres_c::typeGroupData_c* dTres_c::mTypeGroupData; @@ -81,7 +77,7 @@ asm int dTres_c::createWork() { /* 8009BC18-8009BC60 096558 0048+00 0/0 1/1 0/0 .text create__7dTres_cFv */ void dTres_c::create() { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 3) { + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { reset(); } } @@ -116,7 +112,7 @@ void dTres_c::reset() { */ #ifdef NONMATCHING void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) { - if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != 3) { + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) { reset(); typeGroupData_c* listData = p_list->field_0x4; diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index 087fc72ff1..4d8c3ffd6d 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -11,6 +11,8 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_audio.h" +#include "SSystem/SComponent/c_math.h" +#include "SSystem/SComponent/c_counter.h" // // Types: @@ -305,7 +307,6 @@ extern "C" void __as__12J3DLightInfoFRC12J3DLightInfo(); extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void GXInitLightAttn(); extern "C" void __register_global_object(); extern "C" void __destroy_arr(); extern "C" void __construct_array(); @@ -342,7 +343,6 @@ extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; extern "C" u8 m_bloom__13mDoGph_gInf_c[20]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -545,7 +545,7 @@ SECTION_DATA static u8 lightStatusBase[232] = { /* 803BBEAC-803BBEBC 018FCC 0010+00 4/4 0/0 0/0 .data lightMaskData */ SECTION_DATA static u16 lightMaskData[8] = { - 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, + GX_LIGHT0, GX_LIGHT1, GX_LIGHT2, GX_LIGHT3, GX_LIGHT4, GX_LIGHT5, GX_LIGHT6, GX_LIGHT7, }; /* 8019CB0C-8019CCDC 19744C 01D0+00 3/2 0/0 0/0 .text dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 */ @@ -1049,7 +1049,7 @@ SECTION_SDATA2 static f32 lit_5077 = 99999.8984375f; /* 8019E694-8019E708 198FD4 0074+00 2/2 0/0 0/0 .text plight_init__Fv */ static void plight_init() { - g_env_light.field_0x38[0].mPow = lit_5077; + g_env_light.mLightInfluence[0].mPow = lit_5077; for (int i = 0; i < 100; i++) { g_env_light.mPointLight[i] = NULL; @@ -1060,8 +1060,8 @@ static void plight_init() { g_env_light.field_0x72c[i] = NULL; } - g_env_light.field_0x12a4 = -1; - g_env_light.field_0x12a8 = -1; + g_env_light.mPlayerPLightIdx = -1; + g_env_light.mPlayerEfLightIdx = -1; } /* 8019E708-8019E734 199048 002C+00 1/1 0/0 0/0 .text darkmist_init__Fv */ @@ -1206,6 +1206,186 @@ SECTION_SDATA2 static f32 lit_5348 = 360.0f; SECTION_SDATA2 static f32 lit_5349 = 0.012000000104308128f; /* 8019EC98-8019F264 1995D8 05CC+00 1/1 0/0 0/0 .text envcolor_init__Fv */ +#ifdef NONMATCHING +static void envcolor_init() { + stage_palette_info_class* palette = dComIfGp_getStagePaletteInfo(); + stage_pselect_info_class* pselect = dComIfGp_getStagePselectInfo(); + stage_envr_info_class* envr = dComIfGp_getStageEnvrInfo(); + stage_vrbox_info_class* vrbox = dComIfGp_getStageVrboxcolInfo(); + + dKy_actor_addcol_set(0, 0, 0, 0.0f); + dKy_fog_startendz_set(0.0f, 0.0f, 0.0f); + dKy_vrbox_addcol_set(0, 0, 0, 0.0f); + + g_env_light.field_0x1280 = 0; + g_env_light.mInitAnmTimer = 1; + g_env_light.mSchBit = 0; + g_env_light.mSchbitTimer = 0; + + g_env_light.mVrboxInvisible = false; + g_env_light.mContrastFlag = 0; + g_env_light.mFogAdjEnable = true; + g_env_light.mFogAdjTableType = 0; + g_env_light.mFogAdjCenter = 0x140; + dKyd_xfog_table_set(0); + + g_env_light.mColAllcolRatio = 1.0f; + g_env_light.mColActColRatio = 1.0f; + g_env_light.mColBgColRatio = 1.0f; + g_env_light.mColFogColRatio = 1.0f; + g_env_light.mColVrboxSoraColRatio = 1.0f; + g_env_light.mColVrboxKumocolRatio = 1.0f; + g_env_light.field_0x1210 = 1.0f; + + g_env_light.mAllcolRatio = 1.0f; + g_env_light.mActcolRatio = 1.0f; + g_env_light.mBgcolRatio = 1.0f; + g_env_light.mFogcolRatio = 1.0f; + g_env_light.mVrboxSoracolRatio = 1.0f; + g_env_light.mVrboxKumocolRatio = 1.0f; + g_env_light.field_0x122c = 1.0f; + + g_env_light.mItemGetCol_chg = 0; + g_env_light.field_0x1240 = 0.0f; + g_env_light.field_0x1230 = 0.0f; + g_env_light.field_0x1234 = 0.0f; + + g_env_light.mThunderEff.mStateTimer = 0; + g_env_light.field_0x1238 = 0.0f; + g_env_light.field_0x123c = 0.0f; + g_env_light.field_0x12d6 = 0; + g_env_light.mShadowMode = 0; + g_env_light.mCameraInWater = 0; + + g_env_light.field_0x1258 = 0.0f; + g_env_light.mActorLightEffect = 100; + g_env_light.mPaletteTerrainLightEffect = 1.0f; + g_env_light.field_0x1064 = 0.0f; + g_env_light.field_0x1068 = -1.0f; + g_env_light.field_0x106c = -1.0f; + g_env_light.mDemoAttentionPoint = 0.0f; + + if (!strcmp(dComIfGp_getStartStageName(), "R_SP127")) { + g_env_light.mDemoAttentionPoint = 0.11f; + } + + g_env_light.field_0x1308 = 0; + g_env_light.field_0x130b = 0; + g_env_light.field_0x1309 = 1; + dKy_light_size_get(dComIfGp_getStartStageName()); + g_env_light.mGrassLightEffectRate = 1.0f; + g_env_light.field_0x12fc = -1; + g_env_light.field_0x1278 = 0.0f; + g_env_light.field_0x1264 = -255.0f; + g_env_light.field_0x1268 = 999999.0f; + g_env_light.field_0x126c = 999999.0f; + g_env_light.field_0x127c = 200.0f; + + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM) { + g_env_light.mpSchedule = dKyd_schejule_boss_getp(); + } else { + g_env_light.mpSchedule = dKyd_schejule_getp(); + } + + g_env_light.mNowRoom = dComIfGp_roomControl_getStayNo(); + g_env_light.mEnvrIdxCurr = dComIfGp_roomControl_getStayNo(); + g_env_light.mColPatBlend = 1.0f; + g_env_light.field_0x12b0 = 0; + g_env_light.mColpatWeather = 0; + g_env_light.field_0xecc = 0.0f; + + if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") || !strcmp(dComIfGp_getStartStageName(), "R_SP127")) { + if (g_env_light.field_0x12cc >= 7) { + g_env_light.mColpatWeather = 2; + } else if (g_env_light.field_0x12cc != 0) { + g_env_light.mColpatWeather = 1; + } + } else if (!strcmp(dComIfGp_getStartStageName(), "D_MN07A")) { + if (g_env_light.field_0x12cc == 1) { + g_env_light.mColpatWeather = 1; + } else if (g_env_light.field_0x12cc == 2) { + g_env_light.mColpatWeather = 2; + } + } else { + g_env_light.field_0x12cc = 0; + } + + g_env_light.mRainCountOrig = 0; + g_env_light.field_0x12a0 = 0; + g_env_light.mDiceWeatherMode = 0; + g_env_light.mDiceWeatherChangeTime = dComIfGs_getTime() + (cM_rndF(g_Counter.mCounter0 & 0x1F) * 15.0f); + if (g_env_light.mDiceWeatherChangeTime >= 360.0f) { + g_env_light.mDiceWeatherChangeTime -= 360.0f; + } + + g_env_light.mDiceWeatherState = 0; + g_env_light.mDiceWeatherCurrPattern = 0; + g_env_light.mDiceWeatherCounter = 0; + g_env_light.mDiceWeatherTime = 0.0f; + + g_env_light.mColPatPrev = g_env_light.mColpatWeather; + g_env_light.mColPatCurr = g_env_light.mColpatWeather; + g_env_light.mColpatPrevGather = 0xFF; + g_env_light.mColpatCurrGather = 0xFF; + g_env_light.mColPatBlendGather = -1.0f; + g_env_light.mColPatMode = 0; + g_env_light.mColPatModeGather = 0; + + if (envr != NULL) { + g_env_light.mpDmEnvr = envr; + } else { + g_env_light.mpDmEnvr = (stage_envr_info_class*)dKyd_dmenvr_getp(); + } + + if (palette != NULL) { + g_env_light.mpDmPalet = palette; + } else { + g_env_light.mpDmPalet = (stage_palette_info_class*)dKyd_dmpalet_getp(); + } + + if (pselect != NULL) { + g_env_light.mpDmPselect = pselect; + } else { + g_env_light.mpDmPselect = (stage_pselect_info_class*)dKyd_dmpselect_getp(); + } + + if (vrbox != NULL) { + g_env_light.mpDmVrbox = vrbox; + } else { + g_env_light.mpDmVrbox = (stage_vrbox_info_class*)dKyd_dmvrbox_getp(); + } + + plight_init(); + plight_set(); + darkmist_init(); + bgparts_activelight_init(); + + g_env_light.field_0x11c8 = 1.0f; + g_env_light.field_0x11cc = 1.0f; + g_env_light.field_0x11d0 = 1.0f; + g_env_light.field_0xf2c = 0; + g_env_light.field_0xf30 = NULL; + g_env_light.field_0xf34 = 0.0f; + g_env_light.field_0xf38 = NULL; + + undwater_init(); + dComIfGs_PolyDamageOff_Set(0); + g_env_light.field_0x98c = dComIfGp_roomControl_getStayNo(); + g_env_light.field_0x12fa = 0; + g_env_light.field_0x12fb = 0; + g_env_light.field_0x1300 = -1; + g_env_light.field_0x1302 = -1; + g_env_light.mWaterSurfaceShineRate = 1.0f; + + int timeH = dStage_stagInfo_GetTimeH(i_dComIfGp_getStage()->getStagInfo()); + if (timeH >= 0) { + dComIfGs_setTime(timeH * 15.0f); + } + g_env_light.mTimeSpeed = 0.012f; + + memset(&g_env_light.mMoyaSE, 0, 0x10); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1214,12 +1394,37 @@ static asm void envcolor_init() { #include "asm/d/kankyo/d_kankyo/envcolor_init__Fv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 80453CB8-80453CBC 0022B8 0004+00 3/3 0/0 0/0 .sdata2 @5365 */ SECTION_SDATA2 static f32 lit_5365 = 120.0f; /* 8019F264-8019F2E8 199BA4 0084+00 1/1 1/1 0/0 .text dKy_clear_game_init__Fv */ +// matches with literals +#ifdef NONMATCHING +void dKy_clear_game_init() { + dKy_actor_addcol_set(0, 0, 0, 0.0f); + + g_env_light.mSunPos.x = 1.0f; + g_env_light.mSunPos.y = 0.0f; + g_env_light.mSunPos.z = 0.0f; + + g_env_light.mMoonPos.x = -1.0f; + g_env_light.mMoonPos.y = 0.0f; + g_env_light.mMoonPos.z = 0.0f; + + g_env_light.mNexttime = -1.0f; + g_env_light.mTime = -1.0f; + g_env_light.mDarkDaytime = 120.0f; + + g_env_light.mDarktimeWeek = 0; + g_env_light.field_0x12fe = 0; + g_env_light.field_0x130a = 0; + g_env_light.field_0x12cc = 0; + g_env_light.field_0x130c = 0; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1228,6 +1433,7 @@ asm void dKy_clear_game_init() { #include "asm/d/kankyo/d_kankyo/dKy_clear_game_init__Fv.s" } #pragma pop +#endif /* ############################################################################################## */ /* 803BBFD0-803BBFF0 -00001 0020+00 1/1 0/0 0/0 .data @5842 */ @@ -1508,7 +1714,7 @@ WIND_INF_ENTITY::WIND_INF_ENTITY() { } /* 8019F4F8-8019F4FC 199E38 0004+00 1/1 0/0 0/0 .text __ct__15LIGHT_INFLUENCEFv */ -LIGHT_INFLUENCE::LIGHT_INFLUENCE() { +extern "C" void __ct__15LIGHT_INFLUENCEFv() { /* empty function */ } @@ -1919,7 +2125,7 @@ asm void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* param_0, dKy_ Z2EnvSeMgr g_mEnvSeMgr; /* 8042E07C-8042E7BC 05AD9C 0740+00 5/4 0/0 0/0 .bss lightStatusData */ -static u8 lightStatusData[1856]; +static LightStatus lightStatusData[8]; /* 80453D4C-80453D50 00234C 0004+00 1/1 0/0 0/0 .sdata2 @7011 */ SECTION_SDATA2 static f32 lit_7011 = 30000.0f; @@ -2214,14 +2420,70 @@ SECTION_DEAD static char const* const stringBase_80394E5E = "colordata_tbl.dat"; #pragma pop /* 801A5C1C-801A5E54 1A055C 0238+00 1/0 0/0 0/0 .text dKy_Create__FPv */ +// matches with literals +#ifdef NONMATCHING +static int dKy_Create(void*) { + BOOL setNextTime = false; + stage_envr_info_class* envr = dComIfGp_getStageEnvrInfo(); + if (envr != NULL && dComIfGp_getStartStageRoomNo() != -1) { + if (envr[dComIfGp_getStartStageRoomNo()].field_0x0[0x40] != 0) { + mDoGph_gInf_c::getBloom()->create(); + } + } + + envcolor_init(); + g_env_light.field_0x12b0 = 0; + g_env_light.field_0x1254 = 1.0f; + g_env_light.mPLightNearPos.x = 0.0f; + g_env_light.mPLightNearPos.y = 0.0f; + g_env_light.mPLightNearPos.z = 0.0f; + g_env_light.field_0xf3c = 0; + g_env_light.field_0xf40 = 0.0f; + g_env_light.field_0xf3d = 0; + + dKy_setLight_init(); + dKy_Sound_init(); + dKyw_wind_set(); + dungeonlight_init(); + dKy_setLight_nowroom(dComIfGp_roomControl_getStayNo()); + + g_env_light.mResPolEfftbl = (dKy_pol_efftbl_struct*)dComIfG_getStageRes("pol_efftbl.dat"); + g_env_light.mResPolEffcol = (dKy_pol_effcol_struct*)dComIfG_getStageRes("pol_effcol.dat"); + g_env_light.mResPolEfftbl2 = (dKy_pol_efftbl_struct*)dComIfG_getStageRes("pol_efftbl2.dat"); + g_env_light.mResPolEffcol2 = (dKy_pol_effcol_struct*)dComIfG_getStageRes("pol_effcol2.dat"); + g_env_light.mResPolSound = (dKy_pol_sound_struct*)dComIfG_getStageRes("pol_sound.dat"); + g_env_light.mResPolArg = (dKy_pol_arg_struct*)dComIfG_getStageRes("pol_arg.dat"); + g_env_light.mResColorDataTbl = (dKy_color_data_struct*)dComIfG_getStageRes("colordata_tbl.dat"); + + if (g_env_light.mNexttime != -1.0f) { + setNextTime = true; + dComIfGs_setTime(g_env_light.mNexttime); + } + + if (dKy_darkworld_check()) { + if (g_env_light.mTime == -1.0f) { + g_env_light.mTime = dComIfGs_getTime(); + } + } else if (g_env_light.mTime != -1.0f) { + if (!setNextTime) { + dComIfGs_setTime(g_env_light.mTime); + } + g_env_light.mTime = -1.0f; + } + + g_env_light.mNexttime = -1.0f; + return 4; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -static asm void dKy_Create(void* param_0) { +static asm int dKy_Create(void* param_0) { nofralloc #include "asm/d/kankyo/d_kankyo/dKy_Create__FPv.s" } #pragma pop +#endif /* 801A5E54-801A60BC 1A0794 0268+00 1/1 1/1 0/0 .text dKy_setLight_init__Fv */ #pragma push @@ -2234,14 +2496,9 @@ asm void dKy_setLight_init() { #pragma pop /* 801A60BC-801A60E0 1A09FC 0024+00 0/0 1/1 0/0 .text dKy_setLight__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_setLight() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_setLight__Fv.s" +void dKy_setLight() { + g_env_light.mSunPos2 = g_env_light.mSunPos; } -#pragma pop /* 801A60E0-801A61F4 1A0A20 0114+00 2/2 0/0 0/0 .text dKy_GlobalLight_set__Fv */ #pragma push @@ -2553,14 +2810,11 @@ asm void dKy_vrbox_addcol_kasumi_set(s16 param_0, s16 param_1, s16 param_2, f32 #pragma pop /* 801A8060-801A80D0 1A29A0 0070+00 1/1 0/0 0/0 .text dKy_vrbox_addcol_set__Fsssf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_vrbox_addcol_set__Fsssf.s" +static void dKy_vrbox_addcol_set(s16 param_0, s16 param_1, s16 param_2, f32 param_3) { + dKy_vrbox_addcol_sky0_set(param_0, param_1, param_2, param_3); + dKy_vrbox_addcol_kasumi_set(param_0, param_1, param_2, param_3); + dKy_addcol_fog_set(param_0, param_1, param_2, param_3); } -#pragma pop /* ############################################################################################## */ /* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -2581,24 +2835,24 @@ asm void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 param_2) { #pragma pop /* 801A8168-801A8190 1A2AA8 0028+00 0/0 1/1 0/0 .text dKy_Itemgetcol_chg_on__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_Itemgetcol_chg_on() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_Itemgetcol_chg_on__Fv.s" +void dKy_Itemgetcol_chg_on() { + if (g_env_light.mItemGetCol_chg != 0 && g_env_light.mItemGetCol_chg != 6) { + return; + } + + g_env_light.mItemGetCol_chg = 1; } -#pragma pop /* 801A8190-801A81C0 1A2AD0 0030+00 2/2 0/0 0/0 .text dKy_Sound_init__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_Sound_init() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_Sound_init__Fv.s" +static void dKy_Sound_init() { + f32 tmp = lit_5346; + g_env_light.mSound.field_0x0.x = tmp; + g_env_light.mSound.field_0x0.y = tmp; + g_env_light.mSound.field_0x0.z = tmp; + g_env_light.mSound.field_0xc = 0; + g_env_light.mSound.field_0x14 = -1; + g_env_light.mSound.field_0x10 = 0; } -#pragma pop /* 801A81C0-801A8474 1A2B00 02B4+00 0/0 5/5 27/27 .text dKy_Sound_set__F4cXyziUii */ #pragma push @@ -2611,14 +2865,9 @@ asm void dKy_Sound_set(cXyz param_0, int param_1, unsigned int param_2, int para #pragma pop /* 801A8474-801A8484 1A2DB4 0010+00 0/0 1/1 8/8 .text dKy_Sound_get__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm SND_INFLUENCE* dKy_Sound_get() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_Sound_get__Fv.s" +SND_INFLUENCE* dKy_Sound_get() { + return &g_env_light.mSound; } -#pragma pop /* 801A8484-801A8538 1A2DC4 00B4+00 0/0 2/2 0/0 .text dKy_SordFlush_set__F4cXyzi */ #pragma push @@ -2695,37 +2944,96 @@ static asm void GxXFog_set() { #pragma pop /* 801A87E4-801A880C 1A3124 0028+00 0/0 0/0 52/52 .text dKy_change_colpat__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_change_colpat(u8 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_change_colpat__FUc.s" +void dKy_change_colpat(u8 colpat) { + g_env_light.mColpatCurrGather = colpat; + if (g_env_light.mColPatCurr == colpat) { + return; + } + + g_env_light.mColPatBlendGather = FLOAT_LABEL(lit_4409); } -#pragma pop /* 801A880C-801A8854 1A314C 0048+00 0/0 0/0 25/25 .text dKy_custom_colset__FUcUcf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_custom_colset(u8 param_0, u8 param_1, f32 param_2) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_custom_colset__FUcUcf.s" +void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend) { + if (g_env_light.mInitAnmTimer != 1) { + if (blend < lit_4505) { + g_env_light.mColpatPrevGather = prevGather; + } else { + g_env_light.mColpatPrevGather = curGather; + } + + g_env_light.mColpatCurrGather = curGather; + g_env_light.mColPatBlendGather = blend; + g_env_light.mColPatModeGather = 1; + } } -#pragma pop /* 801A8854-801A88EC 1A3194 0098+00 0/0 0/0 2/2 .text dKy_setLight_mine__FP12dKy_tevstr_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_setLight_mine(dKy_tevstr_c* param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_setLight_mine__FP12dKy_tevstr_c.s" +void dKy_setLight_mine(dKy_tevstr_c* p_tevstr) { + GXLightObj light; + + GXInitLightPos(&light, p_tevstr->mLightObj.mInfo.mLightPosition.x, + p_tevstr->mLightObj.mInfo.mLightPosition.y, + p_tevstr->mLightObj.mInfo.mLightPosition.z); + GXInitLightDir(&light, p_tevstr->mLightObj.mInfo.mLightDirection.x, + p_tevstr->mLightObj.mInfo.mLightDirection.y, + p_tevstr->mLightObj.mInfo.mLightDirection.z); + GXInitLightColor(&light, p_tevstr->mLightObj.mInfo.mColor); + GXInitLightAttn(&light, p_tevstr->mLightObj.mInfo.mCosAtten.x, + p_tevstr->mLightObj.mInfo.mCosAtten.y, p_tevstr->mLightObj.mInfo.mCosAtten.z, + p_tevstr->mLightObj.mInfo.mDistAtten.x, p_tevstr->mLightObj.mInfo.mDistAtten.y, + p_tevstr->mLightObj.mInfo.mDistAtten.z); + GXLoadLightObjImm(&light, (GXLightID)*lightMaskData); } -#pragma pop /* 801A88EC-801A8A34 1A322C 0148+00 2/2 5/5 11/11 .text dKy_tevstr_init__FP12dKy_tevstr_cScUc */ +// almost +#ifdef NONMATCHING +void dKy_tevstr_init(dKy_tevstr_c* p_tevstr, s8 roomNo, u8 param_2) { + memset(p_tevstr, 0, sizeof(dKy_tevstr_c)); + + if (roomNo == -1) { + p_tevstr->mRoomNo = dComIfGp_roomControl_getStayNo(); + } else { + p_tevstr->mRoomNo = roomNo; + } + + p_tevstr->mEnvrIdxCurr = p_tevstr->mRoomNo; + p_tevstr->mEnvrIdxPrev = p_tevstr->mRoomNo; + p_tevstr->mEnvrIdxOverride = param_2; + p_tevstr->mInitTimer = 1; + p_tevstr->mInitType = 0x7B; + p_tevstr->mColorC0.a = 0; + p_tevstr->mColorK0.a = 255; + p_tevstr->field_0x378 = 0; + p_tevstr->field_0x374 = 1.0f; + p_tevstr->field_0x384 = 0; + + p_tevstr->mLightObj.mInfo.mColor.g = 0; + p_tevstr->mLightObj.mInfo.mColor.b = 0; + p_tevstr->mLightObj.mInfo.mColor.a = 255; + p_tevstr->mLightObj.mInfo.mCosAtten.x = 1.0f; + p_tevstr->mLightObj.mInfo.mCosAtten.y = 0.0f; + p_tevstr->mLightObj.mInfo.mCosAtten.z = 0.0f; + p_tevstr->mLightObj.mInfo.mDistAtten.x = 1.0f; + p_tevstr->mLightObj.mInfo.mDistAtten.y = 0.0f; + p_tevstr->mLightObj.mInfo.mDistAtten.z = 0.0f; + + for (int i = 0; i < 6; i++) { + J3DLightObj* light = &p_tevstr->field_0x074[i]; + + lightStatusData[i].field_0x0 = light->mInfo.mLightPosition; + lightStatusData[i].field_0x18 = light->mInfo.mColor; + lightStatusData[i].field_0x1c.x = 1.0f; + lightStatusData[i].field_0x1c.y = 0.0f; + lightStatusData[i].field_0x1c.z = 0.0f; + lightStatusData[i].field_0x28.x = 1.0f; + lightStatusData[i].field_0x28.y = 0.0f; + lightStatusData[i].field_0x28.z = 0.0f; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2734,88 +3042,58 @@ asm void dKy_tevstr_init(dKy_tevstr_c* param_0, s8 param_1, u8 param_2) { #include "asm/d/kankyo/d_kankyo/dKy_tevstr_init__FP12dKy_tevstr_cScUc.s" } #pragma pop +#endif /* 801A8A34-801A8A44 1A3374 0010+00 0/0 1/1 0/0 .text dKy_rain_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_rain_check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_rain_check__Fv.s" +int dKy_rain_check() { + return g_env_light.mRainCount; } -#pragma pop /* 801A8A44-801A8A54 1A3384 0010+00 0/0 0/0 5/5 .text dKy_set_allcol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_allcol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_allcol_ratio__Ff.s" +void dKy_set_allcol_ratio(f32 ratio) { + g_env_light.mAllcolRatio = ratio; } -#pragma pop /* 801A8A54-801A8A64 1A3394 0010+00 0/0 1/1 1/1 .text dKy_set_actcol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_actcol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_actcol_ratio__Ff.s" +void dKy_set_actcol_ratio(f32 ratio) { + g_env_light.mActcolRatio = ratio; } -#pragma pop /* 801A8A64-801A8A74 1A33A4 0010+00 0/0 1/1 1/1 .text dKy_set_bgcol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_bgcol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_bgcol_ratio__Ff.s" +void dKy_set_bgcol_ratio(f32 ratio) { + g_env_light.mBgcolRatio = ratio; } -#pragma pop /* 801A8A74-801A8A84 1A33B4 0010+00 0/0 1/1 1/1 .text dKy_set_fogcol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_fogcol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_fogcol_ratio__Ff.s" +void dKy_set_fogcol_ratio(f32 ratio) { + g_env_light.mFogcolRatio = ratio; } -#pragma pop /* 801A8A84-801A8AB8 1A33C4 0034+00 0/0 1/1 0/0 .text dKy_set_vrboxcol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_vrboxcol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_vrboxcol_ratio__Ff.s" +void dKy_set_vrboxcol_ratio(f32 ratio) { + dKy_set_vrboxsoracol_ratio(ratio); + dKy_set_vrboxkumocol_ratio(ratio); } -#pragma pop /* 801A8AB8-801A8AC8 1A33F8 0010+00 1/1 0/0 0/0 .text dKy_set_vrboxsoracol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_set_vrboxsoracol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_vrboxsoracol_ratio__Ff.s" +static void dKy_set_vrboxsoracol_ratio(f32 ratio) { + g_env_light.mVrboxSoracolRatio = ratio; } -#pragma pop /* 801A8AC8-801A8AD8 1A3408 0010+00 1/1 0/0 0/0 .text dKy_set_vrboxkumocol_ratio__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_set_vrboxkumocol_ratio(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_vrboxkumocol_ratio__Ff.s" +static void dKy_set_vrboxkumocol_ratio(f32 ratio) { + g_env_light.mVrboxKumocolRatio = ratio; } -#pragma pop /* 801A8AD8-801A8B38 1A3418 0060+00 0/0 1/1 0/0 .text dKy_itudemo_se__Fv */ +// matches with literals +#ifdef NONMATCHING +void dKy_itudemo_se() { + if (g_env_light.mMoyaSE != 0) { + mDoAud_seStart(g_env_light.mMoyaSE, NULL, 0, 0); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2824,46 +3102,35 @@ asm void dKy_itudemo_se() { #include "asm/d/kankyo/d_kankyo/dKy_itudemo_se__Fv.s" } #pragma pop +#endif /* 801A8B38-801A8B58 1A3478 0020+00 1/1 2/2 11/11 .text dKy_get_dayofweek__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 dKy_get_dayofweek() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_get_dayofweek__Fv.s" +s32 dKy_get_dayofweek() { + return dComIfGs_getDate() % 7; } -#pragma pop /* 801A8B58-801A8B68 1A3498 0010+00 0/0 3/3 0/0 .text dKy_set_nexttime__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_set_nexttime(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_set_nexttime__Ff.s" +void dKy_set_nexttime(f32 nextTime) { + g_env_light.mNexttime = nextTime; } -#pragma pop /* 801A8B68-801A8BC8 1A34A8 0060+00 0/0 1/1 0/0 .text dKy_instant_timechg__Ff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_instant_timechg(f32 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_instant_timechg__Ff.s" +void dKy_instant_timechg(f32 time) { + if (time < g_env_light.getDaytime()) { + dComIfGs_setDate(dComIfGs_getDate() + 1); + dKankyo_DayProc(); + } + + dComIfGs_setTime(time); } -#pragma pop /* 801A8BC8-801A8C04 1A3508 003C+00 0/0 1/1 0/0 .text dKy_instant_rainchg__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_instant_rainchg() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_instant_rainchg__Fv.s" +void dKy_instant_rainchg() { + dKyw_rain_set(250); + g_env_light.mColpatWeather = 1; + g_env_light.mColPatPrev = 1; + g_env_light.mColPatCurr = 1; } -#pragma pop /* 801A8C04-801A8E20 1A3544 021C+00 3/3 0/0 0/0 .text NewAmbColGet__FP11_GXColorS10 */ #pragma push @@ -3051,24 +3318,14 @@ static asm void dKy_WaterIn_Light_set() { /* 801AB270-801AB280 1A5BB0 0010+00 0/0 2/2 0/0 .text dKy_camera_water_in_status_set__FUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_camera_water_in_status_set(u8 param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_set__FUc.s" +void dKy_camera_water_in_status_set(u8 status) { + g_env_light.mCameraInWater = status; } -#pragma pop /* 801AB280-801AB290 1A5BC0 0010+00 3/3 1/1 5/5 .text dKy_camera_water_in_status_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL dKy_camera_water_in_status_check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_camera_water_in_status_check__Fv.s" +BOOL dKy_camera_water_in_status_check() { + return g_env_light.mCameraInWater; } -#pragma pop /* ############################################################################################## */ /* 80394C6C-80394C6C 0212CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ @@ -3108,14 +3365,26 @@ asm u8 dKy_pol_sound_get(cBgS_PolyInfo const* param_0) { #pragma pop /* 801AB59C-801AB668 1A5EDC 00CC+00 0/0 5/5 0/0 .text dKy_pol_argument_get__FPC13cBgS_PolyInfo */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_pol_argument_get(cBgS_PolyInfo const* param_0) { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_pol_argument_get__FPC13cBgS_PolyInfo.s" +u8 dKy_pol_argument_get(cBgS_PolyInfo const* p_poly) { + dScnKy_env_light_c* envLight = &g_env_light; + + if (p_poly == NULL || &dComIfG_Bgsp() == NULL) { + return 0; + } + + int att0 = dComIfG_Bgsp().GetPolyAtt0(*p_poly); + if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.field_0x12fe == 4 && + att0 == 4) { + att0 = 13; + } + + int att1 = dComIfG_Bgsp().GetPolyAtt1(*p_poly); + if (envLight->mResPolArg != NULL) { + return envLight->mResPolArg[att0].data[att1]; + } + + return 0; } -#pragma pop /* 801AB668-801AB7D0 1A5FA8 0168+00 0/0 1/1 2/2 .text * dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor */ @@ -3128,6 +3397,33 @@ asm void dKy_pol_eff_prim_get(cBgS_PolyInfo const* param_0, _GXColor* param_1) { } #pragma pop +/* u8 dKy_pol_eff_prim_get(cBgS_PolyInfo const* p_poly, GXColor* p_color) { + dScnKy_env_light_c* envLight = &g_env_light; + + if (p_poly == NULL || p_color == NULL || &dComIfG_Bgsp() == NULL) { + return 0xFF; + } + + int att0 = dComIfG_Bgsp().GetPolyAtt0(*p_poly); + if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && g_env_light.field_0x12fe == 4 && att0 == +4) { att0 = 13; } else if (!strcmp(dComIfGp_getStartStageName(), "D_MN05A") && +dComIfGs_isStageBossEnemy() && att0 == 11) { att0 = 7; + } + + int att1 = dComIfG_Bgsp().GetPolyAtt1(*p_poly); + if (envLight->mResPolEffcol == NULL || ) { + u32 index = envLight->mResPolEffcol[att0].data[att1]; + + if (index >= 100) { + return 0xFF; + } + + p_color->r = envLight->mResColorDataTbl[index].data[0]; + p_color->g = envLight->mResColorDataTbl[index].data[1]; + p_color->b = envLight->mResColorDataTbl[index].data[2]; + } +} */ + /* 801AB7D0-801AB93C 1A6110 016C+00 0/0 1/1 2/2 .text * dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor */ #pragma push @@ -3204,44 +3500,55 @@ asm void dKy_pol_eff2_ratio_get(cBgS_PolyInfo const* param_0) { #pragma pop /* 801AC140-801AC168 1A6A80 0028+00 0/0 2/2 0/0 .text dKy_TeachWind_existence_chk__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_TeachWind_existence_chk() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_TeachWind_existence_chk__Fv.s" +BOOL dKy_TeachWind_existence_chk() { + if (g_env_light.mTeachWindExist == 0xFF) { + return -1; + } + + return g_env_light.mTeachWindExist ? TRUE : FALSE; } -#pragma pop /* 801AC168-801AC228 1A6AA8 00C0+00 4/4 0/0 2/2 .text dKy_SunMoon_Light_Check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dKy_SunMoon_Light_Check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_SunMoon_Light_Check__Fv.s" +bool dKy_SunMoon_Light_Check() { + bool check = false; + if (g_env_light.mSunInitialized && !dKy_darkworld_check()) { + // stage is not City in the Sky, Hyrule Castle, or Hidden Skill area + if (memcmp(dComIfGp_getStartStageName(), "D_MN07", 6) && + memcmp(dComIfGp_getStartStageName(), "D_MN09", 6) && + strcmp(dComIfGp_getStartStageName(), "F_SP200")) { + check = true; + } + } + + return check; } -#pragma pop /* 801AC228-801AC28C 1A6B68 0064+00 3/3 0/0 0/0 .text dKy_Outdoor_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm int dKy_Outdoor_check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_Outdoor_check__Fv.s" +static int dKy_Outdoor_check() { + BOOL outdoors = false; + u32 type = ST_FIELD; + + if (i_dComIfGp_getStage() != NULL) { + type = dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()); + } + + if (type == ST_FIELD) { + outdoors = true; + } + + return outdoors; } -#pragma pop /* 801AC28C-801AC2E0 1A6BCC 0054+00 1/1 0/0 0/0 .text dKy_Indoor_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void dKy_Indoor_check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_Indoor_check__Fv.s" +static int dKy_Indoor_check() { + BOOL indoors = false; + + if (dStage_stagInfo_GetSTType(i_dComIfGp_getStage()->getStagInfo()) != ST_FIELD) { + indoors = true; + } + + return indoors; } -#pragma pop /* 801AC2E0-801AC2E8 1A6C20 0008+00 0/0 1/1 0/0 .text dKy_withwarp_capture_check__Fv */ BOOL dKy_withwarp_capture_check() { @@ -3266,14 +3573,15 @@ asm void dKy_depth_dist_set(void* param_0) { #pragma pop /* 801AC57C-801AC5BC 1A6EBC 0040+00 13/13 21/21 134/134 .text dKy_darkworld_check__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dKy_darkworld_check() { - nofralloc -#include "asm/d/kankyo/d_kankyo/dKy_darkworld_check__Fv.s" +bool dKy_darkworld_check() { + bool check = false; + + if (dComIfGp_world_dark_get() == 1) { + check = true; + } + + return check; } -#pragma pop /** * @brief Returns the following info about a room: (1) if the room must not be in twilight and (2) diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 4d051653b6..5fb82586ee 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -379,7 +379,7 @@ extern "C" extern u8 j3dSys[284]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 __float_nan; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_mode__7dDemo_c[4]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index de47268357..cfce856920 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -129,6 +129,7 @@ extern "C" void dKyw_evt_wind_set_go__Fv(); extern "C" void dKyw_rain_set__Fi(); extern "C" extern char const* const d_kankyo_d_kankyo_wether__stringBase0; + // // External References: // @@ -270,12 +271,12 @@ static J3DPacket* dKyw_setDrawPacketListXluBg(J3DPacket* p_packet, int type) { /* 80056C60-80056C98 0515A0 0038+00 1/0 0/0 0/0 .text draw__18dKankyo_sun_PacketFv */ void dKankyo_sun_Packet::draw() { - dKyr_drawSun(j3dSys.getViewMtx(), &field_0x10[0], mColor, &mpResMoon); + dKyr_drawSun(j3dSys.getViewMtx(), mPos, mColor, &mpResMoon); } /* 80056C98-80056CD0 0515D8 0038+00 1/0 0/0 0/0 .text draw__22dKankyo_sunlenz_PacketFv */ void dKankyo_sunlenz_Packet::draw() { - dKyr_drawLenzflare(j3dSys.getViewMtx(), &field_0x24[0], field_0x10, &mpResBall); + dKyr_drawLenzflare(j3dSys.getViewMtx(), mPositions, mColor, &mpResBall); } /* 80056CD0-80056D0C 051610 003C+00 2/2 0/0 0/0 .text __dt__8RAIN_EFFFv */ @@ -288,8 +289,8 @@ RAIN_EFF::RAIN_EFF() { /* 80056D10-80056D58 051650 0048+00 1/0 0/0 0/0 .text draw__19dKankyo_rain_PacketFv */ void dKankyo_rain_Packet::draw() { - dKyr_drawSibuki(j3dSys.getViewMtx(), &field_0x10); - dKyr_drawRain(j3dSys.getViewMtx(), &field_0x10); + dKyr_drawSibuki(j3dSys.getViewMtx(), &mpTex); + dKyr_drawRain(j3dSys.getViewMtx(), &mpTex); } /* 80056D58-80056D94 051698 003C+00 1/1 1/1 0/0 .text __dt__8SNOW_EFFFv */ @@ -302,7 +303,7 @@ SNOW_EFF::SNOW_EFF() { /* 80056D98-80056DC8 0516D8 0030+00 1/0 0/0 0/0 .text draw__19dKankyo_snow_PacketFv */ void dKankyo_snow_Packet::draw() { - dKyr_drawSnow(j3dSys.getViewMtx(), &field_0x10); + dKyr_drawSnow(j3dSys.getViewMtx(), &mpTex); } /* 80056DC8-80056E04 051708 003C+00 1/1 1/1 0/0 .text __dt__8STAR_EFFFv */ @@ -354,7 +355,7 @@ VRKUMO_EFF::VRKUMO_EFF() { /* 80056F58-80056F8C 051898 0034+00 1/0 0/0 0/0 .text draw__21dKankyo_vrkumo_PacketFv */ void dKankyo_vrkumo_Packet::draw() { - drawVrkumo(j3dSys.getViewMtx(), field_0x10, &mpResCloudtx_01); + drawVrkumo(j3dSys.getViewMtx(), mColor, &mpResCloudtx_01); } /* 80056F8C-80056FC8 0518CC 003C+00 2/2 0/0 0/0 .text __dt__12EF_ODOUR_EFFFv */ @@ -408,7 +409,7 @@ static void dKyw_Sun_Draw() { /* 80057130-80057174 051A70 0044+00 1/1 0/0 0/0 .text dKyw_drawSunlenz__Fi */ static void dKyw_drawSunlenz(int type) { - if (g_env_light.mpSunLenzPacket->field_0x9e == 0) { + if (g_env_light.mpSunLenzPacket->mDrawLenzInSky == false) { dKyw_setDrawPacketListIndScreen(g_env_light.mpSunLenzPacket, type); } else { dKyw_setDrawPacketListSky(g_env_light.mpSunLenzPacket, type); @@ -550,35 +551,35 @@ inline u32 tmp_dComIfGp_particle_set(u16 param_0, const cXyz* param_1, const csX /* 800574E0-800579EC 051E20 050C+00 0/0 1/1 0/0 .text dKyw_wether_init__Fv */ void dKyw_wether_init() { - g_env_light.mSunPacketEnabled = false; - g_env_light.field_0xed4.field_0x0 = 0; - g_env_light.field_0xed4.field_0x4 = 0; - g_env_light.mRainPacketEnabled = 0; + g_env_light.mSunInitialized = false; + g_env_light.mThunderEff.mStatus = 0; + g_env_light.mThunderEff.mMode = 0; + g_env_light.mRainInitialized = false; g_env_light.mRainCount = 0; - g_env_light.mSnowPacketEnabled = 0; + g_env_light.mSnowInitialized = false; g_env_light.field_0xe92 = 0; g_env_light.mSnowCount = 0; g_env_light.field_0xe90 = 0; g_env_light.field_0xe91 = 0; - g_env_light.mStarPacketEnabled = false; + g_env_light.mStarInitialized = false; g_env_light.mStarCount = 0; f32 tmp0 = FLOAT_LABEL(lit_4378); g_env_light.mStarDensity = tmp0; - g_env_light.mCloudPacketEnabled = 0; - g_env_light.field_0xeb8 = 0; + g_env_light.mCloudInitialized = 0; + g_env_light.mMoyaCount = 0; g_env_light.field_0xebc = tmp0; - g_env_light.field_0xeb5 = 0; - g_env_light.mHousiPacketEnabled = false; - g_env_light.field_0xeac = 0; + g_env_light.mMoyaMode = 0; + g_env_light.mHousiInitialized = false; + g_env_light.mHousiCount = 0; g_env_light.mOdourPacketStatus = 0; g_env_light.field_0xf24 = 0; g_env_light.field_0xf21 = 0; g_env_light.mpOdourPacket = NULL; g_env_light.field_0x1038 = 0; g_env_light.field_0x103c = 0; - g_env_light.mMudPacketEnabled = 0; + g_env_light.mMudInitialized = 0; g_env_light.field_0x1048 = 0; - g_env_light.mEvilPacketEnabled = 0; + g_env_light.mEvilInitialized = 0; g_env_light.field_0x1054 = 0; g_env_light.field_0x1051 = 0; g_env_light.field_0xe60 = tmp0; @@ -622,41 +623,41 @@ void dKyw_wether_init() { /* 800579EC-80057A04 05232C 0018+00 0/0 1/1 0/0 .text dKyw_wether_init2__Fv */ void dKyw_wether_init2() { - g_env_light.field_0xec4 = 0; - g_env_light.field_0xec8 = 0; + g_env_light.mVrkumoStatus = 0; + g_env_light.mVrkumoCount = 0; } /* 80057A04-80057C84 052344 0280+00 0/0 1/1 0/0 .text dKyw_wether_delete__Fv */ void dKyw_wether_delete() { - if (g_env_light.mSunPacketEnabled) { + if (g_env_light.mSunInitialized) { delete g_env_light.mpSunPacket; delete g_env_light.mpSunLenzPacket; g_env_light.mpSunPacket = NULL; g_env_light.mpSunLenzPacket = NULL; } - if (g_env_light.mRainPacketEnabled) { + if (g_env_light.mRainInitialized) { delete g_env_light.mpRainPacket; g_env_light.mpRainPacket = NULL; } - if (g_env_light.mSnowPacketEnabled) { + if (g_env_light.mSnowInitialized) { delete g_env_light.mpSnowPacket; g_env_light.mpSnowPacket = NULL; g_env_light.field_0xe90 = 0; } - if (g_env_light.mStarPacketEnabled) { + if (g_env_light.mStarInitialized) { delete g_env_light.mpStarPacket; g_env_light.mpStarPacket = NULL; } - if (g_env_light.mHousiPacketEnabled) { + if (g_env_light.mHousiInitialized) { delete g_env_light.mpHousiPacket; g_env_light.mpHousiPacket = NULL; } - if (g_env_light.mCloudPacketEnabled) { + if (g_env_light.mCloudInitialized) { delete g_env_light.mpCloudPacket; g_env_light.mpCloudPacket = NULL; } @@ -666,12 +667,12 @@ void dKyw_wether_delete() { g_env_light.mpOdourPacket = NULL; } - if (g_env_light.mMudPacketEnabled) { + if (g_env_light.mMudInitialized) { delete g_env_light.mpMudPacket; g_env_light.mpMudPacket = NULL; } - if (g_env_light.mEvilPacketEnabled) { + if (g_env_light.mEvilInitialized) { delete g_env_light.mpEvilPacket; g_env_light.mpEvilPacket = NULL; } @@ -739,7 +740,7 @@ dKankyo_sun_Packet::~dKankyo_sun_Packet() {} /* 800581AC-8005820C 052AEC 0060+00 0/0 1/1 0/0 .text dKyw_wether_delete2__Fv */ void dKyw_wether_delete2() { - if (g_env_light.field_0xec4 != 0) { + if (g_env_light.mVrkumoStatus != 0) { delete g_env_light.mpVrkumoPacket; g_env_light.mpVrkumoPacket = NULL; } @@ -750,11 +751,11 @@ dKankyo_vrkumo_Packet::~dKankyo_vrkumo_Packet() {} /* 80058290-800582F8 052BD0 0068+00 1/1 0/0 0/0 .text wether_move_thunder__Fv */ static void wether_move_thunder() { - switch (g_env_light.field_0xed4.field_0x0) { + switch (g_env_light.mThunderEff.mStatus) { case 0: - if (g_env_light.field_0xed4.field_0x4 != 0) { + if (g_env_light.mThunderEff.mMode != 0) { dKyr_thunder_init(); - g_env_light.field_0xed4.field_0x0 = 1; + g_env_light.mThunderEff.mStatus = 1; } break; case 1: @@ -777,7 +778,7 @@ SECTION_SDATA2 static f32 lit_4611 = 1000000000.0f; /* 80058318-80058894 052C58 057C+00 1/1 0/0 0/0 .text wether_move_sun__Fv */ static void wether_move_sun() { s32 sunVisible = false; - if (dComIfGp_checkStatus(1) && !g_env_light.field_0x12d4) { + if (dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) { roomRead_class* room = dComIfGp_getStageRoom(); if (room != NULL && room->field_0x0 > dComIfGp_roomControl_getStayNo()) { sunVisible = dStage_roomRead_dt_c_GetVrboxswitch( @@ -793,7 +794,7 @@ static void wether_move_sun() { sunVisible = false; } - switch (g_env_light.mSunPacketEnabled) { + switch (g_env_light.mSunInitialized) { case FALSE: if (sunVisible && dKy_darkworld_check() != true) { g_env_light.mpSunPacket = new (0x20) dKankyo_sun_Packet(); @@ -854,16 +855,16 @@ static void wether_move_sun() { f32 tmp0_2 = FLOAT_LABEL(lit_4378); g_env_light.mpSunLenzPacket->field_0x90 = tmp0_2; g_env_light.mpSunLenzPacket->field_0x98 = tmp0_2; - g_env_light.mpSunLenzPacket->field_0x9e = 0; + g_env_light.mpSunLenzPacket->mDrawLenzInSky = false; dKyr_sun_move(); dKyr_lenzflare_move(); - g_env_light.mSunPacketEnabled = true; + g_env_light.mSunInitialized = true; } } break; case TRUE: if (!sunVisible) { - g_env_light.mSunPacketEnabled = false; + g_env_light.mSunInitialized = false; delete g_env_light.mpSunPacket; delete g_env_light.mpSunLenzPacket; g_env_light.mpSunPacket = NULL; @@ -897,7 +898,7 @@ SECTION_SDATA2 static f64 lit_4671 = 4503601774854144.0 /* cast s32 to float */; // matches with literals #ifdef NONMATCHING static void wether_move_rain() { - switch (g_env_light.mRainPacketEnabled) { + switch (g_env_light.mRainInitialized) { case FALSE: if (g_env_light.mRainCount > 3) { g_env_light.mpRainPacket = new (32) dKankyo_rain_Packet(); @@ -905,7 +906,7 @@ static void wether_move_rain() { if (g_env_light.mpRainPacket != NULL) { dKyr_rain_init(); dKyr_rain_move(); - g_env_light.mRainPacketEnabled = 1; + g_env_light.mRainInitialized = 1; if (g_env_light.mRainCount != 250) { mDoAud_seStart(JA_SE_ATM_RAIN_START, NULL, 0, 0); @@ -929,7 +930,7 @@ static void wether_move_rain() { } if (g_env_light.mRainCount <= 3) { - g_env_light.mRainPacketEnabled = 0; + g_env_light.mRainInitialized = 0; mDoAud_seStart(JA_SE_ATM_RAIN_END, NULL, 0, 0); delete g_env_light.mpRainPacket; g_env_light.mpRainPacket = NULL; @@ -950,13 +951,13 @@ static asm void wether_move_rain() { /* 80058B00-80058B8C 053440 008C+00 1/1 0/0 0/0 .text wether_move_snow__Fv */ static void wether_move_snow() { - switch (g_env_light.mSnowPacketEnabled) { + switch (g_env_light.mSnowInitialized) { case FALSE: if (g_env_light.mSnowCount != 0 || g_env_light.field_0xe90 != 0) { dKyr_snow_init(); if (g_env_light.mpSnowPacket != NULL) { dKyr_snow_move(); - g_env_light.mSnowPacketEnabled = 1; + g_env_light.mSnowInitialized = 1; } } break; @@ -1020,7 +1021,7 @@ static void wether_move_star() { return; } else { // Stage is Hero Shade arena - if ((dComIfGp_checkStatus(1) && !g_env_light.field_0x12d4) || + if ((dComIfGp_checkStatus(1) && !g_env_light.mVrboxInvisible) || !strcmp(dComIfGp_getStartStageName(), "F_SP200")) { roomRead_class* room = dComIfGp_getStageRoom(); if (room != NULL && room->field_0x0 > dComIfGp_roomControl_getStayNo()) { @@ -1048,11 +1049,11 @@ static void wether_move_star() { } } - if (g_env_light.field_0x12c8 != 0) { + if (g_env_light.mColpatWeather != 0) { density = FLOAT_LABEL(lit_4378); } - if (g_env_light.field_0x12c3 != 0 && g_env_light.field_0x11dc > lit_4767) { + if (g_env_light.mColPatCurr != 0 && g_env_light.mColPatBlend > lit_4767) { density = FLOAT_LABEL(lit_4378); } @@ -1071,7 +1072,7 @@ static void wether_move_star() { g_env_light.mStarCount = (s16)(lit_4772 * g_env_light.mStarDensity); } - switch (g_env_light.mStarPacketEnabled) { + switch (g_env_light.mStarInitialized) { case FALSE: if (g_env_light.mStarCount != 0) { dKyr_star_init(); @@ -1080,7 +1081,7 @@ static void wether_move_star() { if (g_env_light.mpStarPacket != NULL) { dKyr_star_move(); dKyr_shstar_move(); - g_env_light.mStarPacketEnabled = true; + g_env_light.mStarInitialized = true; } } break; @@ -1089,7 +1090,7 @@ static void wether_move_star() { dKyr_shstar_move(); if (g_env_light.mStarCount == 0) { - g_env_light.mStarPacketEnabled = false; + g_env_light.mStarInitialized = false; delete g_env_light.mpStarPacket; g_env_light.mpStarPacket = NULL; @@ -1117,9 +1118,9 @@ static void wether_move_housi() { if (dKy_darkworld_check() == true || (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && dComIfGp_roomControl_getStayNo() == 1 && dComIfGp_getStartStageLayer() == 9)) { - if (g_env_light.field_0x12d2 != 0) { + if (g_env_light.mInitAnmTimer != 0) { g_env_light.field_0xea9 = 0; - g_env_light.field_0xeac = 200; + g_env_light.mHousiCount = 200; // Stage is Faron Woods and Room is Faron Spring or // Stage is Castle Town and Room is Castle Town Center or @@ -1133,14 +1134,14 @@ static void wether_move_housi() { dComIfGp_getStartStageRoomNo() == 0 && dComIfGp_getStartStageLayer() == 9) || (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && dComIfGp_getStartStageLayer() == 9)) { - g_env_light.field_0xeac = 0; + g_env_light.mHousiCount = 0; } } } - switch (g_env_light.mHousiPacketEnabled) { + switch (g_env_light.mHousiInitialized) { case FALSE: - if (g_env_light.field_0xeac != 0) { + if (g_env_light.mHousiCount != 0) { g_env_light.mpHousiPacket = new (32) dKankyo_housi_Packet(); if (g_env_light.mpHousiPacket != NULL) { @@ -1173,23 +1174,23 @@ static void wether_move_housi() { g_env_light.mpHousiPacket->field_0x5de8 = tmp0; g_env_light.mpHousiPacket->field_0x10.set(tmp0, tmp0, tmp0); for (int i = 0; i < 300; i++) { - g_env_light.mpHousiPacket->field_0x18[i].field_0x0 = 0; + g_env_light.mpHousiPacket->mHousiEff[i].mStatus = 0; } dKyr_housi_move(); - g_env_light.mHousiPacketEnabled = true; + g_env_light.mHousiInitialized = true; } } break; case TRUE: - if (g_env_light.field_0xeac == 0 && + if (g_env_light.mHousiCount == 0 && g_env_light.mpHousiPacket->field_0x5de8 <= FLOAT_LABEL(lit_4378)) { - g_env_light.mHousiPacketEnabled = false; + g_env_light.mHousiInitialized = false; delete g_env_light.mpHousiPacket; g_env_light.mpHousiPacket = NULL; } else { dKyr_housi_move(); if (!dKy_darkworld_check()) { - g_env_light.field_0xeac = 0; + g_env_light.mHousiCount = 0; } } break; @@ -1233,32 +1234,32 @@ static void wether_move_odour() { /* 80059580-80059728 053EC0 01A8+00 1/1 0/0 0/0 .text wether_move_moya__Fv */ static void wether_move_moya() { - switch (g_env_light.mCloudPacketEnabled) { + switch (g_env_light.mCloudInitialized) { case 0: - if (g_env_light.field_0xeb8 != 0) { + if (g_env_light.mMoyaCount != 0) { g_env_light.mpCloudPacket = new (32) dKankyo_cloud_Packet(); if (g_env_light.mpCloudPacket != NULL) { g_env_light.mpCloudPacket->mpResTex = (u8*)dComIfG_getObjectRes("Always", 0x53); for (int i = 0; i < 50; i++) { - g_env_light.mpCloudPacket->field_0x18[i].field_0x0 = 0; + g_env_light.mpCloudPacket->mCloudEff[i].mStatus = 0; } - g_env_light.mpCloudPacket->field_0x14 = 0; + g_env_light.mpCloudPacket->mCount = 0; cloud_shadow_move(); - g_env_light.mCloudPacketEnabled++; + g_env_light.mCloudInitialized++; } } break; case 1: - if (g_env_light.field_0xeb5 == 0) { + if (g_env_light.mMoyaMode == 0) { dKyw_get_wind_pow(); } cloud_shadow_move(); - if (g_env_light.field_0xeb8 == 0 && g_env_light.mpCloudPacket->field_0x14 == 0) { - g_env_light.mCloudPacketEnabled = 0; + if (g_env_light.mMoyaCount == 0 && g_env_light.mpCloudPacket->mCount == 0) { + g_env_light.mCloudInitialized = 0; delete g_env_light.mpCloudPacket; g_env_light.mpCloudPacket = NULL; @@ -1336,7 +1337,7 @@ static asm void wether_move_vrkumo() { /* 80059E38-80059F74 054778 013C+00 1/1 0/0 0/0 .text wether_move_mud__Fv */ static void wether_move_mud() { - switch (g_env_light.mMudPacketEnabled) { + switch (g_env_light.mMudInitialized) { case 0: if (g_env_light.field_0x1048 != 0) { g_env_light.mpMudPacket = new (32) dKankyo_mud_Packet(); @@ -1344,7 +1345,7 @@ static void wether_move_mud() { if (g_env_light.mpMudPacket != NULL) { dKyr_mud_init(); dKyr_mud_move(); - g_env_light.mMudPacketEnabled++; + g_env_light.mMudInitialized++; } } break; @@ -1352,7 +1353,7 @@ static void wether_move_mud() { dKyr_mud_move(); if (g_env_light.field_0x1048 == 0 && g_env_light.mpMudPacket->field_0x10 == 0) { - g_env_light.mMudPacketEnabled = 0; + g_env_light.mMudInitialized = 0; delete g_env_light.mpMudPacket; g_env_light.mpMudPacket = NULL; @@ -1363,7 +1364,7 @@ static void wether_move_mud() { /* 80059F74-8005A0B8 0548B4 0144+00 1/1 0/0 0/0 .text wether_move_evil__Fv */ static void wether_move_evil() { - switch (g_env_light.mEvilPacketEnabled & 0xF) { + switch (g_env_light.mEvilInitialized & 0xF) { case 0: if (g_env_light.field_0x1054 != 0) { g_env_light.mpEvilPacket = new (32) dKankyo_evil_Packet(); @@ -1371,7 +1372,7 @@ static void wether_move_evil() { if (g_env_light.mpEvilPacket != NULL) { dKyr_evil_init(); dKyr_evil_move(); - g_env_light.mEvilPacketEnabled++; + g_env_light.mEvilInitialized++; } } break; @@ -1379,7 +1380,7 @@ static void wether_move_evil() { dKyr_evil_move(); if (g_env_light.field_0x1054 == 0 && g_env_light.mpEvilPacket->field_0x10 == 0) { - g_env_light.mEvilPacketEnabled = 0; + g_env_light.mEvilInitialized = 0; delete g_env_light.mpEvilPacket; g_env_light.mpEvilPacket = NULL; @@ -1390,7 +1391,7 @@ static void wether_move_evil() { /* 8005A0B8-8005A154 0549F8 009C+00 0/0 1/1 0/0 .text dKyw_wether_move_draw__Fv */ void dKyw_wether_move_draw() { - g_env_light.field_0x1288 = 0; + g_env_light.mMoyaSE = 0; if (strcmp(dComIfGp_getStartStageName(), "Name")) { wether_move_sun(); @@ -1415,11 +1416,11 @@ void dKyw_wether_move_draw2() { /* 8005A174-8005A304 054AB4 0190+00 0/0 1/1 0/0 .text dKyw_wether_draw__Fv */ void dKyw_wether_draw() { - if (strcmp(dComIfGp_getStartStageName(), "Name") && g_env_light.mCloudPacketEnabled != 0) { + if (strcmp(dComIfGp_getStartStageName(), "Name") && g_env_light.mCloudInitialized != 0) { dKyw_Cloud_Draw(); } - if (strcmp(dComIfGp_getStartStageName(), "Name") && g_env_light.mSunPacketEnabled) { + if (strcmp(dComIfGp_getStartStageName(), "Name") && g_env_light.mSunInitialized) { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); if (dStage_stagInfo_GetArg0(stag_info) != 0) { @@ -1428,21 +1429,21 @@ void dKyw_wether_draw() { } } - if (g_env_light.mStarPacketEnabled) { + if (g_env_light.mStarInitialized) { dKyw_Star_Draw(); dKyw_shstar_Draw(); } if (strcmp(dComIfGp_getStartStageName(), "Name")) { - if (g_env_light.mRainPacketEnabled) { + if (g_env_light.mRainInitialized) { dKyw_Rain_Draw(); } - if (g_env_light.mSnowPacketEnabled) { + if (g_env_light.mSnowInitialized) { dKyw_Snow_Draw(); } - if (g_env_light.mHousiPacketEnabled) { + if (g_env_light.mHousiInitialized) { dKyw_Housi_Draw(); } @@ -1450,11 +1451,11 @@ void dKyw_wether_draw() { dKyw_Odour_Draw(); } - if (g_env_light.mMudPacketEnabled != 0) { + if (g_env_light.mMudInitialized != 0) { dKyw_mud_Draw(); } - if (g_env_light.mEvilPacketEnabled != 0) { + if (g_env_light.mEvilInitialized != 0) { dKyw_evil_Draw(); } @@ -1464,7 +1465,7 @@ void dKyw_wether_draw() { /* 8005A304-8005A340 054C44 003C+00 0/0 1/1 0/0 .text dKyw_wether_draw2__Fv */ void dKyw_wether_draw2() { - if (g_env_light.field_0xec4 != 0 && g_env_light.field_0xec4 < 99) { + if (g_env_light.mVrkumoStatus != 0 && g_env_light.mVrkumoStatus < 99) { dKyw_Vrkumo_Draw(); } } @@ -1512,13 +1513,13 @@ void dKyw_wether_proc() { g_env_light.field_0x12c9 >= 1 && g_env_light.field_0x12c9 < 6) { dKy_get_dayofweek(); cLib_addCalc(&g_env_light.field_0xebc, lit_4379, lit_5362, lit_5363, lit_4770); - g_env_light.field_0xeb5 = 7; - g_env_light.field_0xeb8 = 49; + g_env_light.mMoyaMode = 7; + g_env_light.mMoyaCount = 49; } else { cLib_addCalc(&g_env_light.field_0xebc, FLOAT_LABEL(lit_4378), lit_5362, lit_5363, lit_5364[0]); - if (g_env_light.field_0xebc <= lit_4769 && g_env_light.field_0xeb8 == 49) { - g_env_light.field_0xeb8 = 0; + if (g_env_light.field_0xebc <= lit_4769 && g_env_light.mMoyaCount == 49) { + g_env_light.mMoyaCount = 0; } } } @@ -1529,9 +1530,9 @@ void dKyw_wether_proc() { if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") && (g_env_light.field_0x12fe == 1 || g_env_light.field_0x12fe == 3)) { if (g_env_light.field_0x12fe == 1) { - g_env_light.field_0xeac = 35; + g_env_light.mHousiCount = 35; } else { - g_env_light.field_0xeac = 30; + g_env_light.mHousiCount = 30; } g_env_light.field_0xea9 = 2; } @@ -1560,8 +1561,8 @@ static void dKyw_wind_init() { g_env_light.field_0xe66 = 0; g_env_light.mWind.field_0xc = 0; g_env_light.custom_windpower = tmp_0; - g_env_light.field_0xe6d = 0; - g_env_light.field_0xe6e = 0; + g_env_light.mEvtWindSet = 0; + g_env_light.mTeachWindExist = 0; } /* ############################################################################################## */ @@ -1649,7 +1650,7 @@ static void dKyw_pntwind_init() { } for (int i = 0; i < 5; i++) { - g_env_light.field_0x848[i].field_0x0[0] = 0; + g_env_light.mWindInfluenceEntity[i].mInUse = 0; } } @@ -1671,14 +1672,14 @@ static void pntwind_set(WIND_INFLUENCE* pntwind) { /* 8005ADFC-8005AE28 05573C 002C+00 0/0 0/0 5/5 .text dKyw_pntwind_set__FP14WIND_INFLUENCE */ void dKyw_pntwind_set(WIND_INFLUENCE* pntwind) { - pntwind->field_0x28 = 0; + pntwind->mConstant = 0; pntwind->field_0x29 = 0; pntwind_set(pntwind); } /* 8005AE28-8005AE58 055768 0030+00 1/1 0/0 0/0 .text dKyw_pntlight_set__FP14WIND_INFLUENCE */ static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind) { - pntwind->field_0x28 = 0; + pntwind->mConstant = 0; pntwind->field_0x29 = 1; pntwind_set(pntwind); } @@ -1786,21 +1787,21 @@ void dKyw_custom_windpower(f32 pow) { } /* 8005B61C-8005B638 055F5C 001C+00 0/0 0/0 6/6 .text dKyw_evt_wind_set__Fss */ -void dKyw_evt_wind_set(s16 param_0, s16 param_1) { - g_env_light.field_0xe6d = 1; - g_env_light.field_0xe68 = param_0; - g_env_light.field_0xe6a = param_1; +void dKyw_evt_wind_set(s16 angleX, s16 angleY) { + g_env_light.mEvtWindSet = 1; + g_env_light.mEvtWindAngleX = angleX; + g_env_light.mEvtWindAngleY = angleY; } /* 8005B638-8005B64C 055F78 0014+00 0/0 0/0 3/3 .text dKyw_evt_wind_set_go__Fv */ void dKyw_evt_wind_set_go() { - g_env_light.field_0xe6d = 1; + g_env_light.mEvtWindSet = 1; } /* 8005B64C-8005B660 055F8C 0014+00 0/0 1/1 5/5 .text dKyw_rain_set__Fi */ void dKyw_rain_set(int count) { g_env_light.mRainCount = count; - g_env_light.field_0x129c = count; + g_env_light.mRainCountOrig = count; } /* 8037A368-8037A368 0069C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp index f9175580d1..79abf82cc9 100644 --- a/src/d/menu/d_menu_dmap_map.cpp +++ b/src/d/menu/d_menu_dmap_map.cpp @@ -365,7 +365,7 @@ extern "C" u8 mStatus__20dStage_roomControl_c[65792]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 data_80450E58[4]; extern "C" extern u8 data_80450E60[4]; extern "C" u8 mLayerList__8dMpath_c[4]; diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index 70b5dd5ca3..86a506e0bb 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -447,7 +447,7 @@ extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_fmapHIO[1188]; extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index 010c8b0443..edd170b62b 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -228,7 +228,7 @@ extern "C" extern void* __vt__11dDrawPath_c[16]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; // // Declarations: diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 0e6bbd1735..dff7b09725 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -907,7 +907,7 @@ asm void dMenu_Letter_c::screenSetMenu() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::getWhite() const { +asm JUtility::TColor J2DTextBox::getWhite() const { nofralloc #include "asm/d/menu/d_menu_letter/getWhite__10J2DTextBoxCFv.s" } @@ -917,7 +917,7 @@ asm void J2DTextBox::getWhite() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DTextBox::getBlack() const { +asm JUtility::TColor J2DTextBox::getBlack() const { nofralloc #include "asm/d/menu/d_menu_letter/getBlack__10J2DTextBoxCFv.s" } diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index dbef5a0e60..22be9056b7 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -4,22 +4,16 @@ // #include "d/menu/d_menu_save.h" +#include "JSystem/J2DGraph/J2DAnmLoader.h" #include "d/com/d_com_inf_game.h" #include "d/file/d_file_sel_info.h" #include "d/file/d_file_sel_warning.h" +#include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_MemCard.h" #include "msg/scrn/d_msg_scrn_explain.h" -#include "d/msg/d_msg_string.h" - -// -// Types: -// - -struct J2DAnmLoaderDataBase { - /* 80308A6C */ void load(void const*); -}; // // Forward References: @@ -261,10 +255,6 @@ extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 sManager__10JFWDisplay[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -// -// Declarations: -// - /* ############################################################################################## */ /* 803BDF78-803BDF84 01B098 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { @@ -272,191 +262,138 @@ SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { }; /* 803BDF84-803BDF90 01B0A4 000C+00 3/3 0/0 0/0 .data SelStartFrameTbl */ -SECTION_DATA static u8 SelStartFrameTbl[12] = { - 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x8B, +SECTION_DATA static int SelStartFrameTbl[3] = { + 59, + 99, + 139, }; /* 803BDF90-803BDF9C 01B0B0 000C+00 3/3 0/0 0/0 .data SelEndFrameTbl */ -SECTION_DATA static u8 SelEndFrameTbl[12] = { - 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x95, +SECTION_DATA static int SelEndFrameTbl[3] = { + 69, + 109, + 149, }; /* 803BDF9C-803BDFA8 01B0BC 000C+00 2/2 0/0 0/0 .data SelOpenStartFrameTbl */ -SECTION_DATA static u8 SelOpenStartFrameTbl[12] = { - 0x00, 0x00, 0x00, 0xF9, 0x00, 0x00, 0x01, 0xC0, 0x00, 0x00, 0x02, 0x88, +SECTION_DATA static int SelOpenStartFrameTbl[3] = { + 249, + 448, + 648, }; /* 803BDFA8-803BDFB4 01B0C8 000C+00 2/2 0/0 0/0 .data SelOpenEndFrameTbl */ -SECTION_DATA static u8 SelOpenEndFrameTbl[12] = { - 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0xCC, 0x00, 0x00, 0x02, 0x93, +SECTION_DATA static int SelOpenEndFrameTbl[3] = { + 259, + 460, + 659, }; /* 803BDFB4-803BDFC4 01B0D4 0010+00 2/2 0/0 0/0 .data YnSelStartFrameTbl */ -SECTION_DATA static u8 YnSelStartFrameTbl[16] = { - 0x00, 0x00, 0x08, 0x66, 0x00, 0x00, 0x0C, 0x6D, 0x00, 0x00, 0x08, 0x5B, 0x00, 0x00, 0x0C, 0x63, +SECTION_DATA static int YnSelStartFrameTbl[2][2] = { + {2150, 3181}, + {2139, 3171}, }; /* 803BDFC4-803BDFD8 01B0E4 0010+04 2/2 0/0 0/0 .data YnSelEndFrameTbl */ -SECTION_DATA static u8 YnSelEndFrameTbl[16 + 4 /* padding */] = { - 0x00, - 0x00, - 0x08, - 0x5A, - 0x00, - 0x00, - 0x0C, - 0x63, - 0x00, - 0x00, - 0x08, - 0x66, - 0x00, - 0x00, - 0x0C, - 0x6D, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, -}; +SECTION_DATA static int YnSelEndFrameTbl[2][2] = {{2138, 3171}, {2150, 3181}}; /* 803BDFD8-803BDFF0 01B0F8 0018+00 0/1 0/0 0/0 .data l_tagName0$3857 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName0[24] = { - 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x30, 0x77, 0x5F, 0x73, 0x65, - 0x6C, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x73, 0x65, 0x6C, 0x5F, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'}; #pragma pop /* 803BDFF0-803BE000 01B110 0010+00 0/1 0/0 0/0 .data l_tagName000$3866 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName000[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74, -}; +SECTION_DATA static u64 l_tagName000[2] = {'w_no_t', 'w_yes_t'}; #pragma pop /* 803BE000-803BE010 01B120 0010+00 0/1 0/0 0/0 .data l_tagName000U$3867 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName000U[16] = { - 0x00, 0x00, 0x66, 0x5F, 0x6E, 0x6F, 0x5F, 0x74, 0x00, 0x66, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x74, -}; +SECTION_DATA static u64 l_tagName000U[2] = {'f_no_t', 'f_yes_t'}; #pragma pop /* 803BE010-803BE020 01B130 0010+00 0/1 0/0 0/0 .data l_tagName00$3879 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName00[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6D, 0x6F, 0x64, 0x6F, 0x00, 0x00, 0x77, 0x5F, 0x6B, 0x65, 0x74, 0x65, -}; +SECTION_DATA static u64 l_tagName00[2] = {'w_modo', 'w_kete'}; #pragma pop /* 803BE020-803BE030 01B140 0010+00 0/1 0/0 0/0 .data l_tagName00U$3880 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName00U[16] = { - 0x00, 0x00, 0x66, 0x5F, 0x6D, 0x6F, 0x64, 0x6F, 0x00, 0x00, 0x66, 0x5F, 0x6B, 0x65, 0x74, 0x65, -}; +SECTION_DATA static u64 l_tagName00U[2] = {'f_modo', 'f_kete'}; #pragma pop /* 803BE030-803BE048 01B150 0018+00 0/1 0/0 0/0 .data l_tagName3$3887 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName3[24] = { - 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x30, 0x77, 0x5F, 0x6D, 0x6F, - 0x79, 0x6F, 0x30, 0x31, 0x77, 0x5F, 0x6D, 0x6F, 0x79, 0x6F, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'}; #pragma pop /* 803BE048-803BE060 01B168 0018+00 0/1 0/0 0/0 .data l_tagName4$3888 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName4[24] = { - 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x30, 0x77, 0x5F, 0x67, 0x6F, - 0x6C, 0x64, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x6C, 0x64, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName4[3] = {'w_gold00', 'w_gold01', 'w_gold02'}; #pragma pop /* 803BE060-803BE078 01B180 0018+00 0/1 0/0 0/0 .data l_tagName5$3889 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName5[24] = { - 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x30, 0x77, 0x5F, 0x67, 0x6F, - 0x32, 0x5F, 0x30, 0x31, 0x77, 0x5F, 0x67, 0x6F, 0x32, 0x5F, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'}; #pragma pop /* 803BE078-803BE088 01B198 0010+00 0/1 0/0 0/0 .data l_tagName9$3898 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName9[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x6D, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x6D, -}; +SECTION_DATA static u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'}; #pragma pop /* 803BE088-803BE098 01B1A8 0010+00 0/1 0/0 0/0 .data l_tagName10$3899 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName10[16] = { - 0x00, 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x00, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, -}; +SECTION_DATA static u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'}; #pragma pop /* 803BE098-803BE0A8 01B1B8 0010+00 0/1 0/0 0/0 .data l_tagName11$3900 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName11[16] = { - 0x00, 0x77, 0x5F, 0x6E, 0x6F, 0x5F, 0x67, 0x72, 0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x67, 0x72, -}; +SECTION_DATA static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'}; #pragma pop /* 803BE0A8-803BE0C0 01B1C8 0018+00 0/1 0/0 0/0 .data l_tagName12$3909 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName12[24] = { - 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x30, 0x77, 0x5F, 0x62, 0x6B, - 0x5F, 0x6C, 0x30, 0x31, 0x77, 0x5F, 0x62, 0x6B, 0x5F, 0x6C, 0x30, 0x32, -}; +SECTION_DATA static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'}; #pragma pop /* 803BE0C0-803BE0D0 01B1E0 0010+00 0/1 0/0 0/0 .data l_tagName21$3916 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName21[16] = { - 0x00, 0x00, 0x00, 0x74, 0x5F, 0x66, 0x6F, 0x72, 0x00, 0x00, 0x74, 0x5F, 0x66, 0x6F, 0x72, 0x31, -}; +SECTION_DATA static u64 l_tagName21[2] = {'t_for', 't_for1'}; #pragma pop /* 803BE0D0-803BE120 01B1F0 0050+00 0/1 0/0 0/0 .data l_tagName211$3917 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName211[80] = { - 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x30, 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x31, - 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x32, 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x33, - 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x34, 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x35, - 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x36, 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x37, - 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x38, 0x74, 0x6D, 0x6F, 0x79, 0x6F, 0x75, 0x30, 0x39, -}; +SECTION_DATA static u64 l_tagName211[10] = {'tmoyou00', 'tmoyou01', 'tmoyou02', 'tmoyou03', + 'tmoyou04', 'tmoyou05', 'tmoyou06', 'tmoyou07', + 'tmoyou08', 'tmoyou09'}; #pragma pop /* 803BE120-803BE130 01B240 0010+00 0/1 0/0 0/0 .data l_tagName20$3929 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName20[16] = { - 0x00, 0x65, 0x72, 0x5F, 0x66, 0x6F, 0x72, 0x30, 0x00, 0x65, 0x72, 0x5F, 0x66, 0x6F, 0x72, 0x31, -}; +SECTION_DATA static u64 l_tagName20[2] = {'er_for0', 'er_for1'}; #pragma pop /* 803BE130-803BE148 01B250 0018+00 0/1 0/0 0/0 .data l_tagName13$3937 */ #pragma push #pragma force_active on -SECTION_DATA static u8 l_tagName13[24] = { - 0x77, 0x5F, 0x64, 0x61, 0x74, 0x5F, 0x69, 0x30, 0x77, 0x5F, 0x64, 0x61, - 0x74, 0x5F, 0x69, 0x31, 0x77, 0x5F, 0x64, 0x61, 0x74, 0x5F, 0x69, 0x32, -}; +SECTION_DATA static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'}; #pragma pop /* 8042E84C-8042E860 05B56C 0010+04 21/21 0/0 0/0 .bss g_msHIO */ @@ -623,53 +560,46 @@ dMenu_save_c::dMenu_save_c() { mSelIcon = NULL; for (int i = 0; i < 3; i++) { - field_0xd4[i] = NULL; - field_0xe0[i] = NULL; - field_0xec[i] = NULL; - field_0xf8[i] = NULL; - field_0x68[i] = NULL; + mpSelWakuMoyo[i] = NULL; + mpSelWakuGold[i] = NULL; + mpSelWakuGold2[i] = NULL; + mpBookWaku[i] = NULL; + mpSelData[i] = NULL; mFileInfo[i] = NULL; } - field_0x58 = NULL; + mpSelectMoveBase = NULL; for (int i = 0; i < 2; i++) { - field_0x84[i] = NULL; - field_0x118[i] = NULL; - field_0x120[i] = NULL; - field_0x128[i] = NULL; - field_0x168[i] = NULL; - field_0xc0[i] = NULL; - field_0x138[i] = NULL; + mpNoYes[i] = NULL; + mNoYesBase[i] = NULL; + mNoYesGold[i] = NULL; + mNoYesGold2[i] = NULL; + mpHeaderTxtPane[i] = NULL; + mpErrTxtPane[i] = NULL; + mpNoYesTxt[i] = NULL; } field_0x40 = NULL; field_0x44 = NULL; field_0x48 = NULL; - field_0x140 = NULL; - field_0x148 = NULL; + mpFileWakuAnm = NULL; + mpFileWakuRotAnm = NULL; field_0x150 = NULL; field_0x158 = NULL; field_0x160 = NULL; field_0x4c = NULL; - field_0x194 = NULL; - field_0x198 = NULL; - field_0x1a0 = NULL; - field_0x1a4 = NULL; + mpBBtnIcon = NULL; + mpABtnIcon = NULL; + mpBackTxt = NULL; + mpConfirmTxt = NULL; mpArchive = NULL; - field_0x1b0 = 0; + mDisplayMenu = false; mpMount = NULL; field_0x21a2 = 0; field_0x21a1 = 0; } -/* ############################################################################################## */ -/* 80397960-80397960 023FC0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80397960 = "/res/Layout/saveres.arc"; -#pragma pop - /* 80454438-8045443C 002A38 0004+00 1/1 0/0 0/0 .sdata2 @3849 */ SECTION_SDATA2 static f32 lit_3849 = 9.0f / 10.0f; @@ -680,22 +610,22 @@ SECTION_SDATA2 static f32 lit_3850 = 0.5f; void dMenu_save_c::_create() { stick = new STControl(2, 2, 1, 1, lit_3849, lit_3850, 0, 0x2000); - if (mUseType == 1 || mUseType == 3 || mUseType == 4) { + if (mUseType == TYPE_DEFAULT || mUseType == TYPE_WHITE_EVENT || mUseType == TYPE_BLACK_EVENT) { mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/saveres.arc", 0, mDoExt_getJ2dHeap()); } - if (mUseType == 2 || mUseType == 3 || mUseType == 4) { + if (mUseType == 2 || mUseType == TYPE_WHITE_EVENT || mUseType == TYPE_BLACK_EVENT) { u8 var_r31; switch (mUseType) { case 2: var_r31 = 2; break; - case 4: + case TYPE_BLACK_EVENT: var_r31 = 3; break; default: - case 3: + case TYPE_WHITE_EVENT: var_r31 = 1; break; } @@ -726,21 +656,15 @@ SECTION_DEAD static char const* const stringBase_80397A05 = ""; #pragma pop /* 80450740-80450744 0001C0 0002+02 1/1 0/0 0/0 .sdata l_msgNum0$3868 */ -SECTION_SDATA static u8 l_msgNum0[2 + 2 /* padding */] = { +SECTION_SDATA static u8 l_msgNum0[2] = { 0x08, 0x07, - /* padding */ - 0x00, - 0x00, }; /* 80450744-80450748 0001C4 0002+02 1/1 0/0 0/0 .sdata l_msgNum$3881 */ -SECTION_SDATA static u8 l_msgNum[2 + 2 /* padding */] = { +SECTION_SDATA static u8 l_msgNum[2] = { 0x54, 0x55, - /* padding */ - 0x00, - 0x00, }; /* 80454440-80454444 002A40 0004+00 1/1 0/0 0/0 .sdata2 @4173 */ @@ -789,6 +713,204 @@ SECTION_SDATA2 static f32 lit_4183[1 + 1 /* padding */] = { SECTION_SDATA2 static f64 lit_4185 = 4503601774854144.0 /* cast s32 to float */; /* 801EF904-801F0938 1EA244 1034+00 1/1 0/0 0/0 .text screenSet__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::screenSet() { + mSaveSel.Scr = new J2DScreen(); + mSaveSel.Scr->setPriority("zelda_file_select2.blo", 0x1100000, mpArchive); + dPaneClass_showNullPane(mSaveSel.Scr); + + mSaveSel.font[0] = mDoExt_getMesgFont(); + mSaveSel.font[1] = mDoExt_getSubFont(); + mSaveSel.mMsgString = new dMsgString_c(); + + void* bck = JKRGetNameResource("zelda_file_select2.bck", mpArchive); + field_0x40 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(bck); + field_0x44 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(bck); + field_0x48 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(bck); + field_0x4c = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(bck); + field_0x40->searchUpdateMaterialID(mSaveSel.Scr); + field_0x44->searchUpdateMaterialID(mSaveSel.Scr); + field_0x48->searchUpdateMaterialID(mSaveSel.Scr); + field_0x4c->searchUpdateMaterialID(mSaveSel.Scr); + + mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, 'w_move_n', 0, NULL); + field_0xa0 = mSaveSel.Scr->search('wmenu_n'); + + for (int i = 0; i < 3; i++) { + mpSelData[i] = new CPaneMgr(mSaveSel.Scr, l_tagName0[i], 0, NULL); + } + + mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, 'w_no_n', 0, NULL); + mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, 'w_yes_n', 0, NULL); + + for (int i = 0; i < 2; i++) { + mpNoYesTxt[i] = new CPaneMgr(mSaveSel.Scr, l_tagName000U[i], 0, NULL); + mSaveSel.Scr->search(l_tagName000[i])->hide(); + ((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setFont(mSaveSel.font[0]); + + char message[32]; + fopMsgM_messageGet(message, l_msgNum0[i]); + ((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setString(message); + } + + mSaveSel.Scr->search('Wi_btn_n')->hide(); + mSaveSel.Scr->search('GC_btn_n')->show(); + + mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nbbtn', 2, NULL); + mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nabtn', 2, NULL); + mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_modo', 2, NULL); + mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_kete', 2, NULL); + + mpBackTxt->setAlpha(0); + mpConfirmTxt->setAlpha(0); + mpBBtnIcon->setAlpha(128); + mpABtnIcon->setAlpha(128); + + for (int i = 0; i < 2; i++) { + J2DTextBox* tbox[2]; + tbox[i] = (J2DTextBox*)mSaveSel.Scr->search(l_tagName00U[i]); + mSaveSel.Scr->search(l_tagName00[i])->hide(); + tbox[i]->setFont(mSaveSel.font[0]); + + char message[32]; + fopMsgM_messageGet(message, l_msgNum[i]); + tbox[i]->setString(message); + } + + const void* bpk = JKRFileLoader::getGlbResource("zelda_file_select2.bpk", mpArchive); + mpFileWakuAnm = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk); + mpFileWakuAnm->searchUpdateMaterialID(mSaveSel.Scr); + mFileWakuAnmFrame = 0; + + const void* btk = JKRFileLoader::getGlbResource("zelda_file_select2_02.btk", mpArchive); + mpFileWakuRotAnm = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); + mpFileWakuRotAnm->searchUpdateMaterialID(mSaveSel.Scr); + mFileWakuRotAnmFrame = 0; + + for (int i = 0; i < 3; i++) { + mpSelWakuMoyo[i] = new CPaneMgr(mSaveSel.Scr, l_tagName3[i], 0, NULL); + mpSelWakuGold[i] = new CPaneMgr(mSaveSel.Scr, l_tagName4[i], 0, NULL); + mpSelWakuGold2[i] = new CPaneMgr(mSaveSel.Scr, l_tagName5[i], 0, NULL); + + mpSelWakuMoyo[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mpSelWakuGold[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mpSelWakuGold2[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mpSelWakuGold[i]->getPanePtr()->setAnimation(mpFileWakuRotAnm); + mpSelWakuGold2[i]->getPanePtr()->setAnimation(mpFileWakuRotAnm); + } + + for (int i = 0; i < 2; i++) { + mNoYesBase[i] = new CPaneMgr(mSaveSel.Scr, l_tagName9[i], 0, NULL); + mNoYesGold[i] = new CPaneMgr(mSaveSel.Scr, l_tagName10[i], 0, NULL); + mNoYesGold2[i] = new CPaneMgr(mSaveSel.Scr, l_tagName11[i], 0, NULL); + + mNoYesBase[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mNoYesGold[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mNoYesGold2[i]->getPanePtr()->setAnimation(mpFileWakuAnm); + mNoYesGold[i]->getPanePtr()->setAnimation(mpFileWakuRotAnm); + mNoYesGold2[i]->getPanePtr()->setAnimation(mpFileWakuRotAnm); + mNoYesBase[i]->setAlpha(0); + mNoYesGold[i]->setAlpha(0); + mNoYesGold2[i]->setAlpha(0); + } + + field_0x150 = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk); + field_0x150->searchUpdateMaterialID(mSaveSel.Scr); + + const void* btk2 = JKRFileLoader::getGlbResource("zelda_file_select2.btk", mpArchive); + field_0x158 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk2); + field_0x158->searchUpdateMaterialID(mSaveSel.Scr); + + const void* brk = JKRFileLoader::getGlbResource("zelda_file_select2.brk", mpArchive); + field_0x160 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); + field_0x160->searchUpdateMaterialID(mSaveSel.Scr); + + field_0x154 = 0; + field_0x15c = 0; + field_0x164 = 0; + + for (int i = 0; i < 3; i++) { + mpBookWaku[i] = new CPaneMgr(mSaveSel.Scr, l_tagName12[i], 0, NULL); + + mpBookWaku[i]->getPanePtr()->setAnimation(field_0x150); + mpBookWaku[i]->getPanePtr()->setAnimation(field_0x158); + mpBookWaku[i]->getPanePtr()->setAnimation(field_0x160); + mpBookWaku[i]->setAlpha(0); + } + + mSaveSel.Scr->search('w_tabi_s')->hide(); + mSaveSel.Scr->search('w_tabi_x')->hide(); + + for (int i = 0; i < 10; i++) { + mSaveSel.Scr->search(l_tagName211[i])->hide(); + } + + for (int i = 0; i < 2; i++) { + mpHeaderTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName21[i], 0, NULL); + + ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]); + ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setString(0x100, ""); + ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFontSize(19.0f, 19.0f); + ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setLineSpace(20.0f); + ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setCharSpace(0.0f); + mpHeaderTxt[i] = ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->getStringPtr(); + } + + mpHeaderTxtPane[0]->setAlpha(255); + mpHeaderTxtPane[1]->setAlpha(0); + mHeaderTxtType = 0; + + field_0xb4 = mSaveSel.Scr->search('w_er_n'); + mSaveSel.Scr->search('w_er_msg')->hide(); + mSaveSel.Scr->search('w_er_msR')->hide(); + + for (int i = 0; i < 2; i++) { + mpErrTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL); + + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]); + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setString(0x200, ""); + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->resize(440.0f, 198.0f); + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFontSize(21.0f, 21.0f); + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setLineSpace(21.0f); + ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setCharSpace(1.0f); + mpErrTxt[i] = ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->getStringPtr(); + mpErrTxtPane[i]->show(); + } + + mErrTxtType = 0; + mpErrTxtPane[mErrTxtType]->setAlpha(255); + mpErrTxtPane[mErrTxtType ^ 1]->setAlpha(0); + + mSelectedFile = dComIfGs_getDataNum(); + mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); + + Vec* pos = &mpSelData[mSelectedFile]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos->x, pos->y, mpSelData[mSelectedFile]->getPanePtr(), true); + mSelIcon->setAlphaRate(0.0f); + + J2DPane* pane = mSaveSel.Scr->search('Nm_02'); + pane->setAnimation(field_0x40); + field_0x64 = 0; + field_0x50 = 1; + field_0x40->setFrame(field_0x50); + pane->animationTransform(); + pane->setAnimation((J2DAnmTransformKey*)NULL); + + mpHeaderTxtPane[0]->getPanePtr()->scale(1.0f, 1.0f); + mpHeaderTxtPane[1]->getPanePtr()->scale(1.0f, 1.0f); + + for (int i = 0; i < 3; i++) { + mFileInfo[i] = new dFile_info_c(mpArchive, 1); + mFileInfo[i]->setBasePane(mSaveSel.Scr->search(l_tagName13[i])); + mpDataBase[i] = mFileInfo[i]->getDatBase(); + mpNoDataBase[i] = mFileInfo[i]->getNoDatBase(); + } + + mWarning = new dFile_warning_c(mpArchive, 0); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -797,6 +919,7 @@ asm void dMenu_save_c::screenSet() { #include "asm/d/menu/d_menu_save/screenSet__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F0938-801F0958 1EB278 0020+00 0/0 2/2 0/0 .text initialize__12dMenu_save_cFv */ void dMenu_save_c::initialize() { @@ -827,7 +950,7 @@ void dMenu_save_c::displayInit() { bool dMenu_save_c::_open() { field_0x1bf = 1; - if (mUseType == 1 || mUseType == 3 || mUseType == 4) { + if (mUseType == TYPE_DEFAULT || mUseType == TYPE_WHITE_EVENT || mUseType == TYPE_BLACK_EVENT) { if (!mpMount->sync()) { return false; } @@ -836,8 +959,8 @@ bool dMenu_save_c::_open() { mpArchive = mpMount->getArchive(); screenSet(); - if (mUseType == 1) { - field_0x1b0 = 1; + if (mUseType == TYPE_DEFAULT) { + mDisplayMenu = true; field_0x1bf = 0; } @@ -847,16 +970,16 @@ bool dMenu_save_c::_open() { } } - field_0x1b6 = 0; + mYesNoCursor = CURSOR_NO; field_0x2190 = 1; switch (mUseType) { - case 1: + case TYPE_DEFAULT: mMenuProc = PROC_MEMCARD_CHECK; break; - case 3: - case 4: - field_0x1b6 = 1; + case TYPE_WHITE_EVENT: + case TYPE_BLACK_EVENT: + mYesNoCursor = CURSOR_YES; msgTxtSet(0x3CE, true); // "Do you want to save?" mMenuProc = PROC_SAVE_QUESTION; break; @@ -892,33 +1015,33 @@ void dMenu_save_c::_delete() { mpScrnExplain = NULL; } - if (mMenuSave.mMsgString != NULL) { - delete mMenuSave.mMsgString; + if (mSaveSel.mMsgString != NULL) { + delete mSaveSel.mMsgString; } - if (mMenuSave.Scr != NULL) { - delete mMenuSave.Scr; + if (mSaveSel.Scr != NULL) { + delete mSaveSel.Scr; } for (int i = 0; i < 3; i++) { - if (field_0xd4[i] != NULL) { - delete field_0xd4[i]; + if (mpSelWakuMoyo[i] != NULL) { + delete mpSelWakuMoyo[i]; } - if (field_0xe0[i] != NULL) { - delete field_0xe0[i]; + if (mpSelWakuGold[i] != NULL) { + delete mpSelWakuGold[i]; } - if (field_0xec[i] != NULL) { - delete field_0xec[i]; + if (mpSelWakuGold2[i] != NULL) { + delete mpSelWakuGold2[i]; } - if (field_0xf8[i] != NULL) { - delete field_0xf8[i]; + if (mpBookWaku[i] != NULL) { + delete mpBookWaku[i]; } - if (field_0x68[i] != NULL) { - delete field_0x68[i]; + if (mpSelData[i] != NULL) { + delete mpSelData[i]; } if (mFileInfo[i] != NULL) { @@ -926,37 +1049,37 @@ void dMenu_save_c::_delete() { } } - if (field_0x58 != NULL) { - delete field_0x58; + if (mpSelectMoveBase != NULL) { + delete mpSelectMoveBase; } for (int i = 0; i < 2; i++) { - if (field_0x84[i] != NULL) { - delete field_0x84[i]; + if (mpNoYes[i] != NULL) { + delete mpNoYes[i]; } - if (field_0x118[i] != NULL) { - delete field_0x118[i]; + if (mNoYesBase[i] != NULL) { + delete mNoYesBase[i]; } - if (field_0x120[i] != NULL) { - delete field_0x120[i]; + if (mNoYesGold[i] != NULL) { + delete mNoYesGold[i]; } - if (field_0x128[i] != NULL) { - delete field_0x128[i]; + if (mNoYesGold2[i] != NULL) { + delete mNoYesGold2[i]; } - if (field_0x168[i] != NULL) { - delete field_0x168[i]; + if (mpHeaderTxtPane[i] != NULL) { + delete mpHeaderTxtPane[i]; } - if (field_0xc0[i] != NULL) { - delete field_0xc0[i]; + if (mpErrTxtPane[i] != NULL) { + delete mpErrTxtPane[i]; } - if (field_0x138[i] != NULL) { - delete field_0x138[i]; + if (mpNoYesTxt[i] != NULL) { + delete mpNoYesTxt[i]; } } @@ -972,12 +1095,12 @@ void dMenu_save_c::_delete() { delete field_0x48; } - if (field_0x140 != NULL) { - delete field_0x140; + if (mpFileWakuAnm != NULL) { + delete mpFileWakuAnm; } - if (field_0x148 != NULL) { - delete field_0x148; + if (mpFileWakuRotAnm != NULL) { + delete mpFileWakuRotAnm; } if (field_0x150 != NULL) { @@ -996,20 +1119,20 @@ void dMenu_save_c::_delete() { delete field_0x4c; } - if (field_0x194 != NULL) { - delete field_0x194; + if (mpBBtnIcon != NULL) { + delete mpBBtnIcon; } - if (field_0x198 != NULL) { - delete field_0x198; + if (mpABtnIcon != NULL) { + delete mpABtnIcon; } - if (field_0x1a0 != NULL) { - delete field_0x1a0; + if (mpBackTxt != NULL) { + delete mpBackTxt; } - if (field_0x1a4 != NULL) { - delete field_0x1a4; + if (mpConfirmTxt != NULL) { + delete mpConfirmTxt; } if (mSelIcon != NULL) { @@ -1061,10 +1184,10 @@ void dMenu_save_c::_move() { /* 801F1100-801F1148 1EBA40 0048+00 1/1 0/0 0/0 .text saveSelAnm__12dMenu_save_cFv */ void dMenu_save_c::saveSelAnm() { - if (field_0x1b0 != 0) { + if (mDisplayMenu) { selFileWakuAnm(); bookIconAnm(); - mMenuSave.Scr->animation(); + mSaveSel.Scr->animation(); } } @@ -1072,17 +1195,17 @@ void dMenu_save_c::saveSelAnm() { // matches with literals #ifdef NONMATCHING void dMenu_save_c::selFileWakuAnm() { - field_0x144 += 2; - if (field_0x144 >= field_0x140->getFrameMax()) { - field_0x144 -= field_0x140->getFrameMax(); + mFileWakuAnmFrame += 2; + if (mFileWakuAnmFrame >= mpFileWakuAnm->getFrameMax()) { + mFileWakuAnmFrame -= mpFileWakuAnm->getFrameMax(); } - field_0x140->setFrame(field_0x144); + mpFileWakuAnm->setFrame(mFileWakuAnmFrame); - field_0x14c += 2; - if (field_0x14c >= field_0x148->getFrameMax()) { - field_0x14c -= field_0x148->getFrameMax(); + mFileWakuRotAnmFrame += 2; + if (mFileWakuRotAnmFrame >= mpFileWakuRotAnm->getFrameMax()) { + mFileWakuRotAnmFrame -= mpFileWakuRotAnm->getFrameMax(); } - field_0x148->setFrame(field_0x14c); + mpFileWakuRotAnm->setFrame(mFileWakuRotAnmFrame); } #else #pragma push @@ -1146,7 +1269,7 @@ void dMenu_save_c::memCardWatch() { if (mpScrnExplain != NULL) { u8 status = mpScrnExplain->getStatus(); if (status != 0 && (status == 3 || status == 4)) { - mpScrnExplain->setForceSelect(); + mpScrnExplain->onForceSelect(); } } mMenuProc = PROC_MEMCARD_CHECK; @@ -1160,34 +1283,34 @@ void dMenu_save_c::memCardWatch() { #ifdef NONMATCHING void dMenu_save_c::saveQuestion() { if (YesNoSelect()) { - if (field_0x1b6 == 1) { + if (mYesNoCursor == CURSOR_YES) { field_0x1c0 = 1; - J2DPane* pane = mMenuSave.Scr->search('Nm_02'); + J2DPane* pane = mSaveSel.Scr->search('Nm_02'); pane->setAnimation(field_0x40); field_0xd2 = 0; field_0x9c = 0; field_0x17a = 0; - strcpy(field_0x170[field_0x178], ""); - strcpy(field_0x170[field_0x178 ^ 1], ""); + strcpy(mpHeaderTxt[mHeaderTxtType], ""); + strcpy(mpHeaderTxt[mHeaderTxtType ^ 1], ""); field_0x64 = 0; field_0x50 = 1; field_0x40->setFrame(field_0x50); pane->animationTransform(); pane->setAnimation((J2DAnmTransformKey*)NULL); - field_0x168[0]->getPanePtr()->scale(1.0f, 1.0f); - field_0x168[1]->getPanePtr()->scale(1.0f, 1.0f); + mpHeaderTxtPane[0]->getPanePtr()->scale(1.0f, 1.0f); + mpHeaderTxtPane[1]->getPanePtr()->scale(1.0f, 1.0f); mMenuProc = PROC_SAVE_QUESTION2; } else { switch (mUseType) { - case 3: + case TYPE_WHITE_EVENT: mEndStatus = 1; mSaveStatus = 3; mMenuProc = PROC_SAVE_WAIT; break; - case 4: + case TYPE_BLACK_EVENT: field_0x2190 = 0; msgTxtSet(0x4E4, true); // To save your progress, press START then choose Save mMenuProc = PROC_SAVE_GUIDE; @@ -1208,90 +1331,99 @@ asm void dMenu_save_c::saveQuestion() { #endif /* 801F1558-801F1620 1EBE98 00C8+00 1/0 0/0 0/0 .text saveQuestion2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveQuestion2() { - nofralloc -#include "asm/d/menu/d_menu_save/saveQuestion2__12dMenu_save_cFv.s" +void dMenu_save_c::saveQuestion2() { + if (mpScrnExplain != NULL && mpScrnExplain->getStatus() == 0) { + if (mUseType == TYPE_BLACK_EVENT) { + mWaitTimer = g_msHIO.mFadeOutTimer; + mDoGph_gInf_c::startFadeOut(mWaitTimer); + field_0x21a0 = 1; + mMenuProc = PROC_SAVE_QUESTION21; + } else { + mDoGph_gInf_c::startFadeOut(1); + field_0x21a0 = 1; + mMenuProc = PROC_SAVE_QUESTION3; + } + } } -#pragma pop /* 801F1620-801F1644 1EBF60 0024+00 1/0 0/0 0/0 .text saveQuestion21__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveQuestion21() { - nofralloc -#include "asm/d/menu/d_menu_save/saveQuestion21__12dMenu_save_cFv.s" +void dMenu_save_c::saveQuestion21() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + mMenuProc = PROC_SAVE_QUESTION3; } -#pragma pop /* 801F1644-801F16B8 1EBF84 0074+00 1/0 0/0 0/0 .text saveQuestion3__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveQuestion3() { - nofralloc -#include "asm/d/menu/d_menu_save/saveQuestion3__12dMenu_save_cFv.s" +void dMenu_save_c::saveQuestion3() { + mDisplayMenu = true; + mWaitTimer = g_msHIO.mFadeOutTimer; + mDoGph_gInf_c::startFadeIn(mWaitTimer); + field_0x21a0 = 0; + mMenuProc = PROC_SAVE_QUESTION4; } -#pragma pop /* 801F16B8-801F16F4 1EBFF8 003C+00 1/0 0/0 0/0 .text saveQuestion4__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveQuestion4() { - nofralloc -#include "asm/d/menu/d_menu_save/saveQuestion4__12dMenu_save_cFv.s" +void dMenu_save_c::saveQuestion4() { + if (mDoRst::isReset()) { + return; + } + + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + field_0x1bf = 0; + mMenuProc = PROC_MEMCARD_CHECK; } -#pragma pop /* 801F16F4-801F1720 1EC034 002C+00 1/0 0/0 0/0 .text saveGuide__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveGuide() { - nofralloc -#include "asm/d/menu/d_menu_save/saveGuide__12dMenu_save_cFv.s" +void dMenu_save_c::saveGuide() { + if (mpScrnExplain->getStatus() == 0) { + mEndStatus = 1; + mSaveStatus = 3; + mMenuProc = PROC_SAVE_WAIT; + } } -#pragma pop /* 801F1720-801F191C 1EC060 01FC+00 2/0 0/0 0/0 .text memCardCheck__12dMenu_save_cFv */ // matches with literals #ifdef NONMATCHING void dMenu_save_c::memCardCheck() { - u32 cardState = g_mDoMemCd_control.getStatus(0); + u32 cardStatus = g_mDoMemCd_control.getStatus(0); - if (cardState != 14) { - switch (cardState) { + if (cardStatus != 14) { + switch (cardStatus) { case 0: field_0x1c0 = 0; errDispInitSet(0x3AB); // There is no Memory Card in Slot A. field_0x9e = 0; field_0x1b4 = 9; - field_0x1b5 = 0x3d; + mErrProc = 0x3D; break; case 8: field_0x1c0 = 0; errDispInitSet(0x3AC); // The Memory Card in Slot A is damaged field_0x9e = 0; field_0x1b4 = 9; - field_0x1b5 = 0x3d; + mErrProc = 0x3D; break; case 9: field_0x1c0 = 0; errDispInitSet(0x3AD); // Wrong Device in Slot A. field_0x9e = 0; field_0x1b4 = 9; - field_0x1b5 = 0x3d; + mErrProc = 0x3D; break; case 10: field_0x1c0 = 0; errDispInitSet(0x3AE); // The Memory Card in Slot A is not compatible. field_0x9e = 0; field_0x1b4 = 9; - field_0x1b5 = 0x3d; + mErrProc = 0x3D; break; case 6: case 7: @@ -1305,8 +1437,8 @@ void dMenu_save_c::memCardCheck() { field_0x1c0 = 0; errDispInitSet(0x3B4); // There is Insufficient space on the Memory Card in Slot A. field_0x9e = 0; - field_0x1cc = &iplSelMsgInitSet; - field_0x1b5 = 10; + mpErrFunc = &iplSelMsgInitSet; + mErrProc = PROC_IPL_SELECT_DISP1; field_0x1b4 = 9; break; case 2: @@ -1317,8 +1449,8 @@ void dMenu_save_c::memCardCheck() { field_0x1c0 = 0; errDispInitSet(0x3C4); // There is no save for this game on the Memory Card in Slot A. field_0x9e = 0; - field_0x1cc = &gameFileMakeSelInitSet; - field_0x1b5 = 0x17; + mpErrFunc = &gameFileMakeSelInitSet; + mErrProc = PROC_MAKE_GAME_FILE_SEL_DISP; field_0x1b4 = 9; break; case 3: @@ -1342,54 +1474,94 @@ asm void dMenu_save_c::memCardCheck() { /* 801F191C-801F19A8 1EC25C 008C+00 1/0 0/0 0/0 .text memCardErrMsgWaitKey__12dMenu_save_cFv */ void dMenu_save_c::memCardErrMsgWaitKey() { if (cAPICPad_ANY_BUTTON(PAD_1) && dMeter2Info_getMsgKeyWaitTimer() == 0) { - if (field_0x1b5 == 0x3D) { + if (mErrProc == 0x3D) { closeSelect(); } else { - if (field_0x1cc != NULL) { - (this->*field_0x1cc)(); + if (mpErrFunc != NULL) { + (this->*mpErrFunc)(); } - mMenuProc = field_0x1b5; + mMenuProc = mErrProc; } } } /* 801F19A8-801F19DC 1EC2E8 0034+00 1/1 0/0 0/0 .text backSaveQuestionInitSet__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::backSaveQuestionInitSet() { - nofralloc -#include "asm/d/menu/d_menu_save/backSaveQuestionInitSet__12dMenu_save_cFv.s" +void dMenu_save_c::backSaveQuestionInitSet() { + field_0x2190 = 1; + mYesNoCursor = CURSOR_YES; + msgTxtSet(0x3CE, true); // Do you want to save? } -#pragma pop /* 801F19DC-801F1A48 1EC31C 006C+00 1/0 0/0 0/0 .text backSaveQuestion__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::backSaveQuestion() { - nofralloc -#include "asm/d/menu/d_menu_save/backSaveQuestion__12dMenu_save_cFv.s" +void dMenu_save_c::backSaveQuestion() { + mWaitTimer = g_msHIO.mFadeOutTimer; + mDoGph_gInf_c::startFadeOut(mWaitTimer); + field_0x21a0 = 1; + mMenuProc = PROC_BACK_SAVE_QUESTION2; } -#pragma pop /* 801F1A48-801F1B38 1EC388 00F0+00 1/0 0/0 0/0 .text backSaveQuestion2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::backSaveQuestion2() { - nofralloc -#include "asm/d/menu/d_menu_save/backSaveQuestion2__12dMenu_save_cFv.s" +void dMenu_save_c::backSaveQuestion2() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + if (mUseType == TYPE_BLACK_EVENT) { + if (field_0x21a2 == 1) { + field_0x2190 = 0; + mYesNoCursor = CURSOR_YES; + msgTxtSet(0x4E4, true); // To save your progress, press START then choose Save + } else { + backSaveQuestionInitSet(); + } + } else { + backSaveQuestionInitSet(); + } + + mDoGph_gInf_c::startFadeIn(1); + field_0x21a0 = 0; + field_0x1c0 = 0; + field_0x1bf = 1; + mDisplayMenu = false; + + if (mUseType == TYPE_BLACK_EVENT) { + if (field_0x21a2 == 1) { + mMenuProc = PROC_SAVE_GUIDE; + } else { + mMenuProc = PROC_SAVE_QUESTION; + } + } else { + mMenuProc = PROC_SAVE_QUESTION; + } } -#pragma pop /* ############################################################################################## */ /* 80454478-8045447C 002A78 0004+00 16/16 0/0 0/0 .sdata2 @4879 */ SECTION_SDATA2 static f32 lit_4879 = -1.0f; /* 801F1B38-801F1BF8 1EC478 00C0+00 5/5 0/0 0/0 .text closeSelect__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::closeSelect() { + mDoAud_seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0); + mSelIcon->setAlphaRate(0.0f); + + if (mUseType != TYPE_WHITE_EVENT && mUseType != TYPE_BLACK_EVENT) { + mSaveStatus = 3; + if (dMeter2Info_getMiniGameItemSetFlag() != 0) { + dMeter2Info_setMiniGameItem(dMeter2Info_getMiniGameItemSetFlag()); + } + mMenuProc = PROC_SAVE_WAIT; + } else { + field_0x1bf = 1; + field_0x21a2 = 0; + mMenuProc = PROC_BACK_SAVE_QUESTION; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1398,8 +1570,18 @@ asm void dMenu_save_c::closeSelect() { #include "asm/d/menu/d_menu_save/closeSelect__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F1BF8-801F1C70 1EC538 0078+00 2/2 0/0 0/0 .text closeSelect2__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::closeSelect2() { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + mSelIcon->setAlphaRate(0.0f); + field_0x21a2 = 1; + mMenuProc = PROC_BACK_SAVE_QUESTION; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1408,6 +1590,7 @@ asm void dMenu_save_c::closeSelect2() { #include "asm/d/menu/d_menu_save/closeSelect2__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F1C70-801F1C94 1EC5B0 0024+00 1/0 0/0 0/0 .text iplSelMsgInitSet__12dMenu_save_cFv */ @@ -1416,16 +1599,24 @@ void dMenu_save_c::iplSelMsgInitSet() { } /* 801F1C94-801F1CEC 1EC5D4 0058+00 1/0 0/0 0/0 .text iplSelInitSet__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::iplSelInitSet() { - nofralloc -#include "asm/d/menu/d_menu_save/iplSelInitSet__12dMenu_save_cFv.s" +void dMenu_save_c::iplSelInitSet() { + errorTxtSet(0x3C0); // Would you like to manage the contents of your Memory Card? + mYesNoCursor = CURSOR_NO; + ketteiTxtDispAnmInit(1); + yesnoMenuMoveAnmInitSet(2999, 3009, 0); } -#pragma pop /* 801F1CEC-801F1D54 1EC62C 0068+00 1/0 0/0 0/0 .text IPLSelectDisp1__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::IPLSelectDisp1() { + if (errorTxtChangeAnm() == true) { + mpErrFunc = &iplSelInitSet; + mErrProc = PROC_IPL_SELECT_DISP2; + mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_KEY; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1434,109 +1625,148 @@ asm void dMenu_save_c::IPLSelectDisp1() { #include "asm/d/menu/d_menu_save/IPLSelectDisp1__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F1D54-801F1DD4 1EC694 0080+00 1/0 0/0 0/0 .text IPLSelectDisp2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::IPLSelectDisp2() { - nofralloc -#include "asm/d/menu/d_menu_save/IPLSelectDisp2__12dMenu_save_cFv.s" +void dMenu_save_c::IPLSelectDisp2() { + bool txtAnmComplete = errorTxtChangeAnm(); + bool moveAnmComplete = yesnoMenuMoveAnm(); + bool ketteiAnmComplete = ketteiTxtDispAnm(); + + if (txtAnmComplete == true && moveAnmComplete == true && ketteiAnmComplete == true) { + yesnoCursorShow(); + mMenuProc = PROC_MEMCARD_ERR_GO_IPL_SEL; + } } -#pragma pop /* 801F1DD4-801F1E58 1EC714 0084+00 1/0 0/0 0/0 .text memCardErrGoIPLSel__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardErrGoIPLSel() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardErrGoIPLSel__12dMenu_save_cFv.s" +void dMenu_save_c::memCardErrGoIPLSel() { + if (errYesNoSelect(1, 0)) { + if (mYesNoCursor != CURSOR_NO) { + errorTxtSet(0x3BD); // The current game data will not be saved + mYesNoPrevCursor = mYesNoCursor; + mYesNoCursor = CURSOR_NO; + yesnoSelectAnmSet(1); + mMenuProc = PROC_IPL_SELECT2_DISP; + } else { + closeSelect(); + } + } } -#pragma pop /* 801F1E58-801F1EE0 1EC798 0088+00 1/0 0/0 0/0 .text IPLSelect2Disp__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::IPLSelect2Disp() { - nofralloc -#include "asm/d/menu/d_menu_save/IPLSelect2Disp__12dMenu_save_cFv.s" +void dMenu_save_c::IPLSelect2Disp() { + bool txtAnmComplete = errorTxtChangeAnm(); + bool moveAnmComplete = yesnoSelectMoveAnm(1); + bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor); + + if (txtAnmComplete == true && moveAnmComplete == true && wakuAnmComplete == true) { + yesnoCursorShow(); + mMenuProc = PROC_MEMCARD_ERR_GO_IPL_SEL2; + } } -#pragma pop /* 801F1EE0-801F1F80 1EC820 00A0+00 1/0 0/0 0/0 .text memCardErrGoIPLSel2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardErrGoIPLSel2() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardErrGoIPLSel2__12dMenu_save_cFv.s" +void dMenu_save_c::memCardErrGoIPLSel2() { + if (errYesNoSelect(1, 0)) { + if (mYesNoCursor != CURSOR_NO) { + field_0x1bf = 1; + mWaitTimer = g_msHIO.mFadeOutTimer; + mDoGph_gInf_c::startFadeOut(mWaitTimer); + field_0x21a0 = 1; + mMenuProc = PROC_MEMCARD_ERR_GOTO_IPL; + } else { + closeSelect(); + } + } } -#pragma pop /* 801F1F80-801F2000 1EC8C0 0080+00 1/0 0/0 0/0 .text memCardErrGotoIPL__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardErrGotoIPL() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardErrGotoIPL__12dMenu_save_cFv.s" +void dMenu_save_c::memCardErrGotoIPL() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + field_0x21a1 = 1; + mDoGph_gInf_c::startFadeIn(0); + field_0x21a0 = 0; + mDoRst::onShutdown(); } -#pragma pop /* 801F2000-801F20AC 1EC940 00AC+00 1/0 0/0 0/0 .text memCardErrMsgWaitFormatSel__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardErrMsgWaitFormatSel() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel__12dMenu_save_cFv.s" +void dMenu_save_c::memCardErrMsgWaitFormatSel() { + if (errYesNoSelect(1, 0)) { + if (mYesNoCursor != CURSOR_NO) { + errorTxtSet(0x3B9); // Formatting the Card in Slot A will erase all save data + mYesNoPrevCursor = mYesNoCursor; + mYesNoCursor = CURSOR_NO; + yesnoSelectAnmSet(1); + mMenuProc = PROC_CARD_FORMAT_YES_SEL_DISP; + } else { + errorTxtSet(0x3BC); // Unable to save. The Card in Slot A cannot be used + field_0x9e = 0; + yesnoMenuMoveAnmInitSet(3009, 2999, 0); + mMenuProc = PROC_CARD_FORMAT_NO_SEL_DISP; + } + } } -#pragma pop /* 801F20AC-801F2134 1EC9EC 0088+00 1/0 0/0 0/0 .text cardFormatYesSelDisp__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::cardFormatYesSelDisp() { - nofralloc -#include "asm/d/menu/d_menu_save/cardFormatYesSelDisp__12dMenu_save_cFv.s" +void dMenu_save_c::cardFormatYesSelDisp() { + bool txtChangeAnm = errorTxtChangeAnm(); + bool moveAnm = yesnoSelectMoveAnm(1); + bool wakuAlphaAnm = yesnoWakuAlpahAnm(mYesNoPrevCursor); + + if (txtChangeAnm == true && moveAnm == true && wakuAlphaAnm == true) { + yesnoCursorShow(); + mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_FORMAT_SEL2; + } } -#pragma pop /* 801F2134-801F219C 1ECA74 0068+00 1/0 0/0 0/0 .text cardFormatNoSelDisp__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::cardFormatNoSelDisp() { - nofralloc -#include "asm/d/menu/d_menu_save/cardFormatNoSelDisp__12dMenu_save_cFv.s" +void dMenu_save_c::cardFormatNoSelDisp() { + bool txtChangeAnm = errorTxtChangeAnm(); + bool moveAnm = yesnoMenuMoveAnm(); + + if (txtChangeAnm == true && moveAnm == true) { + mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_KEY; + mErrProc = 0x3D; + } } -#pragma pop /* 801F219C-801F2250 1ECADC 00B4+00 1/0 0/0 0/0 .text * memCardErrMsgWaitFormatSel2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardErrMsgWaitFormatSel2() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardErrMsgWaitFormatSel2__12dMenu_save_cFv.s" +void dMenu_save_c::memCardErrMsgWaitFormatSel2() { + if (errYesNoSelect(1, 0)) { + if (mYesNoCursor != CURSOR_NO) { + field_0x1bf = 1; + errorTxtSet(0x3B8); // Formatting... + field_0x9e = 0; + yesnoMenuMoveAnmInitSet(3009, 2999, 0); + mMenuProc = PROC_CARD_FORMAT_YES_SEL2_DISP; + } else { + errorTxtSet(0x3BC); // Unable to save. The Card in Slot A cannot be used + field_0x9e = 0; + yesnoMenuMoveAnmInitSet(3009, 2999, 0); + mMenuProc = PROC_CARD_FORMAT_NO_SEL_DISP; + } + } } -#pragma pop /* 801F2250-801F22CC 1ECB90 007C+00 1/0 0/0 0/0 .text cardFormatYesSel2Disp__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::cardFormatYesSel2Disp() { - nofralloc -#include "asm/d/menu/d_menu_save/cardFormatYesSel2Disp__12dMenu_save_cFv.s" +void dMenu_save_c::cardFormatYesSel2Disp() { + bool txtChangeAnm = errorTxtChangeAnm(); + bool moveAnm = yesnoMenuMoveAnm(); + + if (txtChangeAnm == true && moveAnm == true) { + mWaitTimer = g_msHIO.mCardWaitFrames; + g_mDoMemCd_control.command_format(); + mMenuProc = PROC_MEMCARD_FORMAT; + } } -#pragma pop /* 801F22CC-801F232C 1ECC0C 0060+00 1/0 0/0 0/0 .text memCardFormat__12dMenu_save_cFv */ void dMenu_save_c::memCardFormat() { @@ -1553,20 +1783,26 @@ void dMenu_save_c::memCardFormat() { /* 801F232C-801F23A4 1ECC6C 0078+00 1/0 0/0 0/0 .text memCardFormatWait__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardFormatWait() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardFormatWait__12dMenu_save_cFv.s" +void dMenu_save_c::memCardFormatWait() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + if (mCmdState == 2) { + errorTxtSet(0x399); // An error might have occurred in formatting. + mMenuProc = PROC_MEMCARD_COMMAND_END; + } else if (mCmdState == 1) { + errorTxtSet(0x39A); // Formatted. + mMenuProc = PROC_MEMCARD_COMMAND_END; + } } -#pragma pop /* 801F23A4-801F23FC 1ECCE4 0058+00 1/0 0/0 0/0 .text gameFileMakeSelInitSet__12dMenu_save_cFv */ void dMenu_save_c::gameFileMakeSelInitSet() { errorTxtSet(0x3C1); // Create a save file on the Memory Card in Slot A? ketteiTxtDispAnmInit(1); - field_0x1b6 = 0; + mYesNoCursor = CURSOR_NO; yesnoMenuMoveAnmInitSet(2999, 3009, 0); } @@ -1585,7 +1821,7 @@ void dMenu_save_c::makeGameFileSelDisp() { /* 801F247C-801F2514 1ECDBC 0098+00 1/0 0/0 0/0 .text memCardMakeGameFileSel__12dMenu_save_cFv */ void dMenu_save_c::memCardMakeGameFileSel() { if (errYesNoSelect(1, 0)) { - if (field_0x1b6 != 0) { + if (mYesNoCursor != CURSOR_NO) { field_0x1bf = 1; errorTxtSet(0x3C5); // Creating a file... ketteiTxtDispAnmInit(0); @@ -1614,63 +1850,81 @@ void dMenu_save_c::makeGameFileDisp() { } /* 801F25AC-801F260C 1ECEEC 0060+00 1/0 0/0 0/0 .text memCardMakeGameFile__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardMakeGameFile() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardMakeGameFile__12dMenu_save_cFv.s" +void dMenu_save_c::memCardMakeGameFile() { + if (mWaitTimer != 0) { + mWaitTimer--; + } + + mCmdState = g_mDoMemCd_control.SaveSync(); + + if (mCmdState != 0) { + mMenuProc = PROC_MEMCARD_MAKE_GAME_FILE_WAIT; + } } -#pragma pop /* 801F260C-801F2698 1ECF4C 008C+00 1/0 0/0 0/0 .text memCardMakeGameFileWait__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardMakeGameFileWait() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardMakeGameFileWait__12dMenu_save_cFv.s" +void dMenu_save_c::memCardMakeGameFileWait() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + if (mCmdState == 2) { + errorTxtSet(0x3C6); // An error might have occurred when creating a save file. + mMenuProc = PROC_MEMCARD_COMMAND_END; + } else if (mCmdState == 1) { + dComIfGs_setNewFile(1); + errorTxtSet(0x3C7); // A save file has been created. + mMenuProc = PROC_MEMCARD_COMMAND_END; + } } -#pragma pop /* 801F2698-801F2708 1ECFD8 0070+00 1/0 0/0 0/0 .text memCardCommandEnd__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardCommandEnd() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardCommandEnd__12dMenu_save_cFv.s" +void dMenu_save_c::memCardCommandEnd() { + if (errorTxtChangeAnm() == true) { + mpErrFunc = NULL; + mErrProc = PROC_MEMCARD_CHECK; + mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_KEY; + field_0x1bf = 0; + } } -#pragma pop /* 801F2708-801F27CC 1ED048 00C4+00 1/0 0/0 0/0 .text memCardCommandEnd2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardCommandEnd2() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardCommandEnd2__12dMenu_save_cFv.s" +void dMenu_save_c::memCardCommandEnd2() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool ketteiDispAnm = ketteiTxtDispAnm(); + bool modoruDispAnm = modoruTxtDispAnm(); + u32 check = mWarning->getStatus() != 0; + + if (headerTxtChanged == true && ketteiDispAnm == true && modoruDispAnm == true && check == 1) { + mpErrFunc = NULL; + mErrProc = PROC_MEMCARD_CHECK; + mMenuProc = PROC_MEMCARD_ERRMSG_WAIT_KEY; + field_0x1bf = 0; + } } -#pragma pop /* 801F27CC-801F2840 1ED10C 0074+00 1/0 0/0 0/0 .text memCardDataLoadWait__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::memCardDataLoadWait() { - nofralloc -#include "asm/d/menu/d_menu_save/memCardDataLoadWait__12dMenu_save_cFv.s" +void dMenu_save_c::memCardDataLoadWait() { + int cardState = g_mDoMemCd_control.LoadSync(mSaveBuffer, sizeof(mSaveBuffer), 0); + if (cardState != 0) { + if (cardState == 2) { + field_0x1c0 = 0; + mMenuProc = PROC_MEMCARD_CHECK; + } else if (cardState == 1) { + saveSelectOpenInit(); + } + } } -#pragma pop /* 801F2840-801F28E4 1ED180 00A4+00 2/2 0/0 0/0 .text dataWrite__12dMenu_save_cFv */ void dMenu_save_c::dataWrite() { int stageNo = i_dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()); dComIfGs_putSave(stageNo); - dComIfGs_setMemoryToCard(mSaveBuffer, field_0x54); - mDoMemCdRWm_SetCheckSumGameData(mSaveBuffer, field_0x54); + dComIfGs_setMemoryToCard(mSaveBuffer, mSelectedFile); + mDoMemCdRWm_SetCheckSumGameData(mSaveBuffer, mSelectedFile); u8* save = mSaveBuffer; for (int i = 0; i < 3; i++) { @@ -1716,6 +1970,44 @@ asm void dMenu_save_c::memCardDataSaveWait() { #endif /* 801F298C-801F2B5C 1ED2CC 01D0+00 1/0 0/0 0/0 .text memCardDataSaveWait2__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::memCardDataSaveWait2() { + if (mWaitTimer != 0) { + i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + mWaitTimer--; + return; + } + + if (mCmdState == 1) { + mDoAud_seStart(Z2SE_SY_FILE_SAVE_OK, NULL, 0, 0); + dComIfGs_setDataNum(mSelectedFile); + dComIfGs_setNoFile(0); + + if (mUseType == TYPE_WHITE_EVENT || mUseType == TYPE_BLACK_EVENT) { + headerTxtSet(0x530); // Saved. + mWarning->closeInit(); + ketteiTxtDispAnmInit(1); + mMenuProc = PROC_SAVE_END; + } else { + headerTxtSet(0x3CA); // Saved. Continue Playing? + mWarning->closeInit(); + mYesNoCursor = CURSOR_YES; + yesnoMenuMoveAnmInitSet(2259, 2249, 1); + ketteiTxtDispAnmInit(1); + mMenuProc = PROC_GAME_CONTINUE_DISP; + } + setSaveData(); + } else if (mCmdState == 2) { + mDoAud_seStart(Z2SE_SY_FILE_ERROR, NULL, 0, 0); + headerTxtSet(0x3CD); // An error might have occurred when saving. + mWarning->closeInit(); + ketteiTxtDispAnmInit(1); + modoruTxtDispAnmInit(1); + mMenuProc = PROC_MEMCARD_COMMAND_END2; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1724,19 +2016,72 @@ asm void dMenu_save_c::memCardDataSaveWait2() { #include "asm/d/menu/d_menu_save/memCardDataSaveWait2__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F2B5C-801F2BF8 1ED49C 009C+00 1/0 0/0 0/0 .text gameContinueDisp__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::gameContinueDisp() { - nofralloc -#include "asm/d/menu/d_menu_save/gameContinueDisp__12dMenu_save_cFv.s" +void dMenu_save_c::gameContinueDisp() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool moveAnm = yesnoMenuMoveAnm(); + bool ketteiDispAnm = ketteiTxtDispAnm(); + u32 check = mWarning->getStatus() != 0; + + if (headerTxtChanged == true && moveAnm == true && ketteiDispAnm == true && check == 1) { + yesnoCursorShow(); + mMenuProc = PROC_GAME_CONTINUE; + } } -#pragma pop /* 801F2BF8-801F2D78 1ED538 0180+00 1/0 0/0 0/0 .text gameContinue__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::gameContinue() { + if (errYesNoSelect(0, 1)) { + if (mYesNoCursor == CURSOR_YES) { + mDoAud_seStart(Z2SE_SY_CONTINUE_OK, NULL, 0, 0); + + switch (mUseType) { + case TYPE_WHITE_EVENT: + break; + case TYPE_DEFAULT: + case 2: + case TYPE_BLACK_EVENT: + mEndStatus = 1; + if (dMeter2Info_getMiniGameItemSetFlag()) { + dMeter2Info_setMiniGameItem(dMeter2Info_getMiniGameItemSetFlag()); + } + break; + } + mSelIcon->setAlphaRate(0.0f); + mSaveStatus = 4; + + if (mUseType == TYPE_BLACK_EVENT) { + closeSelect2(); + } else { + mMenuProc = PROC_SAVE_WAIT; + } + return; + } + + mDoAud_seStart(Z2SE_QUIT_GAME, NULL, 0, 0); + + if (mUseType == 2 || mUseType == TYPE_WHITE_EVENT) { + mWaitTimer = 15; + mMenuProc = PROC_GAME_CONTINUE3; + return; + } + + if (mUseType == TYPE_BLACK_EVENT) { + mSaveStatus = 4; + closeSelect2(); + return; + } + + mWaitTimer = 30; + mMenuProc = PROC_GAME_CONTINUE2; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1745,107 +2090,140 @@ asm void dMenu_save_c::gameContinue() { #include "asm/d/menu/d_menu_save/gameContinue__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F2D78-801F2DA0 1ED6B8 0028+00 1/0 0/0 0/0 .text gameContinue2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::gameContinue2() { - nofralloc -#include "asm/d/menu/d_menu_save/gameContinue2__12dMenu_save_cFv.s" +void dMenu_save_c::gameContinue2() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + mDoRst::onReset(); } -#pragma pop /* 801F2DA0-801F2DD4 1ED6E0 0034+00 1/0 0/0 0/0 .text gameContinue3__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::gameContinue3() { - nofralloc -#include "asm/d/menu/d_menu_save/gameContinue3__12dMenu_save_cFv.s" +void dMenu_save_c::gameContinue3() { + if (mWaitTimer != 0) { + mWaitTimer--; + return; + } + + mMenuProc = PROC_SAVE_WAIT; + mSaveStatus = 3; + mEndStatus = 0; } -#pragma pop /* 801F2DD4-801F2E88 1ED714 00B4+00 1/0 0/0 0/0 .text saveEnd__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveEnd() { - nofralloc -#include "asm/d/menu/d_menu_save/saveEnd__12dMenu_save_cFv.s" +void dMenu_save_c::saveEnd() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool ketteiDispAnm = ketteiTxtDispAnm(); + u32 check = mWarning->getStatus() != 0; + + if (headerTxtChanged == true && ketteiDispAnm == true && check == 1) { + if (mUseType == TYPE_BLACK_EVENT) { + mSaveStatus = 4; + closeSelect2(); + } else { + mEndStatus = 1; + restartInit(); + mSaveStatus = 3; + mMenuProc = PROC_SAVE_WAIT; + } + } } -#pragma pop /* 801F2E88-801F2F08 1ED7C8 0080+00 1/0 0/0 0/0 .text endingNoSave__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::endingNoSave() { - nofralloc -#include "asm/d/menu/d_menu_save/endingNoSave__12dMenu_save_cFv.s" +void dMenu_save_c::endingNoSave() { + if (YesNoSelect()) { + if (mYesNoCursor != CURSOR_NO) { + mEndStatus = 0; + mMenuProc = PROC_SAVE_WAIT; + mSaveStatus = 3; + } else { + field_0x2190 = 1; + mYesNoCursor = CURSOR_YES; + msgTxtSet(0x3CF, false); // Do you want to continue playing? + mMenuProc = PROC_ENDING_NO_SAVE2; + } + } } -#pragma pop /* 801F2F08-801F2F38 1ED848 0030+00 1/0 0/0 0/0 .text endingNoSave2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::endingNoSave2() { - nofralloc -#include "asm/d/menu/d_menu_save/endingNoSave2__12dMenu_save_cFv.s" +void dMenu_save_c::endingNoSave2() { + if (mpScrnExplain != NULL && mpScrnExplain->getStatus() == 0) { + field_0x2190 = 0; + } + + mYesNoCursor = CURSOR_NO; + mMenuProc = PROC_SAVE_QUESTION; } -#pragma pop /* 801F2F38-801F2F4C 1ED878 0014+00 1/0 0/0 0/0 .text endingDataCheck__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::endingDataCheck() { - nofralloc -#include "asm/d/menu/d_menu_save/endingDataCheck__12dMenu_save_cFv.s" +void dMenu_save_c::endingDataCheck() { + mMenuProc = PROC_SAVE_WAIT; + mSaveStatus = 3; } -#pragma pop /* 801F2F4C-801F2FB4 1ED88C 0068+00 1/0 0/0 0/0 .text retryQuestion0__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::retryQuestion0() { - nofralloc -#include "asm/d/menu/d_menu_save/retryQuestion0__12dMenu_save_cFv.s" +void dMenu_save_c::retryQuestion0() { + if (Z2GetAudioMgr()->mSeqMgr.checkBgmIDPlaying(Z2BGM_GAME_OVER) != true) { + mYesNoCursor = CURSOR_YES; + msgTxtSet(0x4BC, false); // Retry? + mMenuProc = PROC_RETRY_QUESTION1; + } } -#pragma pop /* 801F2FB4-801F3040 1ED8F4 008C+00 1/0 0/0 0/0 .text retryQuestion1__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::retryQuestion1() { - nofralloc -#include "asm/d/menu/d_menu_save/retryQuestion1__12dMenu_save_cFv.s" +void dMenu_save_c::retryQuestion1() { + if (YesNoSelect()) { + if (mYesNoCursor == CURSOR_YES) { + mEndStatus = 1; + restartInit(); + mSaveStatus = 3; + mMenuProc = PROC_SAVE_WAIT; + } else { + field_0x2190 = 1; + mYesNoCursor = CURSOR_NO; + msgTxtSet(0x4BF, false); // Return to the title screen? + mMenuProc = PROC_RETRY_QUESTION2; + } + } } -#pragma pop /* 801F3040-801F30B8 1ED980 0078+00 1/0 0/0 0/0 .text retryQuestion2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::retryQuestion2() { - nofralloc -#include "asm/d/menu/d_menu_save/retryQuestion2__12dMenu_save_cFv.s" +void dMenu_save_c::retryQuestion2() { + if (YesNoSelect()) { + if (mYesNoCursor == CURSOR_YES) { + mWaitTimer = 15; + mMenuProc = PROC_GAME_CONTINUE3; + } else { + field_0x2190 = 1; + mYesNoCursor = CURSOR_YES; + msgTxtSet(0x4BC, false); // Retry? + mMenuProc = PROC_RETRY_QUESTION1; + } + } } -#pragma pop /* 801F30B8-801F31B0 1ED9F8 00F8+00 2/2 0/0 0/0 .text restartInit__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::restartInit() { - nofralloc -#include "asm/d/menu/d_menu_save/restartInit__12dMenu_save_cFv.s" +void dMenu_save_c::restartInit() { + // if monkey lantern sequence not completed + if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); // Lantern stolen + dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern + } + + if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, true) == NO_ITEM) { + dComIfGs_setItem(SLOT_1, KANTERA); + dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); + } + + if (dMeter2Info_getMiniGameItemSetFlag()) { + dMeter2Info_setMiniGameItem(dMeter2Info_getMiniGameItemSetFlag()); + } } -#pragma pop /* 801F31B0-801F31B4 1EDAF0 0004+00 1/0 0/0 0/0 .text saveWait__12dMenu_save_cFv */ void dMenu_save_c::saveWait() { @@ -1853,16 +2231,89 @@ void dMenu_save_c::saveWait() { } /* 801F31B4-801F328C 1EDAF4 00D8+00 1/0 0/0 0/0 .text messageChange__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::messageChange() { - nofralloc -#include "asm/d/menu/d_menu_save/messageChange__12dMenu_save_cFv.s" +void dMenu_save_c::messageChange() { + if (mpScrnExplain != NULL) { + field_0x219d = mpScrnExplain->getStatus(); + + u8 explainStatus = mpScrnExplain->getStatus(); + if (explainStatus != 0) { + if (explainStatus == 3 || explainStatus == 4) { + mpScrnExplain->onForceSelect(); + } + mpScrnExplain->move(); + return; + } + + bool var_r3; + if (field_0x2190 == 1) { + var_r3 = mpScrnExplain->openExplain(field_0x2192, 1, mYesNoCursor == CURSOR_NO, -1, + field_0x219c); + mpScrnExplain->setKeyWaitTimer(30); + } else { + var_r3 = mpScrnExplain->openExplain(field_0x2192, 0, 0, -1, true); + } + + if (var_r3 == true) { + mMenuProc = field_0x2194; + } + } } -#pragma pop /* 801F328C-801F34BC 1EDBCC 0230+00 4/4 0/0 0/0 .text YesNoSelect__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +int dMenu_save_c::YesNoSelect() { + int ret = 0; + + if (mDoRst::isReset()) { + return 0; + } + + if (mpScrnExplain == NULL) { + return 0; + } + + if (field_0x219d != 5 && mpScrnExplain->getStatus() == 5) { + switch (mpScrnExplain->getSelectCursor()) { + case 0: + if (mMenuProc == PROC_RETRY_QUESTION2) { + mDoAud_seStart(Z2SE_QUIT_GAME, NULL, 0, 0); + } else if (mMenuProc == PROC_RETRY_QUESTION1) { + mDoAud_seStart(Z2SE_SY_CONTINUE_OK, NULL, 0, 0); + } else { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + } + break; + case 1: + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + break; + case 255: + Z2GetAudioMgr()->mSeMgr.seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + break; + } + } + + if (mpScrnExplain->getStatus() == 0) { + field_0x2190 = 0; + switch (mpScrnExplain->getSelectCursor()) { + case 0: + mYesNoCursor = CURSOR_YES; + break; + case 1: + mYesNoCursor = CURSOR_NO; + break; + case 255: + mYesNoCursor = 2; + break; + } + ret = 1; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1871,6 +2322,7 @@ asm int dMenu_save_c::YesNoSelect() { #include "asm/d/menu/d_menu_save/YesNoSelect__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F34BC-801F3588 1EDDFC 00CC+00 8/8 0/0 0/0 .text msgTxtSet__12dMenu_save_cFUsb */ void dMenu_save_c::msgTxtSet(u16 msgID, bool param_1) { @@ -1880,7 +2332,7 @@ void dMenu_save_c::msgTxtSet(u16 msgID, bool param_1) { if (mpScrnExplain == NULL) { check = false; } else if (field_0x2190 == 1) { - check = mpScrnExplain->openExplain(msgID, 1, field_0x1b6 == 0, 0xFF, param_1); + check = mpScrnExplain->openExplain(msgID, 1, mYesNoCursor == CURSOR_NO, 0xFF, param_1); mpScrnExplain->setKeyWaitTimer(30); } else { check = mpScrnExplain->openExplain(msgID, 0, 0, 0xFF, true); @@ -1898,6 +2350,35 @@ void dMenu_save_c::msgTxtSet(u16 msgID, bool param_1) { } /* 801F3588-801F36B4 1EDEC8 012C+00 1/0 0/0 0/0 .text openSaveSelect__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::openSaveSelect() { + bool headerTxtChanged = headerTxtChangeAnm(); + + bool dataMoveAnmComplete = true; + if (field_0x64 != 0 || field_0x65 != 0) { + dataMoveAnmComplete = selectDataBaseMoveAnm(); + } + + bool errMoveAnmComplete = true; + if (field_0xd2 != 0 || field_0xd3 != 0) { + errMoveAnmComplete = errorMoveAnm(); + } + + bool yesnoMoveAnmComplete = true; + if (field_0x9c != 0 || field_0x9d != 0) { + yesnoMoveAnmComplete = yesnoMenuMoveAnm(); + } + + if (headerTxtChanged == true && dataMoveAnmComplete == true && errMoveAnmComplete == true && + yesnoMoveAnmComplete == true) { + headerTxtSet(0x4CA); // Save to which log? + saveSelectOpenAnmSet(); + mDoAud_seStart(Z2SE_SY_FILE_MENU_SLIDE_IN, NULL, 0, 0); + mMenuProc = PROC_OPEN_SAVE_SELECT2; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1906,20 +2387,62 @@ asm void dMenu_save_c::openSaveSelect() { #include "asm/d/menu/d_menu_save/openSaveSelect__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F36B4-801F37A0 1EDFF4 00EC+00 1/0 0/0 0/0 .text openSaveSelect2__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::openSaveSelect2() { - nofralloc -#include "asm/d/menu/d_menu_save/openSaveSelect2__12dMenu_save_cFv.s" +void dMenu_save_c::openSaveSelect2() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool dataMoveAnm = selectDataBaseMoveAnm(); + + if (headerTxtChanged == true && dataMoveAnm == true) { + modoruTxtDispAnmInit(1); + mSelectedFile = dComIfGs_getDataNum(); + mLastSelFile = mSelectedFile; + mpBookWaku[mSelectedFile]->alphaAnimeStart(0); + mpSelData[mSelectedFile]->getPanePtr()->setAnimation(field_0x40); + field_0x74[mSelectedFile] = SelStartFrameTbl[mSelectedFile]; + ketteiTxtDispAnmInit(1); + mMenuProc = PROC_OPEN_SAVE_SELECT3; + } } -#pragma pop /* 801F37A0-801F3934 1EE0E0 0194+00 1/0 0/0 0/0 .text openSaveSelect3__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::openSaveSelect3() { + bool modoruTxtDisp = modoruTxtDispAnm(); + bool var_r30 = true; + bool var_r29 = true; + bool var_r28 = true; + + if (mSelectedFile != 0xFF) { + var_r30 = mpBookWaku[mSelectedFile]->alphaAnime(g_msHIO.mEffectDispFrames, 0, 0xFF, 1); + var_r29 = ketteiTxtDispAnm(); + + if (field_0x74[mSelectedFile] != SelEndFrameTbl[mSelectedFile]) { + field_0x74[mSelectedFile] += 2; + + if (field_0x74[mSelectedFile] > SelEndFrameTbl[mSelectedFile]) { + field_0x74[mSelectedFile] = SelEndFrameTbl[mSelectedFile]; + } + + field_0x40->setFrame(field_0x74[mSelectedFile]); + mpSelData[mSelectedFile]->getPanePtr()->animationTransform(); + var_r28 = false; + } + } + + if (modoruTxtDisp == true && var_r30 == true && var_r29 == true && var_r28 == true) { + if (mSelectedFile != 0xFF) { + mpSelData[mSelectedFile]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + selFileCursorShow(); + } + mMenuProc = PROC_SAVE_SELECT; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1928,8 +2451,39 @@ asm void dMenu_save_c::openSaveSelect3() { #include "asm/d/menu/d_menu_save/openSaveSelect3__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F3934-801F3A94 1EE274 0160+00 1/0 0/0 0/0 .text saveSelect__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveSelect() { + if (!mDoRst::isReset()) { + stick->checkTrigger(); + + if (mDoCPd_c::getTrigA(PAD_1)) { + saveSelectStart(); + } else if (mDoCPd_c::getTrigB(PAD_1)) { + closeSelect(); + } else if (stick->checkUpTrigger()) { + if (mSelectedFile != 0) { + mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0); + mLastSelFile = mSelectedFile; + mSelectedFile--; + dataSelectAnmSet(); + mMenuProc = PROC_SAVE_SELECT_MOVE_ANM; + } + } else if (stick->checkDownTrigger()) { + if (mSelectedFile != 2) { + mDoAud_seStart(Z2SE_FILE_SELECT_CURSOR, NULL, 0, 0); + mLastSelFile = mSelectedFile; + mSelectedFile++; + dataSelectAnmSet(); + mMenuProc = PROC_SAVE_SELECT_MOVE_ANM; + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1938,9 +2492,37 @@ asm void dMenu_save_c::saveSelect() { #include "asm/d/menu/d_menu_save/saveSelect__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F3A94-801F3BE0 1EE3D4 014C+00 1/1 0/0 0/0 .text saveSelectStart__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveSelectStart() { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectedFile], + SelOpenEndFrameTbl[mSelectedFile]); + mSelIcon->setAlphaRate(0.0f); + selectWakuAlpahAnmInit(mSelectedFile, 255, 0, g_msHIO.mSelectFrames); + + if (field_0x1aa[mSelectedFile] != 0) { + u8* saveData = mSaveBuffer; + for (int i = 0; i < 3; i++) { + mDoMemCdRWm_TestCheckSumGameData(saveData); + saveData += 0xA94; + } + headerTxtSet(0x3A); // Saving... + mWarning->openInit(); + ketteiTxtDispAnmInit(0); + modoruTxtDispAnmInit(0); + mMenuProc = PROC_SAVE_MOVE_DISP2; + } else { + yesnoMenuMoveAnmInitSet(2089, 2099, 0); + headerTxtSet(0x4CB); // Overwrite this log? + mMenuProc = PROC_SELECT_DATA_OPEN_MOVE; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1949,19 +2531,46 @@ asm void dMenu_save_c::saveSelectStart() { #include "asm/d/menu/d_menu_save/saveSelectStart__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F3BE0-801F3C7C 1EE520 009C+00 1/0 0/0 0/0 .text selectDataOpenMove__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::selectDataOpenMove() { - nofralloc -#include "asm/d/menu/d_menu_save/selectDataOpenMove__12dMenu_save_cFv.s" +void dMenu_save_c::selectDataOpenMove() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool selDataAnmComplete = selectDataMoveAnm(); + bool yesnoAnmComplete = yesnoMenuMoveAnm(); + bool wakuAnmComplete = selectWakuAlpahAnm(mSelectedFile); + + if (headerTxtChanged == true && selDataAnmComplete == true && yesnoAnmComplete == true && + wakuAnmComplete == true) { + yesnoCursorShow(); + mMenuProc = PROC_SAVE_YES_NO_SELECT; + } } -#pragma pop /* 801F3C7C-801F3E30 1EE5BC 01B4+00 1/1 0/0 0/0 .text dataSelectAnmSet__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::dataSelectAnmSet() { + if (mSelectedFile != 0xFF) { + mpSelData[mSelectedFile]->getPanePtr()->setAnimation(field_0x40); + field_0x74[mSelectedFile] = SelStartFrameTbl[mSelectedFile]; + field_0x40->setFrame(field_0x74[mSelectedFile]); + mpSelData[mSelectedFile]->getPanePtr()->animationTransform(); + mpBookWaku[mSelectedFile]->alphaAnimeStart(0); + } + + if (mLastSelFile != 0xFF) { + selectWakuAlpahAnmInit(mLastSelFile, 255, 0, g_msHIO.mSelectFrames); + mpSelData[mLastSelFile]->getPanePtr()->setAnimation(field_0x44); + field_0x74[mLastSelFile] = SelEndFrameTbl[mLastSelFile]; + field_0x44->setFrame(field_0x74[mLastSelFile]); + mpSelData[mLastSelFile]->getPanePtr()->animationTransform(); + mpBookWaku[mLastSelFile]->alphaAnimeStart(0); + mSelIcon->setAlphaRate(0.0f); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1970,8 +2579,65 @@ asm void dMenu_save_c::dataSelectAnmSet() { #include "asm/d/menu/d_menu_save/dataSelectAnmSet__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F3E30-801F40D8 1EE770 02A8+00 1/0 0/0 0/0 .text saveSelectMoveAnime__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveSelectMoveAnime() { + bool bookWakuAnmComplete = true; + bool selWakuAnmComplete = true; + bool var_r29 = true; + + if (mLastSelFile != 0xFF) { + bookWakuAnmComplete = mpBookWaku[mLastSelFile]->alphaAnime(g_msHIO.mEffectDispFrames, 255, 0, 1); + selWakuAnmComplete = selectWakuAlpahAnm(mLastSelFile); + + if (field_0x74[mLastSelFile] != SelStartFrameTbl[mLastSelFile]) { + field_0x74[mLastSelFile] -= 2; + + if (field_0x74[mLastSelFile] < SelStartFrameTbl[mLastSelFile]) { + field_0x74[mLastSelFile] = SelStartFrameTbl[mLastSelFile]; + } + + field_0x44->setFrame(field_0x74[mLastSelFile]); + mpSelData[mLastSelFile]->getPanePtr()->animationTransform(); + var_r29 = false; + } + } + + bool var_r28 = true; + bool var_r27 = true; + if (mSelectedFile != 0xFF) { + var_r28 = mpBookWaku[mSelectedFile]->alphaAnime(g_msHIO.mEffectDispFrames, 0, 0xFF, 1); + + if (field_0x74[mSelectedFile] != SelEndFrameTbl[mSelectedFile]) { + field_0x74[mSelectedFile] += 2; + + if (field_0x74[mSelectedFile] > SelEndFrameTbl[mSelectedFile]) { + field_0x74[mSelectedFile] = SelEndFrameTbl[mSelectedFile]; + } + + field_0x40->setFrame(field_0x74[mSelectedFile]); + mpSelData[mSelectedFile]->getPanePtr()->animationTransform(); + var_r27 = false; + } + } + + if (bookWakuAnmComplete == true && selWakuAnmComplete == true && var_r29 == true && var_r28 == true && + var_r27 == true) { + if (mSelectedFile != 0xFF) { + mpSelData[mSelectedFile]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + selFileCursorShow(); + } + + if (mLastSelFile != 0xFF) { + mpSelData[mLastSelFile]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + } + mMenuProc = PROC_SAVE_SELECT; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1980,9 +2646,40 @@ asm void dMenu_save_c::saveSelectMoveAnime() { #include "asm/d/menu/d_menu_save/saveSelectMoveAnime__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F40D8-801F4238 1EEA18 0160+00 1/0 0/0 0/0 .text saveYesNoSelect__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveYesNoSelect() { + if (!mDoRst::isReset()) { + stick->checkTrigger(); + + if (mDoCPd_c::getTrigA(PAD_1)) { + yesnoSelectStart(); + } else if (mDoCPd_c::getTrigB(PAD_1)) { + yesnoCancelAnmSet(); + } else if (stick->checkRightTrigger()) { + if (mYesNoCursor != CURSOR_NO) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + mYesNoPrevCursor = mYesNoCursor; + mYesNoCursor = CURSOR_NO; + yesnoSelectAnmSet(0); + mMenuProc = PROC_YES_NO_CURSOR_MOVE_ANM; + } + } else if (stick->checkLeftTrigger()) { + if (mYesNoCursor != CURSOR_YES) { + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + mYesNoPrevCursor = mYesNoCursor; + mYesNoCursor = CURSOR_YES; + yesnoSelectAnmSet(0); + mMenuProc = PROC_YES_NO_CURSOR_MOVE_ANM; + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -1991,9 +2688,27 @@ asm void dMenu_save_c::saveYesNoSelect() { #include "asm/d/menu/d_menu_save/saveYesNoSelect__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F4238-801F42FC 1EEB78 00C4+00 1/1 0/0 0/0 .text yesnoSelectStart__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::yesnoSelectStart() { + if (mYesNoCursor != CURSOR_NO) { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + mSelIcon->setAlphaRate(0.0f); + yesnoMenuMoveAnmInitSet(2099, 2089, 0); + headerTxtSet(0x3A); // Saving... + mWarning->openInit(); + ketteiTxtDispAnmInit(0); + modoruTxtDispAnmInit(0); + mMenuProc = PROC_SAVE_MOVE_DISP; + } else { + yesnoCancelAnmSet(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2002,8 +2717,28 @@ asm void dMenu_save_c::yesnoSelectStart() { #include "asm/d/menu/d_menu_save/yesnoSelectStart__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F42FC-801F43F8 1EEC3C 00FC+00 1/0 0/0 0/0 .text saveMoveDisp__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveMoveDisp() { + i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + + bool headerTxtChanged = headerTxtChangeAnm(); + bool yesnoAnmComplete = yesnoMenuMoveAnm(); + bool ketteiAnmComplete = ketteiTxtDispAnm(); + bool modoruAnmComplete = modoruTxtDispAnm(); + u32 check = mWarning->getStatus() != 0; + + if (headerTxtChanged == true && yesnoAnmComplete == true && ketteiAnmComplete == true && + modoruAnmComplete == 1 && check == 1) { + mWaitTimer = g_msHIO.mCardWaitFrames; + dataWrite(); + mMenuProc = PROC_MEMCARD_DATA_SAVE_WAIT; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2012,8 +2747,29 @@ asm void dMenu_save_c::saveMoveDisp() { #include "asm/d/menu/d_menu_save/saveMoveDisp__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F43F8-801F4510 1EED38 0118+00 1/0 0/0 0/0 .text saveMoveDisp2__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::saveMoveDisp2() { + i_mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0); + + bool headerTxtChanged = headerTxtChangeAnm(); + bool dataMoveAnm = selectDataMoveAnm(); + bool wakuAnmComplete = selectWakuAlpahAnm(mSelectedFile); + bool ketteiAnmComplete = ketteiTxtDispAnm(); + bool modoruAnmComplete = modoruTxtDispAnm(); + u32 check = mWarning->getStatus() != 0; + + if (headerTxtChanged == true && dataMoveAnm == true && wakuAnmComplete == true && + ketteiAnmComplete == true && modoruAnmComplete == 1 && check == 1) { + mWaitTimer = g_msHIO.mCardWaitFrames; + dataWrite(); + mMenuProc = PROC_MEMCARD_DATA_SAVE_WAIT; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2022,8 +2778,29 @@ asm void dMenu_save_c::saveMoveDisp2() { #include "asm/d/menu/d_menu_save/saveMoveDisp2__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F4510-801F46B4 1EEE50 01A4+00 4/4 0/0 0/0 .text yesnoSelectAnmSet__12dMenu_save_cFUc */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::yesnoSelectAnmSet(u8 param_0) { + if (mYesNoPrevCursor != 0xFF) { + yesnoWakuAlpahAnmInit(mYesNoPrevCursor, 255, 0, g_msHIO.mSelectFrames); + mpNoYes[mYesNoPrevCursor]->getPanePtr()->setAnimation(field_0x40); + field_0x8c[mYesNoPrevCursor] = YnSelEndFrameTbl[mYesNoPrevCursor][param_0]; + field_0x40->setFrame(field_0x8c[mYesNoPrevCursor]); + mpNoYes[mYesNoPrevCursor]->getPanePtr()->animationTransform(); + mSelIcon->setAlphaRate(0.0f); + } + + if (mYesNoCursor != 0xFF) { + mpNoYes[mYesNoCursor]->getPanePtr()->setAnimation(field_0x44); + field_0x8c[mYesNoCursor] = YnSelStartFrameTbl[mYesNoCursor][param_0]; + field_0x44->setFrame(field_0x8c[mYesNoCursor]); + mpNoYes[mYesNoCursor]->getPanePtr()->animationTransform(); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2032,19 +2809,33 @@ asm void dMenu_save_c::yesnoSelectAnmSet(u8 param_0) { #include "asm/d/menu/d_menu_save/yesnoSelectAnmSet__12dMenu_save_cFUc.s" } #pragma pop +#endif /* 801F46B4-801F4724 1EEFF4 0070+00 1/0 0/0 0/0 .text yesNoCursorMoveAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::yesNoCursorMoveAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/yesNoCursorMoveAnm__12dMenu_save_cFv.s" +void dMenu_save_c::yesNoCursorMoveAnm() { + bool selAnmComplete = yesnoSelectMoveAnm(0); + bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor); + + if (selAnmComplete == true && wakuAnmComplete == true) { + yesnoCursorShow(); + mMenuProc = PROC_SAVE_YES_NO_SELECT; + } } -#pragma pop /* 801F4724-801F47DC 1EF064 00B8+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::yesnoCancelAnmSet() { + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0); + mSelIcon->setAlphaRate(0.0f); + headerTxtSet(0x4CA); + selectDataMoveAnmInitSet(SelOpenEndFrameTbl[mSelectedFile], + SelOpenStartFrameTbl[mSelectedFile]); + yesnoMenuMoveAnmInitSet(2099, 2089, 0); + mMenuProc = PROC_SAVE_YES_NO_CANCEL_MOVE; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2053,41 +2844,87 @@ asm void dMenu_save_c::yesnoCancelAnmSet() { #include "asm/d/menu/d_menu_save/yesnoCancelAnmSet__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F47DC-801F485C 1EF11C 0080+00 1/0 0/0 0/0 .text saveYesNoCancelMove__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveYesNoCancelMove() { - nofralloc -#include "asm/d/menu/d_menu_save/saveYesNoCancelMove__12dMenu_save_cFv.s" +void dMenu_save_c::saveYesNoCancelMove() { + bool headerTxtChanged = headerTxtChangeAnm(); + bool yesnoAnmComplete = yesnoMenuMoveAnm(); + bool dataAnmComplete = selectDataMoveAnm(); + + if (headerTxtChanged == true && yesnoAnmComplete == true && dataAnmComplete == true) { + selFileCursorShow(); + mMenuProc = PROC_SAVE_SELECT; + } } -#pragma pop /* 801F485C-801F4928 1EF19C 00CC+00 7/7 0/0 0/0 .text headerTxtSet__12dMenu_save_cFUs */ void dMenu_save_c::headerTxtSet(u16 msgID) { if (msgID == 0xFFFF) { - strcpy(field_0x170[field_0x178 ^ 1], ""); + strcpy(mpHeaderTxt[mHeaderTxtType ^ 1], ""); } else { - mMenuSave.mMsgString->getString(msgID, (J2DTextBox*)field_0x168[field_0x178 ^ 1]->getPanePtr(), NULL, mMenuSave.font[0], NULL, 0); + mSaveSel.mMsgString->getString( + msgID, (J2DTextBox*)mpHeaderTxtPane[mHeaderTxtType ^ 1]->getPanePtr(), NULL, + mSaveSel.font[0], NULL, 0); } - field_0x168[field_0x178]->alphaAnimeStart(0); - field_0x168[field_0x178 ^ 1]->alphaAnimeStart(0); - field_0x179 = 0; + mpHeaderTxtPane[mHeaderTxtType]->alphaAnimeStart(0); + mpHeaderTxtPane[mHeaderTxtType ^ 1]->alphaAnimeStart(0); + mHeaderAnmComplete = false; } /* 801F4928-801F4A10 1EF268 00E8+00 10/10 0/0 0/0 .text headerTxtChangeAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::headerTxtChangeAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/headerTxtChangeAnm__12dMenu_save_cFv.s" +bool dMenu_save_c::headerTxtChangeAnm() { + if (mHeaderAnmComplete) { + return true; + } + + bool changed = false; + bool curHeaderAnmComplete = + mpHeaderTxtPane[mHeaderTxtType]->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 0, 0); + bool newHeaderAnmComplete = + mpHeaderTxtPane[mHeaderTxtType ^ 1]->alphaAnime(g_msHIO.mCharSwitchFrames, 0, 255, 0); + int msgWaitTimer = dMeter2Info_getMsgKeyWaitTimer(); + + if (curHeaderAnmComplete == true && newHeaderAnmComplete == true && msgWaitTimer == 0) { + mHeaderTxtType ^= 1; + mHeaderAnmComplete = true; + changed = true; + } + + return changed; } -#pragma pop /* 801F4A10-801F4B84 1EF350 0174+00 1/1 0/0 0/0 .text errDispInitSet__12dMenu_save_cFi */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::errDispInitSet(int param_0) { + headerTxtSet(1); + mpErrTxtPane[mErrTxtType]->setAlpha(255); + mpErrTxtPane[mErrTxtType ^ 1]->setAlpha(0); + + mSaveSel.mMsgString->getString(param_0, (J2DTextBox*)mpErrTxtPane[mErrTxtType]->getPanePtr(), + NULL, mSaveSel.font[0], NULL, 0); + + if (field_0xd2 != 0 || field_0xd3 != 0) { + errorMoveAnmInitSet(2859, 2849); + } + + if (field_0x64 != 0 || field_0x65 != 0) { + selectDataBaseMoveAnmInitSet(33, 1); + } + + if (field_0x9c != 0 || field_0x9d != 0) { + yesnoMenuMoveAnmInitSet(2099, 2089, 0); + } + + modoruTxtDispAnmInit(0); + ketteiTxtDispAnmInit(0); + mWarning->init(); + mSelIcon->setAlphaRate(0.0f); + mMenuProc = PROC_MSG_WINDOW_INIT_OPEN; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2096,40 +2933,130 @@ asm void dMenu_save_c::errDispInitSet(int param_0) { #include "asm/d/menu/d_menu_save/errDispInitSet__12dMenu_save_cFi.s" } #pragma pop +#endif /* 801F4B84-801F4D10 1EF4C4 018C+00 1/0 0/0 0/0 .text msgWindowInitOpen__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::msgWindowInitOpen() { - nofralloc -#include "asm/d/menu/d_menu_save/msgWindowInitOpen__12dMenu_save_cFv.s" +void dMenu_save_c::msgWindowInitOpen() { + bool headerTxtChanged = true; + + if (field_0x17a == 0) { + headerTxtChanged = headerTxtChangeAnm(); + } + + bool dataAnmComplete = true; + bool yesnoAnmComplete = true; + bool errorAnmComplete = true; + + if (field_0x64 != 0 || field_0x65 != 0) { + dataAnmComplete = selectDataBaseMoveAnm(); + } + + if (field_0x9c != 0 || field_0x9d != 0) { + yesnoAnmComplete = yesnoMenuMoveAnm(); + } + + if (field_0xd2 != 0 || field_0xd3 != 0) { + errorAnmComplete = errorMoveAnm(); + } + + bool modoruAnmComplete = modoruTxtDispAnm(); + bool ketteiAnmComplete = ketteiTxtDispAnm(); + + if (headerTxtChanged == true && dataAnmComplete == true && yesnoAnmComplete == true && errorAnmComplete == true && + modoruAnmComplete == true && ketteiAnmComplete == true) { + mSaveSel.Scr->clearAnmTransform(); + errorMoveAnmInitSet(2849, 2859); + + if (field_0x9e != 0) { + yesnoMenuMoveAnmInitSet(2999, 3009, 0); + ketteiTxtDispAnmInit(1); + } else { + ketteiTxtDispAnmInit(0); + } + + field_0x17a = 1; + mMenuProc = PROC_MSG_WINDOW_OPEN; + } } -#pragma pop /* 801F4D10-801F4DAC 1EF650 009C+00 1/0 0/0 0/0 .text msgWindowOpen__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::msgWindowOpen() { - nofralloc -#include "asm/d/menu/d_menu_save/msgWindowOpen__12dMenu_save_cFv.s" +void dMenu_save_c::msgWindowOpen() { + bool errorAnmComplete = errorMoveAnm(); + bool yesnoAnmComplete = true; + + if (field_0x9e != 0) { + yesnoAnmComplete = yesnoMenuMoveAnm(); + } + + bool ketteiAnmComplete = ketteiTxtDispAnm(); + + if (errorAnmComplete == true && yesnoAnmComplete == true && ketteiAnmComplete == true) { + if (field_0x9e != 0) { + yesnoCursorShow(); + } + + mMenuProc = field_0x1b4; + } } -#pragma pop /* 801F4DAC-801F4E48 1EF6EC 009C+00 1/0 0/0 0/0 .text msgWindowClose__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::msgWindowClose() { - nofralloc -#include "asm/d/menu/d_menu_save/msgWindowClose__12dMenu_save_cFv.s" +void dMenu_save_c::msgWindowClose() { + bool errorAnmComplete = errorMoveAnm(); + bool yenoAnmComplete = true; + + if (field_0x9c != 0) { + yenoAnmComplete = yesnoMenuMoveAnm(); + } + + if (errorAnmComplete == true && yenoAnmComplete == true) { + field_0x9e = 0; + + if (mpErrFunc != NULL) { + (this->*mpErrFunc)(); + } else { + mMenuProc = field_0x1b4; + } + } } -#pragma pop /* 801F4E48-801F4FB4 1EF788 016C+00 6/6 0/0 0/0 .text errYesNoSelect__12dMenu_save_cFUcUc */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::errYesNoSelect(u8 param_0, u8 param_1) { + bool yesnoSelected = false; + + if (mDoRst::isReset()) { + return false; + } + + stick->checkTrigger(); + + if (mDoCPd_c::getTrigA(PAD_1)) { + if (mYesNoCursor != CURSOR_NO) { + if (param_1 == 0) { + mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + } + } else if (param_1 == 0) { + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0); + } + + mSelIcon->setAlphaRate(0.0f); + yesnoSelected = true; + } else if (stick->checkRightTrigger()) { + if (mYesNoCursor != CURSOR_NO) { + errCurMove(param_0, 0); + } + } else if (stick->checkLeftTrigger()) { + if (mYesNoCursor != CURSOR_YES) { + errCurMove(param_0, 0); + } + } + + return yesnoSelected; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2138,8 +3065,22 @@ asm bool dMenu_save_c::errYesNoSelect(u8 param_0, u8 param_1) { #include "asm/d/menu/d_menu_save/errYesNoSelect__12dMenu_save_cFUcUc.s" } #pragma pop +#endif /* 801F4FB4-801F5054 1EF8F4 00A0+00 1/1 0/0 0/0 .text errCurMove__12dMenu_save_cFUcUc */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::errCurMove(u8 param_0, u8 param_1) { + mYesNoPrevCursor = mYesNoCursor; + mYesNoCursor ^= 1; + field_0x2195 = param_0; + + mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, param_1, 0); + yesnoSelectAnmSet(param_0); + field_0x1b3 = mMenuProc; + mMenuProc = PROC_ERR_YES_NO_CURSOR_MOVE_ANM; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2148,54 +3089,90 @@ asm void dMenu_save_c::errCurMove(u8 param_0, u8 param_1) { #include "asm/d/menu/d_menu_save/errCurMove__12dMenu_save_cFUcUc.s" } #pragma pop +#endif /* 801F5054-801F50C4 1EF994 0070+00 1/0 0/0 0/0 .text errYesNoCursorMoveAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::errYesNoCursorMoveAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/errYesNoCursorMoveAnm__12dMenu_save_cFv.s" +void dMenu_save_c::errYesNoCursorMoveAnm() { + bool moveAnmComplete = yesnoSelectMoveAnm(field_0x2195); + bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor); + + if (moveAnmComplete == true && wakuAnmComplete == true) { + yesnoCursorShow(); + mMenuProc = field_0x1b3; + } } -#pragma pop /* 801F50C4-801F5190 1EFA04 00CC+00 9/9 0/0 0/0 .text errorTxtSet__12dMenu_save_cFUs */ void dMenu_save_c::errorTxtSet(u16 msgID) { if (msgID == 0xFFFF) { - strcpy(field_0xc8[field_0xd0 ^ 1], ""); + strcpy(mpErrTxt[mErrTxtType ^ 1], ""); } else { - J2DTextBox* tbox = (J2DTextBox*)field_0xc0[field_0xd0 ^ 1]->getPanePtr(); - mMenuSave.mMsgString->getString(msgID, tbox, NULL, mMenuSave.font[0], NULL, 0); + J2DTextBox* tbox = (J2DTextBox*)mpErrTxtPane[mErrTxtType ^ 1]->getPanePtr(); + mSaveSel.mMsgString->getString(msgID, tbox, NULL, mSaveSel.font[0], NULL, 0); } - field_0xc0[field_0xd0]->alphaAnimeStart(0); - field_0xc0[field_0xd0 ^ 1]->alphaAnimeStart(0); - field_0xd1 = 0; + mpErrTxtPane[mErrTxtType]->alphaAnimeStart(0); + mpErrTxtPane[mErrTxtType ^ 1]->alphaAnimeStart(0); + mErrTxtAnmComplete = false; } /* 801F5190-801F5278 1EFAD0 00E8+00 9/9 0/0 0/0 .text errorTxtChangeAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_save_c::errorTxtChangeAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/errorTxtChangeAnm__12dMenu_save_cFv.s" +bool dMenu_save_c::errorTxtChangeAnm() { + if (mErrTxtAnmComplete) { + return true; + } + + bool anmComplete = false; + bool errTxtAnm1Complete = + mpErrTxtPane[mErrTxtType]->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 0, 0); + bool errTxtAnm2Complete = + mpErrTxtPane[mErrTxtType ^ 1]->alphaAnime(g_msHIO.mCharSwitchFrames, 0, 255, 0); + int msgWaitTimer = dMeter2Info_getMsgKeyWaitTimer(); + + if (errTxtAnm1Complete == true && errTxtAnm2Complete == true && msgWaitTimer == 0) { + mErrTxtType ^= 1; + mErrTxtAnmComplete = true; + anmComplete = true; + } + + return anmComplete; } -#pragma pop /* 801F5278-801F533C 1EFBB8 00C4+00 1/1 0/0 0/0 .text saveSelectOpenInit__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveSelectOpenInit() { - nofralloc -#include "asm/d/menu/d_menu_save/saveSelectOpenInit__12dMenu_save_cFv.s" +void dMenu_save_c::saveSelectOpenInit() { + if (field_0x64 != 0 || field_0x65 != 0) { + selectDataBaseMoveAnmInitSet(0x21, 1); + } + + if (field_0xd2 != 0 || field_0xd3 != 0) { + errorMoveAnmInitSet(0xB2B, 0xB21); + } + + if (field_0x9c != 0 || field_0x9c != 0) { + yesnoMenuMoveAnmInitSet(2099, 2089, 0); + } + + mWarning->init(); + headerTxtSet(0xFFFF); + field_0x17a = 0; + mMenuProc = PROC_OPEN_SAVE_SELECT; } -#pragma pop /* 801F533C-801F53D4 1EFC7C 0098+00 3/3 0/0 0/0 .text * selectDataBaseMoveAnmInitSet__12dMenu_save_cFii */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) { + mpSelectMoveBase->getPanePtr()->setAnimation(field_0x40); + mDataBaseMoveAnmFrame = param_0; + mDataBaseMoveFrameMax = param_1; + + field_0x40->setFrame(mDataBaseMoveAnmFrame); + mpSelectMoveBase->getPanePtr()->animationTransform(); + field_0x65 = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2204,29 +3181,80 @@ asm void dMenu_save_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) { #include "asm/d/menu/d_menu_save/selectDataBaseMoveAnmInitSet__12dMenu_save_cFii.s" } #pragma pop +#endif /* 801F53D4-801F54C0 1EFD14 00EC+00 3/3 0/0 0/0 .text selectDataBaseMoveAnm__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::selectDataBaseMoveAnm() { + if (mDataBaseMoveAnmFrame != mDataBaseMoveFrameMax) { + if (mDataBaseMoveAnmFrame < mDataBaseMoveFrameMax) { + mDataBaseMoveAnmFrame += 2; + + if (mDataBaseMoveAnmFrame > mDataBaseMoveFrameMax) { + mDataBaseMoveAnmFrame = mDataBaseMoveFrameMax; + } + } else { + mDataBaseMoveAnmFrame -= 2; + + if (mDataBaseMoveAnmFrame < mDataBaseMoveFrameMax) { + mDataBaseMoveAnmFrame = mDataBaseMoveFrameMax; + } + } + + field_0x40->setFrame(mDataBaseMoveAnmFrame); + mpSelectMoveBase->getPanePtr()->animationTransform(); + return false; + } else { + if (mDataBaseMoveAnmFrame == 33) { + field_0x64 = 1; + field_0x65 = 0; + } else { + field_0x64 = 0; + } + + mpSelectMoveBase->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + return true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_save_c::selectDataBaseMoveAnm() { +asm bool dMenu_save_c::selectDataBaseMoveAnm() { nofralloc #include "asm/d/menu/d_menu_save/selectDataBaseMoveAnm__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F54C0-801F5508 1EFE00 0048+00 1/1 0/0 0/0 .text saveSelectOpenAnmSet__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::saveSelectOpenAnmSet() { - nofralloc -#include "asm/d/menu/d_menu_save/saveSelectOpenAnmSet__12dMenu_save_cFv.s" +void dMenu_save_c::saveSelectOpenAnmSet() { + setSaveData(); + + if (field_0x64 == 0) { + selectDataBaseMoveAnmInitSet(1, 0x21); + } } -#pragma pop /* 801F5508-801F5600 1EFE48 00F8+00 2/2 0/0 0/0 .text selectDataMoveAnmInitSet__12dMenu_save_cFii */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::selectDataMoveAnmInitSet(int param_0, int param_1) { + mpSelData[0]->getPanePtr()->setAnimation(field_0x40); + mpSelData[1]->getPanePtr()->setAnimation(field_0x40); + mpSelData[2]->getPanePtr()->setAnimation(field_0x40); + + field_0x74[mSelectedFile] = param_0; + field_0x80 = param_1; + field_0x40->setFrame(field_0x74[mSelectedFile]); + + mpSelData[0]->getPanePtr()->animationTransform(); + mpSelData[1]->getPanePtr()->animationTransform(); + mpSelData[2]->getPanePtr()->animationTransform(); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2235,20 +3263,81 @@ asm void dMenu_save_c::selectDataMoveAnmInitSet(int param_0, int param_1) { #include "asm/d/menu/d_menu_save/selectDataMoveAnmInitSet__12dMenu_save_cFii.s" } #pragma pop +#endif /* 801F5600-801F5744 1EFF40 0144+00 3/3 0/0 0/0 .text selectDataMoveAnm__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::selectDataMoveAnm() { + if (field_0x74[mSelectedFile] != field_0x80) { + if (field_0x74[mSelectedFile] < field_0x80) { + field_0x74[mSelectedFile] += 2; + + if (field_0x74[mSelectedFile] > field_0x80) { + field_0x74[mSelectedFile] = field_0x80; + } + } else { + field_0x74[mSelectedFile] -= 2; + + if (field_0x74[mSelectedFile] < field_0x80) { + field_0x74[mSelectedFile] = field_0x80; + } + } + + field_0x40->setFrame(field_0x74[mSelectedFile]); + for (int i = 0; i < 3; i++) { + mpSelData[i]->getPanePtr()->animationTransform(); + } + + return false; + } else { + for (int i = 0; i < 3; i++) { + mpSelData[i]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + } + return true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_save_c::selectDataMoveAnm() { +asm bool dMenu_save_c::selectDataMoveAnm() { nofralloc #include "asm/d/menu/d_menu_save/selectDataMoveAnm__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F5744-801F58C8 1F0084 0184+00 12/12 0/0 0/0 .text * yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2) { + if (param_2 == 0 && field_0x9c == 0) { + mYesNoCursor = CURSOR_NO; + mYesNoPrevCursor = 1; + } + + if (anmFrame == 2089) { + ((J2DTextBox*)mpNoYesTxt[mYesNoCursor]->getPanePtr()) + ->setWhite(JUtility::TColor(255, 255, 255, 255)); + ((J2DTextBox*)mpNoYesTxt[mYesNoPrevCursor]->getPanePtr()) + ->setWhite(JUtility::TColor(150, 150, 150, 255)); + } + + mSelIcon->setAlphaRate(0.0f); + mpNoYes[0]->getPanePtr()->setAnimation(field_0x48); + mpNoYes[1]->getPanePtr()->setAnimation(field_0x48); + mYesNoMoveAnmFrame = anmFrame; + mYesNoMoveAnmMax = frameMax; + + field_0x48->setFrame(mYesNoMoveAnmFrame); + mpNoYes[0]->getPanePtr()->animationTransform(); + mpNoYes[1]->getPanePtr()->animationTransform(); + field_0x9d = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2257,8 +3346,59 @@ asm void dMenu_save_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1, u8 para #include "asm/d/menu/d_menu_save/yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc.s" } #pragma pop +#endif /* 801F58C8-801F5AE4 1F0208 021C+00 13/13 0/0 0/0 .text yesnoMenuMoveAnm__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::yesnoMenuMoveAnm() { + if (mYesNoMoveAnmFrame != mYesNoMoveAnmMax) { + if (mYesNoMoveAnmFrame < mYesNoMoveAnmMax) { + mYesNoMoveAnmFrame += 2; + + if (mYesNoMoveAnmFrame > mYesNoMoveAnmMax) { + mYesNoMoveAnmFrame = mYesNoMoveAnmMax; + } + } else { + mYesNoMoveAnmFrame -= 2; + + if (mYesNoMoveAnmFrame < mYesNoMoveAnmMax) { + mYesNoMoveAnmFrame = mYesNoMoveAnmMax; + } + } + + field_0x48->setFrame(mYesNoMoveAnmFrame); + mpNoYes[0]->getPanePtr()->animationTransform(); + mpNoYes[1]->getPanePtr()->animationTransform(); + return false; + } else { + mpNoYes[0]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + mpNoYes[1]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + + if (mYesNoMoveAnmFrame == 0x833 || mYesNoMoveAnmFrame == 0x8C9 || + mYesNoMoveAnmFrame == 0xBC1) { + field_0x9c = 1; + + if (mYesNoCursor != 0xFF) { + mNoYesBase[mYesNoCursor]->setAlpha(255); + mNoYesGold[mYesNoCursor]->setAlpha(255); + mNoYesGold2[mYesNoCursor]->setAlpha(255); + } + } else { + field_0x9c = 0; + + if (mYesNoCursor != 0xFF) { + mNoYesBase[mYesNoCursor]->setAlpha(0); + mNoYesGold[mYesNoCursor]->setAlpha(0); + mNoYesGold2[mYesNoCursor]->setAlpha(0); + } + } + field_0x9d = 0; + + return true; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2267,16 +3407,82 @@ asm bool dMenu_save_c::yesnoMenuMoveAnm() { #include "asm/d/menu/d_menu_save/yesnoMenuMoveAnm__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F5AE4-801F5D84 1F0424 02A0+00 4/4 0/0 0/0 .text yesnoSelectMoveAnm__12dMenu_save_cFUc */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) { + bool ret = false; + bool var_r30 = true; + if (mYesNoPrevCursor != 0xFF) { + if (field_0x8c[mYesNoPrevCursor] != YnSelStartFrameTbl[mYesNoPrevCursor][param_0]) { + if (field_0x8c[mYesNoPrevCursor] < YnSelStartFrameTbl[mYesNoPrevCursor][param_0]) { + field_0x8c[mYesNoPrevCursor] += 2; + + if (field_0x8c[mYesNoPrevCursor] > YnSelStartFrameTbl[mYesNoPrevCursor][param_0]) { + field_0x8c[mYesNoPrevCursor] = YnSelStartFrameTbl[mYesNoPrevCursor][param_0]; + } + } else { + field_0x8c[mYesNoPrevCursor] -= 2; + + if (field_0x8c[mYesNoPrevCursor] < YnSelStartFrameTbl[mYesNoPrevCursor][param_0]) { + field_0x8c[mYesNoPrevCursor] = YnSelStartFrameTbl[mYesNoPrevCursor][param_0]; + } + } + + field_0x40->setFrame(field_0x8c[mYesNoPrevCursor]); + mpNoYes[mYesNoPrevCursor]->getPanePtr()->animationTransform(); + var_r30 = false; + } + } + + bool var_r7 = true; + if (mYesNoCursor != 0xFF) { + if (field_0x8c[mYesNoCursor] != YnSelEndFrameTbl[mYesNoCursor][param_0]) { + if (field_0x8c[mYesNoCursor] < YnSelEndFrameTbl[mYesNoCursor][param_0]) { + field_0x8c[mYesNoCursor] += 2; + + if (field_0x8c[mYesNoCursor] > YnSelEndFrameTbl[mYesNoCursor][param_0]) { + field_0x8c[mYesNoCursor] = YnSelEndFrameTbl[mYesNoCursor][param_0]; + } + } else { + field_0x8c[mYesNoCursor] -= 2; + + if (field_0x8c[mYesNoCursor] < YnSelEndFrameTbl[mYesNoCursor][param_0]) { + field_0x8c[mYesNoCursor] = YnSelEndFrameTbl[mYesNoCursor][param_0]; + } + } + + field_0x44->setFrame(field_0x8c[mYesNoCursor]); + mpNoYes[mYesNoCursor]->getPanePtr()->animationTransform(); + var_r7 = false; + } + } + + if (var_r30 == true && var_r7 == true) { + if (mYesNoPrevCursor != 0xFF) { + mpNoYes[mYesNoPrevCursor]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + } + + if (mYesNoCursor != 0xFF) { + mpNoYes[mYesNoCursor]->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL); + } + ret = true; + } + + return ret; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) { +asm bool dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) { nofralloc #include "asm/d/menu/d_menu_save/yesnoSelectMoveAnm__12dMenu_save_cFUc.s" } #pragma pop +#endif /* ############################################################################################## */ /* 8045447C-80454480 002A7C 0004+00 1/1 0/0 0/0 .sdata2 @6327 */ @@ -2291,6 +3497,24 @@ SECTION_SDATA2 static f32 lit_6328[1 + 1 /* padding */] = { /* 801F5D84-801F5EF4 1F06C4 0170+00 9/9 0/0 0/0 .text yesnoCursorShow__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::yesnoCursorShow() { + if (mYesNoCursor != 0xFF) { + ((J2DTextBox*)mpNoYesTxt[mYesNoCursor]->getPanePtr()) + ->setWhite(JUtility::TColor(255, 255, 255, 255)); + + mNoYesBase[mYesNoCursor]->setAlpha(255); + mNoYesGold[mYesNoCursor]->setAlpha(255); + mNoYesGold2[mYesNoCursor]->setAlpha(255); + + Vec pos = mpNoYes[mYesNoCursor]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mpNoYes[mYesNoCursor]->getPanePtr(), true); + mSelIcon->setAlphaRate(1.0f); + mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2299,8 +3523,20 @@ asm void dMenu_save_c::yesnoCursorShow() { #include "asm/d/menu/d_menu_save/yesnoCursorShow__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F5EF4-801F5F84 1F0834 0090+00 3/3 0/0 0/0 .text errorMoveAnmInitSet__12dMenu_save_cFii */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::errorMoveAnmInitSet(int param_0, int param_1) { + field_0xb4->setAnimation(field_0x4c); + field_0xb8 = param_0; + field_0xbc = param_1; + field_0x4c->setFrame(field_0xb8); + field_0xb4->animationTransform(); + field_0xd3 = 1; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2309,81 +3545,171 @@ asm void dMenu_save_c::errorMoveAnmInitSet(int param_0, int param_1) { #include "asm/d/menu/d_menu_save/errorMoveAnmInitSet__12dMenu_save_cFii.s" } #pragma pop +#endif /* 801F5F84-801F60A4 1F08C4 0120+00 4/4 0/0 0/0 .text errorMoveAnm__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +bool dMenu_save_c::errorMoveAnm() { + if (field_0xb8 != field_0xbc) { + if (field_0xb8 < field_0xbc) { + field_0xb8 += 2; + + if (field_0xb8 > field_0xbc) { + field_0xb8 = field_0xbc; + } + } else { + field_0xb8 -= 2; + + if (field_0xb8 < field_0xbc) { + field_0xb8 = field_0xbc; + } + } + + field_0x4c->setFrame(field_0xb8); + field_0xb4->animationTransform(); + return 0; + } else { + field_0x4c->setFrame(field_0xbc); + field_0xb4->animationTransform(); + field_0xb4->setAnimation((J2DAnmTransformKey*)NULL); + + if (field_0xbc == 2859) { + field_0xd2 = 1; + } else { + field_0xd2 = 0; + } + field_0xd3 = 0; + return 1; + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMenu_save_c::errorMoveAnm() { +asm bool dMenu_save_c::errorMoveAnm() { nofralloc #include "asm/d/menu/d_menu_save/errorMoveAnm__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F60A4-801F6120 1F09E4 007C+00 5/5 0/0 0/0 .text modoruTxtDispAnmInit__12dMenu_save_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::modoruTxtDispAnmInit(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_save/modoruTxtDispAnmInit__12dMenu_save_cFUc.s" +void dMenu_save_c::modoruTxtDispAnmInit(u8 param_0) { + field_0x1a8 = param_0; + if ((param_0 != 0 || mpBackTxt->getAlpha() != 0) && + (param_0 != 1 || mpBackTxt->getAlpha() != 255)) { + mpBackTxt->alphaAnimeStart(0); + mpBBtnIcon->alphaAnimeStart(0); + return; + } + + mpBackTxt->alphaAnimeStart(g_msHIO.mCharSwitchFrames); + mpBBtnIcon->alphaAnimeStart(g_msHIO.mCharSwitchFrames); } -#pragma pop /* 801F6120-801F61FC 1F0A60 00DC+00 5/5 0/0 0/0 .text modoruTxtDispAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::modoruTxtDispAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/modoruTxtDispAnm__12dMenu_save_cFv.s" +bool dMenu_save_c::modoruTxtDispAnm() { + bool txtAnmComplete; + bool btnAnmComplete; + + if (field_0x1a8 != 0) { + txtAnmComplete = mpBackTxt->alphaAnime(g_msHIO.mCharSwitchFrames, 0, 255, 0); + btnAnmComplete = mpBBtnIcon->alphaAnime(g_msHIO.mCharSwitchFrames, 128, 255, 0); + } else { + txtAnmComplete = mpBackTxt->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 0, 0); + btnAnmComplete = mpBBtnIcon->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 128, 0); + } + + if (txtAnmComplete == true && btnAnmComplete == true) { + return true; + } + + return false; } -#pragma pop /* 801F61FC-801F6278 1F0B3C 007C+00 9/9 0/0 0/0 .text ketteiTxtDispAnmInit__12dMenu_save_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::ketteiTxtDispAnmInit(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_save/ketteiTxtDispAnmInit__12dMenu_save_cFUc.s" +void dMenu_save_c::ketteiTxtDispAnmInit(u8 param_0) { + field_0x1a9 = param_0; + if ((param_0 != 0 || mpConfirmTxt->getAlpha() != 0) && + (param_0 != 1 || mpConfirmTxt->getAlpha() != 255)) { + mpConfirmTxt->alphaAnimeStart(0); + mpABtnIcon->alphaAnimeStart(0); + return; + } + + mpConfirmTxt->alphaAnimeStart(g_msHIO.mCharSwitchFrames); + mpABtnIcon->alphaAnimeStart(g_msHIO.mCharSwitchFrames); } -#pragma pop /* 801F6278-801F6354 1F0BB8 00DC+00 11/11 0/0 0/0 .text ketteiTxtDispAnm__12dMenu_save_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm bool dMenu_save_c::ketteiTxtDispAnm() { - nofralloc -#include "asm/d/menu/d_menu_save/ketteiTxtDispAnm__12dMenu_save_cFv.s" +bool dMenu_save_c::ketteiTxtDispAnm() { + bool txtAnmComplete; + bool btnAnmComplete; + + if (field_0x1a9 != 0) { + txtAnmComplete = mpConfirmTxt->alphaAnime(g_msHIO.mCharSwitchFrames, 0, 255, 0); + btnAnmComplete = mpABtnIcon->alphaAnime(g_msHIO.mCharSwitchFrames, 128, 255, 0); + } else { + txtAnmComplete = mpConfirmTxt->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 0, 0); + btnAnmComplete = mpABtnIcon->alphaAnime(g_msHIO.mCharSwitchFrames, 255, 128, 0); + } + + if (txtAnmComplete == true && btnAnmComplete == true) { + return true; + } + + return false; } -#pragma pop /* 801F6354-801F6390 1F0C94 003C+00 2/2 0/0 0/0 .text * selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::selectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/menu/d_menu_save/selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s" +void dMenu_save_c::selectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { + mpSelWakuMoyo[param_0]->alphaAnimeStart(0); + mpSelWakuGold[param_0]->alphaAnimeStart(0); + mpSelWakuGold2[param_0]->alphaAnimeStart(0); + field_0x104[param_0] = param_1; + field_0x107[param_0] = param_2; + field_0x10a[param_0] = param_3; } -#pragma pop /* 801F6390-801F6458 1F0CD0 00C8+00 3/3 0/0 0/0 .text selectWakuAlpahAnm__12dMenu_save_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::selectWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_save/selectWakuAlpahAnm__12dMenu_save_cFUc.s" +bool dMenu_save_c::selectWakuAlpahAnm(u8 param_0) { + bool anmComplete = false; + bool moyoAnmComplete = mpSelWakuMoyo[param_0]->alphaAnime( + field_0x10a[param_0], field_0x104[param_0], field_0x107[param_0], 0); + bool goldAnmComplete = mpSelWakuGold[param_0]->alphaAnime( + field_0x10a[param_0], field_0x104[param_0], field_0x107[param_0], 0); + bool gold2AnmComplete = mpSelWakuGold2[param_0]->alphaAnime( + field_0x10a[param_0], field_0x104[param_0], field_0x107[param_0], 0); + + if (moyoAnmComplete == true && goldAnmComplete == true && gold2AnmComplete == true) { + anmComplete = true; + } + + return anmComplete; } -#pragma pop /* 801F6458-801F6608 1F0D98 01B0+00 3/3 0/0 0/0 .text selFileCursorShow__12dMenu_save_cFv */ +// matches with literals +#ifdef NONMATCHING +void dMenu_save_c::selFileCursorShow() { + mpSelWakuMoyo[mSelectedFile]->getPanePtr()->scale(1.0f, 1.0f); + mpSelWakuGold[mSelectedFile]->getPanePtr()->scale(1.0f, 1.0f); + mpSelWakuGold2[mSelectedFile]->getPanePtr()->scale(1.0f, 1.0f); + + mpSelWakuMoyo[mSelectedFile]->setAlpha(255); + mpSelWakuGold[mSelectedFile]->setAlpha(255); + mpSelWakuGold2[mSelectedFile]->setAlpha(255); + + Vec pos = mpSelData[mSelectedFile]->getGlobalVtxCenter(false, 0); + mSelIcon->setPos(pos.x, pos.y, mpSelData[mSelectedFile]->getPanePtr(), true); + mSelIcon->setAlphaRate(0.0f); + mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2392,27 +3718,53 @@ asm void dMenu_save_c::selFileCursorShow() { #include "asm/d/menu/d_menu_save/selFileCursorShow__12dMenu_save_cFv.s" } #pragma pop +#endif /* 801F6608-801F6654 1F0F48 004C+00 1/1 0/0 0/0 .text * yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::yesnoWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/menu/d_menu_save/yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc.s" +void dMenu_save_c::yesnoWakuAlpahAnmInit(u8 yesnoIdx, u8 startAlpha, u8 endAlpha, u8 anmTimer) { + if (yesnoIdx != 0xFF) { + mNoYesBase[yesnoIdx]->alphaAnimeStart(0); + mNoYesGold[yesnoIdx]->alphaAnimeStart(0); + mNoYesGold2[yesnoIdx]->alphaAnimeStart(0); + mNoYesWakuStartAlpha[yesnoIdx] = startAlpha; + mNoYesWakuEndAlpha[yesnoIdx] = endAlpha; + mNoYesWakuAnmTimer[yesnoIdx] = anmTimer; + mpNoYesTxt[yesnoIdx]->colorAnimeStart(0); + } } -#pragma pop /* 801F6654-801F67B8 1F0F94 0164+00 4/4 0/0 0/0 .text yesnoWakuAlpahAnm__12dMenu_save_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMenu_save_c::yesnoWakuAlpahAnm(u8 param_0) { - nofralloc -#include "asm/d/menu/d_menu_save/yesnoWakuAlpahAnm__12dMenu_save_cFUc.s" +bool dMenu_save_c::yesnoWakuAlpahAnm(u8 yesnoIdx) { + if (yesnoIdx == 0xFF) { + return true; + } + + bool anmComplete = false; + bool baseAnmComplete = mNoYesBase[yesnoIdx]->alphaAnime(mNoYesWakuAnmTimer[yesnoIdx], + mNoYesWakuStartAlpha[yesnoIdx], + mNoYesWakuEndAlpha[yesnoIdx], 0); + + bool goldAnmComplete = mNoYesGold[yesnoIdx]->alphaAnime(mNoYesWakuAnmTimer[yesnoIdx], + mNoYesWakuStartAlpha[yesnoIdx], + mNoYesWakuEndAlpha[yesnoIdx], 0); + + bool gold2AnmComplete = mNoYesGold2[yesnoIdx]->alphaAnime(mNoYesWakuAnmTimer[yesnoIdx], + mNoYesWakuStartAlpha[yesnoIdx], + mNoYesWakuEndAlpha[yesnoIdx], 0); + + bool txtAnmComplete = mpNoYesTxt[yesnoIdx]->colorAnime( + mNoYesWakuAnmTimer[yesnoIdx], mpNoYesTxt[yesnoIdx]->getInitBlack(), + mpNoYesTxt[yesnoIdx]->getInitBlack(), JUtility::TColor(255, 255, 255, 255), + JUtility::TColor(150, 150, 150, 255), 0); + + if (baseAnmComplete == true && goldAnmComplete == true && gold2AnmComplete == true && + txtAnmComplete == true) { + anmComplete = true; + } + + return anmComplete; } -#pragma pop /* 801F67B8-801F67F0 1F10F8 0038+00 2/2 0/0 0/0 .text dataSave__12dMenu_save_cFv */ void dMenu_save_c::dataSave() { @@ -2441,11 +3793,11 @@ void dMenu_save_c::setSaveData() { } if (field_0x1ad[i] != 0 || field_0x1aa[i] == 1) { - field_0x17c[i]->setAlpha(0); - field_0x188[i]->setAlpha(255); + mpDataBase[i]->setAlpha(0); + mpNoDataBase[i]->setAlpha(255); } else { - field_0x17c[i]->setAlpha(255); - field_0x188[i]->setAlpha(0); + mpDataBase[i]->setAlpha(255); + mpNoDataBase[i]->setAlpha(0); } if (field_0x1aa[i] == 2) { @@ -2479,8 +3831,8 @@ void dMenu_save_c::_draw2() { dComIfGd_set2DOpa(&mMenuSaveExplain); } - if (field_0x1b0 != 0) { - dComIfGd_set2DOpa(&mMenuSave); + if (mDisplayMenu) { + dComIfGd_set2DOpa(&mSaveSel); for (int i = 0; i < 3; i++) { mFileInfo[i]->_draw(); @@ -2496,6 +3848,12 @@ void dMenu_save_c::_draw2() { /* 801F6ADC-801F6B0C 1F141C 0030+00 1/0 0/0 0/0 .text draw__23dDlst_MenuSaveExplain_cFv */ +// matches with vtable data +#ifdef NONMATCHING +void dDlst_MenuSaveExplain_c::draw() { + mpScrn->draw((J2DOrthoGraph*)dComIfGp_getCurrentGrafPort()); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2505,8 +3863,15 @@ extern "C" asm void draw__23dDlst_MenuSaveExplain_cFv() { #include "asm/d/menu/d_menu_save/draw__23dDlst_MenuSaveExplain_cFv.s" } #pragma pop +#endif /* 801F6B0C-801F6B44 1F144C 0038+00 1/0 0/0 0/0 .text draw__16dDlst_MenuSave_cFv */ +// matches with vtable data +#ifdef NONMATCHING +void dDlst_MenuSave_c::draw() { + Scr->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -2516,6 +3881,7 @@ extern "C" asm void draw__16dDlst_MenuSave_cFv() { #include "asm/d/menu/d_menu_save/draw__16dDlst_MenuSave_cFv.s" } #pragma pop +#endif /* 801F6B44-801F6B8C 1F1484 0048+00 1/0 0/0 0/0 .text __dt__16dDlst_MenuSave_cFv */ dDlst_MenuSave_c::~dDlst_MenuSave_c() {} diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index 5485ab9440..c7f83f2ca9 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -556,7 +556,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_meter2_info[248]; extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 8373ec9404..b86c853db1 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -1338,7 +1338,7 @@ int dMsgFlow_c::query042(mesg_flow_node_branch*, fopAc_ac_c*, int) { ret = 1; } else if (midna->checkNpcFar()) { ret = 2; - } else if (g_env_light.mEvilPacketEnabled & 0x80) { + } else if (g_env_light.mEvilInitialized & 0x80) { ret = 3; } diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp index 3e29d44b76..8d74180582 100644 --- a/src/d/msg/d_msg_string.cpp +++ b/src/d/msg/d_msg_string.cpp @@ -6,6 +6,7 @@ #include "d/msg/d_msg_string.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "JSystem/JGeometry.h" // // Forward References: @@ -52,82 +53,50 @@ SECTION_DATA extern void* __vt__12dMsgString_c[8] = { }; /* 80249C20-80249CA0 244560 0080+00 0/0 15/15 0/0 .text __ct__12dMsgString_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgString_c::dMsgString_c() { - nofralloc -#include "asm/d/msg/d_msg_string/__ct__12dMsgString_cFv.s" +dMsgString_c::dMsgString_c() { + field_0x28 = 0; + mpOutFont = new COutFont_c(field_0x28); + mpOutFont->createPane(); + getResource(); } -#pragma pop /* 80249CA0-80249D28 2445E0 0088+00 0/0 1/1 0/0 .text __ct__12dMsgString_cFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgString_c::dMsgString_c(u8 param_0) { - nofralloc -#include "asm/d/msg/d_msg_string/__ct__12dMsgString_cFUc.s" +dMsgString_c::dMsgString_c(u8 param_0) { + field_0x28 = param_0; + mpOutFont = new COutFont_c(field_0x28); + mpOutFont->createPane(); + getResource(); } -#pragma pop /* 80249D28-80249DB4 244668 008C+00 0/0 17/17 0/0 .text __dt__12dMsgString_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm dMsgString_c::~dMsgString_c() { - nofralloc -#include "asm/d/msg/d_msg_string/__dt__12dMsgString_cFv.s" +dMsgString_c::~dMsgString_c() { + delete mpOutFont; + mpOutFont = NULL; } -#pragma pop /* 80249DB4-80249DE4 2446F4 0030+00 1/0 0/0 0/0 .text * resetStringLocal__12dMsgString_cFP10J2DTextBox */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgString_c::resetStringLocal(J2DTextBox* param_0) { - nofralloc -#include "asm/d/msg/d_msg_string/resetStringLocal__12dMsgString_cFP10J2DTextBox.s" +void dMsgString_c::resetStringLocal(J2DTextBox* p_textBox) { + mpOutFont->reset(p_textBox); } -#pragma pop - -/* ############################################################################################## */ -/* 80454D78-80454D7C 003378 0004+00 1/1 0/0 0/0 .sdata2 @3777 */ -SECTION_SDATA2 static f32 lit_3777 = 255.0f; - -/* 80454D7C-80454D80 00337C 0004+00 1/1 0/0 0/0 .sdata2 @3778 */ -SECTION_SDATA2 static f32 lit_3778 = -1.0f; - -/* 80454D80-80454D88 003380 0004+04 1/1 0/0 0/0 .sdata2 @3779 */ -SECTION_SDATA2 static f32 lit_3779[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; - -/* 80454D88-80454D90 003388 0008+00 1/1 0/0 0/0 .sdata2 @3781 */ -SECTION_SDATA2 static f64 lit_3781 = 4503599627370496.0 /* cast u32 to float */; /* 80249DE4-80249ED0 244724 00EC+00 1/0 0/0 0/0 .text * drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgString_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) { - nofralloc -#include "asm/d/msg/d_msg_string/drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf.s" +void dMsgString_c::drawOutFontLocal(J2DTextBox* p_textBox, f32 i_alpha) { + JGeometry::TVec3 pos = p_textBox->getGlbVtx(0); + f32 y = pos.y; + + if (i_alpha == -1.0f) { + i_alpha = p_textBox->getAlpha() / 255.0f; + } + + mpOutFont->setAlphaRatio(i_alpha); + mpOutFont->draw(p_textBox, pos.x, y, 1.0f); } -#pragma pop /* 80249ED0-80249F00 244810 0030+00 1/0 0/0 0/0 .text * drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dMsgString_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_2, f32 param_3, - f32 param_4, f32 param_5, u32 param_6, u8 param_7) { - nofralloc -#include "asm/d/msg/d_msg_string/drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc.s" +void dMsgString_c::drawFontLocal(J2DTextBox* p_textBox, u8 type, f32 posX, f32 posY, + f32 sizeX, f32 sizeY, u32 color, u8 alpha) { + mpOutFont->drawFont(p_textBox, type, posX, posY, sizeX, sizeY, color, alpha); } -#pragma pop diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp index b710c28ba8..7665b93d65 100644 --- a/src/d/ovlp/d_ovlp_fade2.cpp +++ b/src/d/ovlp/d_ovlp_fade2.cpp @@ -137,7 +137,7 @@ extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_clearColor[4]; extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; +extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4]; extern "C" u8 sManager__10JFWDisplay[4]; // diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index c16c6b5db5..17d05caae8 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -7,124 +7,11 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" - -// -// Types: -// - -struct JSUMemoryInputStream { - /* 802552B8 */ ~JSUMemoryInputStream(); - /* 802DC520 */ void setBuffer(void const*, s32); -}; - -struct JKRAramArchive {}; - -struct J2DOrthoGraph { - /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); -}; - -// -// Forward References: -// - -extern "C" void __ct__8CPaneMgrFv(); -extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void __dt__8CPaneMgrFv(); -extern "C" void setAlpha__8CPaneMgrFUc(); -extern "C" void reinit__8CPaneMgrFv(); -extern "C" void initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap(); -extern "C" void getBlack__9J2DWindowCFv(); -extern "C" void getWhite__9J2DWindowCFv(); -extern "C" void childPaneGetSize__8CPaneMgrFP7J2DPane(); -extern "C" void childPaneSetSize__8CPaneMgrFP7J2DPaneff(); -extern "C" void getGlobalPosX__8CPaneMgrFv(); -extern "C" void getGlobalPosY__8CPaneMgrFv(); -extern "C" void setWhite__9J2DWindowFQ28JUtility6TColor(); -extern "C" void setBlack__10J2DTextBoxFQ28JUtility6TColor(); -extern "C" void setBlack__9J2DWindowFQ28JUtility6TColor(); -extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor(); -extern "C" void paneTrans__8CPaneMgrFff(); -extern "C" void paneScale__8CPaneMgrFff(); -extern "C" void scaleAnime__8CPaneMgrFsffUc(); -extern "C" void -colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc(); -extern "C" void getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs(); -extern "C" void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(); -extern "C" void getBounds__8CPaneMgrFP7J2DPane(); -extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); -extern "C" void dPaneClass_showNullPane__FP7J2DPane(); -extern "C" void dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive(); -extern "C" void __dt__20JSUMemoryInputStreamFv(); -extern "C" void __dt__20JSURandomInputStreamFv(); -extern "C" void __dt__10JSUIosBaseFv(); -extern "C" void __sinit_d_pane_class_cpp(); - -// -// External References: -// - -extern "C" void mDoExt_getCurrentHeap__Fv(); -extern "C" void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc(); -extern "C" void __ct__13CPaneMgrAlphaFv(); -extern "C" void __dt__13CPaneMgrAlphaFv(); -extern "C" void rateCalc__13CPaneMgrAlphaFssUc(); -extern "C" void childPaneCount__13CPaneMgrAlphaFP7J2DPane(); -extern "C" void childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane(); -extern "C" void childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void __dl__FPv(); -extern "C" void __dt__14JSUInputStreamFv(); -extern "C" void setBuffer__20JSUMemoryInputStreamFPCvl(); -extern "C" void __ct__13J2DOrthoGraphFffffff(); -extern "C" void func_802E980C(); -extern "C" void getBounds__7J2DPaneFv(); -extern "C" void rotate__7J2DPaneFff13J2DRotateAxisf(); -extern "C" void getFirstChildPane__7J2DPaneFv(); -extern "C" void getNextChildPane__7J2DPaneFv(); -extern "C" void getParentPane__7J2DPaneFv(); -extern "C" void setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive(); -extern "C" void _savegpr_24(); -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_24(); -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(); -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; -extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C2DF8-803C2E04 01FF18 000C+00 2/2 4/4 0/0 .data __vt__10JSUIosBase */ -SECTION_DATA extern void* __vt__10JSUIosBase[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10JSUIosBaseFv, -}; - -/* 803C2E04-803C2E18 01FF24 0010+04 3/3 0/0 0/0 .data __vt__8CPaneMgr */ -SECTION_DATA extern void* __vt__8CPaneMgr[4 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8CPaneMgrFv, - (void*)setAlpha__8CPaneMgrFUc, - /* padding */ - NULL, -}; +#include "m_Do/m_Do_graphic.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/J2DGraph/J2DPicture.h" +#include "JSystem/JSupport/JSUMemoryStream.h" +#include "d/d_lib.h" /* 80253930-80253984 24E270 0054+00 0/0 11/11 0/0 .text __ct__8CPaneMgrFv */ CPaneMgr::CPaneMgr() { @@ -134,10 +21,10 @@ CPaneMgr::CPaneMgr() { /* 80253984-80253A18 24E2C4 0094+00 0/0 58/58 2/2 .text * __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap */ -CPaneMgr::CPaneMgr(J2DScreen* pScrn, u64 tag, u8 flags, JKRExpHeap* pHeap) { - J2DPane* pane = pScrn->search(tag); +CPaneMgr::CPaneMgr(J2DScreen* p_scrn, u64 tag, u8 flags, JKRExpHeap* p_heap) { + J2DPane* pane = p_scrn->search(tag); mFlags = flags; - initiate(pane, pHeap); + initiate(pane, p_heap); } /* 80253A18-80253AB4 24E358 009C+00 1/0 11/11 0/0 .text __dt__8CPaneMgrFv */ @@ -155,9 +42,10 @@ CPaneMgr::~CPaneMgr() { /* 80253AB4-80253B2C 24E3F4 0078+00 1/0 0/0 0/0 .text setAlpha__8CPaneMgrFUc */ void CPaneMgr::setAlpha(u8 alpha) { if (mFlags & 2) { - field_0x10 = mpFirstStackAlpha; + field_0x10 = (u8*)mpFirstStackAlpha; childPaneSetAlpha(getPanePtr()->getFirstChildPane(), alpha); } + getPanePtr()->setAlpha(alpha); } @@ -185,12 +73,11 @@ void CPaneMgr::reinit() { /* 80253C08-80254000 24E548 03F8+00 1/1 0/0 0/0 .text initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap */ -// switch issues -#ifdef NONMATCHING -void CPaneMgr::initiate(J2DPane* pPane, JKRExpHeap* pHeap) { - (J2DPane*)mWindow = pPane; - if (pHeap) { - heap = pHeap; +void CPaneMgr::initiate(J2DPane* p_pane, JKRExpHeap* p_heap) { + mPane = p_pane; + + if (p_heap) { + heap = p_heap; } else { heap = (JKRExpHeap*)mDoExt_getCurrentHeap(); } @@ -205,24 +92,24 @@ void CPaneMgr::initiate(J2DPane* pPane, JKRExpHeap* pHeap) { childPaneCount(getPanePtr()->getFirstChildPane()); if (mFlags & 1) { mpFirstStackSize = heap->alloc(mChildPaneCount * 12, 0x20); - field_0x20 = mpFirstStackSize; + field_0x20 = (s16*)mpFirstStackSize; childPaneGetSize(getPanePtr()->getFirstChildPane()); } if (mFlags & 2) { mpFirstStackAlpha = heap->alloc(mChildPaneCount, 0x20); - field_0x10 = mpFirstStackAlpha; - childPaneGetSize(getPanePtr()->getFirstChildPane()); + field_0x10 = (u8*)mpFirstStackAlpha; + childPaneGetAlpha(getPanePtr()->getFirstChildPane()); } } - mInitPos.x = pPane->getBounds().i.x; - mInitPos.y = pPane->getBounds().i.y; + mInitPos.x = p_pane->getBounds().i.x; + mInitPos.y = p_pane->getBounds().i.y; mGlobalPos.x = getGlobalPosX(); mGlobalPos.y = getGlobalPosY(); - mInitSize.x = pPane->getWidth(); - mInitSize.y = pPane->getHeight(); + mInitSize.x = p_pane->getWidth(); + mInitSize.y = p_pane->getHeight(); mInitScale.x = getPanePtr()->getScaleX(); mInitScale.y = getPanePtr()->getScaleY(); @@ -230,15 +117,16 @@ void CPaneMgr::initiate(J2DPane* pPane, JKRExpHeap* pHeap) { mInitTrans.x = getPanePtr()->getTranslateX(); mInitTrans.y = getPanePtr()->getTranslateY(); - mRotateZ = pPane->getRotateZ(); - mRotateOffset.x = pPane->getRotOffsetX(); - mRotateOffset.y = pPane->getRotOffsetY(); + mRotateZ = p_pane->getRotateZ(); + mRotateOffset.x = p_pane->getRotOffsetX(); + mRotateOffset.y = p_pane->getRotOffsetY(); - if (pPane->getKind() == 'PAN2') { + if (p_pane->getKind() == 'PAN2') { mInitAlpha = 255; } else { - mInitAlpha = pPane->getAlpha(); + mInitAlpha = p_pane->getAlpha(); } + field_0x60 = 0; field_0x62 = 0; mScaleAnime = 0; @@ -248,44 +136,25 @@ void CPaneMgr::initiate(J2DPane* pPane, JKRExpHeap* pHeap) { mAlphaTimer = 0; switch (getPanePtr()->getKind()) { - case 'TBX3': - case 'TBX4': - case 'WIN3': - JUtility::TColor white = mWindow->getWhite(); - mInitWhite.set(white.r, white.g, white.b, white.a); - - JUtility::TColor black = mWindow->getBlack(); - mInitBlack.set(black.r, black.g, black.b, black.a); - break; + case 'WIN1': + case 'WIN2': + mInitWhite.set(((J2DWindow*)mPane)->getWhite()); + mInitBlack.set(((J2DWindow*)mPane)->getBlack()); + return; case 'PIC1': case 'PIC2': - JUtility::TColor white2 = mWindow->getWhite(); - mInitWhite.set(white2.r, white2.g, white2.b, white2.a); - - JUtility::TColor black2 = mWindow->getBlack(); - mInitBlack.set(black2.r, black2.g, black2.b, black2.a); - break; - case 'WIN1': - JUtility::TColor white3 = mWindow->getWhite(); - mInitWhite.set(white3.r, white3.g, white3.b, white3.a); - - JUtility::TColor black3 = mWindow->getBlack(); - mInitBlack.set(black3.r, black3.g, black3.b, black3.a); - break; + mInitWhite.set(((J2DPicture*)mPane)->getWhite()); + mInitBlack.set(((J2DPicture*)mPane)->getBlack()); + return; + case 'TBX1': + case 'TBX2': + mInitWhite.set(((J2DTextBox*)mPane)->getWhite()); + mInitBlack.set(((J2DTextBox*)mPane)->getBlack()); + return; } mInitWhite.set(255, 255, 255, 255); mInitBlack.set(0, 0, 0, 0); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::initiate(J2DPane* param_0, JKRExpHeap* param_1) { - nofralloc -#include "asm/d/pane/d_pane_class/initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap.s" -} -#pragma pop -#endif /* 80254000-8025400C 24E940 000C+00 0/0 1/0 0/0 .text getBlack__9J2DWindowCFv */ JUtility::TColor J2DWindow::getBlack() const { @@ -298,41 +167,43 @@ JUtility::TColor J2DWindow::getWhite() const { } /* 80254018-80254134 24E958 011C+00 1/1 0/0 0/0 .text childPaneGetSize__8CPaneMgrFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::childPaneGetSize(J2DPane* param_0) { - nofralloc -#include "asm/d/pane/d_pane_class/childPaneGetSize__8CPaneMgrFP7J2DPane.s" +void CPaneMgr::childPaneGetSize(J2DPane* p_pane) { + if (p_pane != NULL) { + field_0x20[0] = p_pane->getBounds().i.x; + field_0x20[1] = p_pane->getBounds().i.y; + field_0x20[2] = p_pane->getWidth(); + field_0x20[3] = p_pane->getHeight(); + field_0x20[4] = p_pane->getRotOffsetX(); + field_0x20[5] = p_pane->getRotOffsetY(); + field_0x20 += 6; + + childPaneGetSize(p_pane->getFirstChildPane()); + childPaneGetSize(p_pane->getNextChildPane()); + } } -#pragma pop - -/* ############################################################################################## */ -/* 80454E88-80454E90 003488 0004+04 4/4 0/0 0/0 .sdata2 @3858 */ -SECTION_SDATA2 static f32 lit_3858[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; - -/* 80454E90-80454E98 003490 0008+00 2/2 0/0 0/0 .sdata2 @3860 */ -SECTION_SDATA2 static f64 lit_3860 = 4503601774854144.0 /* cast s32 to float */; /* 80254134-802542E8 24EA74 01B4+00 1/1 0/0 0/0 .text childPaneSetSize__8CPaneMgrFP7J2DPaneff */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::childPaneSetSize(J2DPane* param_0, f32 param_1, f32 param_2) { - nofralloc -#include "asm/d/pane/d_pane_class/childPaneSetSize__8CPaneMgrFP7J2DPaneff.s" +void CPaneMgr::childPaneSetSize(J2DPane* p_pane, f32 param_1, f32 param_2) { + if (p_pane != NULL) { + p_pane->move(field_0x20[0] * param_1, field_0x20[1] * param_2); + p_pane->resize(field_0x20[2] * param_1, field_0x20[3] * param_2); + + if (p_pane->getRotateZ() != 0.0f) { + p_pane->rotate(field_0x20[4] * param_1, field_0x20[5] * param_2, ROTATE_Z, p_pane->getRotateZ()); + } + + field_0x20 += 6; + + childPaneSetSize(p_pane->getFirstChildPane(), param_1, param_2); + childPaneSetSize(p_pane->getNextChildPane(), param_1, param_2); + } } -#pragma pop /* 802542E8-80254364 24EC28 007C+00 2/2 18/18 0/0 .text getGlobalPosX__8CPaneMgrFv */ f32 CPaneMgr::getGlobalPosX() { f32 posX = getPosX(); for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL; - pane = pane->getParentPane()) { + pane = pane->getParentPane()) { posX += pane->getBounds().i.x; } return posX; @@ -342,7 +213,7 @@ f32 CPaneMgr::getGlobalPosX() { f32 CPaneMgr::getGlobalPosY() { f32 posY = getPosY(); for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL; - pane = pane->getParentPane()) { + pane = pane->getParentPane()) { posY += pane->getBounds().i.y; } return posY; @@ -368,14 +239,22 @@ bool J2DWindow::setBlack(JUtility::TColor black) { /* 80254458-80254568 24ED98 0110+00 1/1 7/7 0/0 .text * setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) { - nofralloc -#include "asm/d/pane/d_pane_class/setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor.s" +void CPaneMgr::setBlackWhite(JUtility::TColor black, JUtility::TColor white) { + switch (mPane->getKind()) { + case 'WIN1': + case 'WIN2': + ((J2DWindow*)mPane)->setBlackWhite(black, white); + break; + case 'PIC1': + case 'PIC2': + ((J2DPicture*)mPane)->setBlackWhite(black, white); + break; + case 'TBX1': + case 'TBX2': + ((J2DTextBox*)mPane)->setBlackWhite(black, white); + break; + } } -#pragma pop /* 80254568-802545B0 24EEA8 0048+00 0/0 1/0 0/0 .text * setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor */ @@ -385,62 +264,33 @@ bool J2DWindow::setBlackWhite(JUtility::TColor black, JUtility::TColor white) { return true; } -/* ############################################################################################## */ -/* 80454E98-80454EA0 003498 0004+04 3/3 0/0 0/0 .sdata2 @4046 */ -SECTION_SDATA2 static f32 lit_4046[1 + 1 /* padding */] = { - 0.5f, - /* padding */ - 0.0f, -}; - /* 802545B0-80254638 24EEF0 0088+00 0/0 51/51 3/3 .text paneTrans__8CPaneMgrFff */ -// matches with literals -#ifdef NONMATCHING void CPaneMgr::paneTrans(f32 x, f32 y) { f32 moveX = x + getInitCenterPosX() - getSizeX() * 0.5f; f32 moveY = y + getInitCenterPosY() - getSizeY() * 0.5f; getPanePtr()->move(moveX, moveY); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::paneTrans(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/pane/d_pane_class/paneTrans__8CPaneMgrFff.s" -} -#pragma pop -#endif /* 80254638-802547CC 24EF78 0194+00 0/0 5/5 0/0 .text paneScale__8CPaneMgrFff */ -// swapped float reg -#ifdef NONMATCHING void CPaneMgr::paneScale(f32 x, f32 y) { f32 moveX = getPosX() + getSizeX() * 0.5f; f32 moveY = getPosY() + getSizeY() * 0.5f; getPanePtr()->resize(mInitSize.x * x, mInitSize.y * y); - getPanePtr()->move(moveX - getSizeY() * 0.5f, moveY - getSizeX() * 0.5f); + + f32 moveX2 = moveX - getSizeX() * 0.5f; + f32 moveY2 = moveY - getSizeY() * 0.5f; + getPanePtr()->move(moveX2, moveY2); if (mRotateZ != 0.0f) { getPanePtr()->rotate(mRotateOffset.x * x, mRotateOffset.y * y, ROTATE_Z, getRotateZ()); } if (mFlags & 1) { - field_0x20 = mpFirstStackSize; + field_0x20 = (s16*)mpFirstStackSize; childPaneSetSize(getPanePtr()->getFirstChildPane(), x, y); } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::paneScale(f32 param_0, f32 param_1) { - nofralloc -#include "asm/d/pane/d_pane_class/paneScale__8CPaneMgrFff.s" -} -#pragma pop -#endif /* 802547CC-802548BC 24F10C 00F0+00 0/0 10/10 0/0 .text scaleAnime__8CPaneMgrFsffUc */ bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) { @@ -457,148 +307,197 @@ bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) { return false; } -/* ############################################################################################## */ -/* 80454EA0-80454EA8 0034A0 0008+00 1/1 0/0 0/0 .sdata2 @4349 */ -SECTION_SDATA2 static f64 lit_4349 = 4503599627370496.0 /* cast u32 to float */; - /* 802548BC-80254C90 24F1FC 03D4+00 0/0 4/4 0/0 .text * colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::colorAnime(s16 param_0, JUtility::TColor param_1, JUtility::TColor param_2, - JUtility::TColor param_3, JUtility::TColor param_4, u8 param_5) { - nofralloc -#include "asm/d/pane/d_pane_class/func_802548BC.s" +bool CPaneMgr::colorAnime(s16 anmTimer, JUtility::TColor startBlack, JUtility::TColor endBlack, + JUtility::TColor startWhite, JUtility::TColor endWhite, u8 calcType) { + if (mColorAnime < anmTimer - 1) { + mColorAnime++; + f32 rate = rateCalc(anmTimer, mColorAnime, calcType); + + JUtility::TColor black; + JUtility::TColor white; + + if (startBlack.r != endBlack.r) { + black.r = startBlack.r + rate * (endBlack.r - startBlack.r); + } else { + black.r = endBlack.r; + } + + if (startBlack.g != endBlack.g) { + black.g = startBlack.g + rate * (endBlack.g - startBlack.g); + } else { + black.g = endBlack.g; + } + + if (startBlack.b != endBlack.b) { + black.b = startBlack.b + rate * (endBlack.b - startBlack.b); + } else { + black.b = endBlack.b; + } + + if (startBlack.a != endBlack.a) { + black.a = startBlack.a + rate * (endBlack.a - startBlack.a); + } else { + black.a = endBlack.a; + } + + + if (startWhite.r != endWhite.r) { + white.r = startWhite.r + rate * (endWhite.r - startWhite.r); + } else { + white.r = endWhite.r; + } + + if (startWhite.g != endWhite.g) { + white.g = startWhite.g + rate * (endWhite.g - startWhite.g); + } else { + white.g = endWhite.g; + } + + if (startWhite.b != endWhite.b) { + white.b = startWhite.b + rate * (endWhite.b - startWhite.b); + } else { + white.b = endWhite.b; + } + + if (startWhite.a != endWhite.a) { + white.a = startWhite.a + rate * (endWhite.a - startWhite.a); + } else { + white.a = endWhite.a; + } + + setBlackWhite(black, white); + } else { + mColorAnime = anmTimer; + setBlackWhite(endBlack, endWhite); + return true; + } + + return false; } -#pragma pop - -/* ############################################################################################## */ -/* 80454EA8-80454EAC 0034A8 0004+00 1/1 0/0 0/0 .sdata2 @4473 */ -SECTION_SDATA2 static f32 lit_4473 = 608.0f; - -/* 80454EAC-80454EB0 0034AC 0004+00 1/1 0/0 0/0 .sdata2 @4474 */ -SECTION_SDATA2 static f32 lit_4474 = 448.0f; - -/* 80454EB0-80454EB4 0034B0 0004+00 1/1 0/0 0/0 .sdata2 @4475 */ -SECTION_SDATA2 static f32 lit_4475 = -1.0f; - -/* 80454EB4-80454EB8 0034B4 0004+00 1/1 0/0 0/0 .sdata2 @4476 */ -SECTION_SDATA2 static f32 lit_4476 = 1.0f; /* 80254C90-80254EBC 24F5D0 022C+00 1/1 9/9 0/0 .text * getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::getGlobalVtx(J2DPane* param_0, f32 (*param_1)[3][4], u8 param_2, bool param_3, +Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param_3, s16 param_4) { - nofralloc -#include "asm/d/pane/d_pane_class/getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs.s" -} -#pragma pop + Mtx m; + MtxP mp = (MtxP)param_1; + J2DPane* parent = p_pane->getParentPane(); + + J2DOrthoGraph ortho(0.0f, 0.0f, 608.0f, 448.0f, -1.0f, 1.0f); + ortho.setOrtho(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), -1.0f, 1.0f); -/* 80254EBC-80254FB8 24F7FC 00FC+00 0/0 56/56 1/1 .text getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm Vec CPaneMgr::getGlobalVtxCenter(J2DPane* param_0, bool param_1, s16 param_2) { - nofralloc -#include "asm/d/pane/d_pane_class/getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs.s" + if (parent != NULL) { + getGlobalVtx(parent, param_1, param_2, param_3, param_4); + PSMTXCopy(*param_1, m); + PSMTXConcat(m, *p_pane->getMtx(), *param_1); + } else { + p_pane->calcMtx(); + PSMTXCopy(*p_pane->getMtx(), *param_1); + } + + Vec outVec; + if (param_2 >= 4) { + outVec.x = 0.0f; + outVec.y = 0.0f; + outVec.z = 0.0f; + + return outVec; + } else { + JGeometry::TBox2 bounds = *getBounds(p_pane); + f32 x2 = (param_2 & 1) ? bounds.f.x : bounds.i.x; + f32 y2 = (param_2 & 2) ? bounds.f.y : bounds.i.y; + + outVec.x = mp[0][3] + (x2 * mp[0][0] + (y2 * mp[0][1])); + outVec.y = mp[1][3] + (x2 * mp[1][0] + (y2 * mp[1][1])); + outVec.z = mp[2][3] + (x2 * mp[2][0] + (y2 * mp[2][1])); + + return outVec; + } +} + +/* 80254EBC-80254FB8 24F7FC 00FC+00 0/0 56/56 1/1 .text tCenter__8CPaneMgrFP7J2DPanebs + */ +Vec CPaneMgr::getGlobalVtxCenter(J2DPane* p_pane, bool param_1, s16) { + Mtx m; + Vec vtxCenter; + Vec v1 = getGlobalVtx(p_pane, &m, 0, param_1, 0); + Vec v2 = getGlobalVtx(p_pane, &m, 3, param_1, 0); + + vtxCenter.x = (v1.x + v2.x) * 0.5f; + vtxCenter.y = (v1.y + v2.y) * 0.5f; + vtxCenter.z = (v1.z + v2.z) * 0.5f; + + return vtxCenter; } -#pragma pop /* ############################################################################################## */ /* 80430748-80430758 05D468 0010+00 2/2 0/0 0/0 .bss static_mBounds */ -static f32 static_mBounds[4]; +static JGeometry::TBox2 static_mBounds(0.0f, 0.0f, 0.0f, 0.0f); /* 80254FB8-802550E8 24F8F8 0130+00 1/1 0/0 0/0 .text getBounds__8CPaneMgrFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgr::getBounds(J2DPane* param_0) { - nofralloc -#include "asm/d/pane/d_pane_class/getBounds__8CPaneMgrFP7J2DPane.s" +JGeometry::TBox2* CPaneMgr::getBounds(J2DPane* p_pane) { + JGeometry::TBox2 bounds(p_pane->getBounds()); + + J2DPane* parent = p_pane->getParentPane(); + if (parent != NULL) { + JGeometry::TBox2* parentBounds = getBounds(parent); + f32 y = parentBounds->i.y; + + JGeometry::TBox2* parentBounds2 = getBounds(parent); + + bounds.addPos(JGeometry::TVec2(parentBounds2->i.x, y)); + } + + f32 transX = -p_pane->getTranslateX(); + f32 transY = -p_pane->getTranslateY(); + bounds.addPos(JGeometry::TVec2(transX, transY)); + + static_mBounds = bounds; + return &static_mBounds; } -#pragma pop /* 802550E8-8025512C 24FA28 0044+00 0/0 54/54 3/3 .text dPaneClass_showNullPane__FP9J2DScreen */ -void dPaneClass_showNullPane(J2DScreen* pScrn) { - if (pScrn) { - dPaneClass_showNullPane(pScrn->search('ROOT')); +void dPaneClass_showNullPane(J2DScreen* p_scrn) { + if (p_scrn) { + dPaneClass_showNullPane(p_scrn->search('ROOT')); } } /* 8025512C-80255184 24FA6C 0058+00 1/1 0/0 0/0 .text dPaneClass_showNullPane__FP7J2DPane */ -void dPaneClass_showNullPane(J2DPane* pPane) { - if (pPane) { - if (!pPane->isVisible()) { - pPane->show(); +void dPaneClass_showNullPane(J2DPane* p_pane) { + if (p_pane) { + if (!p_pane->isVisible()) { + p_pane->show(); } - dPaneClass_showNullPane(pPane->getFirstChildPane()); - dPaneClass_showNullPane(pPane->getNextChildPane()); + dPaneClass_showNullPane(p_pane->getFirstChildPane()); + dPaneClass_showNullPane(p_pane->getNextChildPane()); } } /* 80255184-802552B8 24FAC4 0134+00 0/0 1/1 0/0 .text * dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void dPaneClass_setPriority(void** param_0, JKRHeap* param_1, J2DScreen* param_2, - char const* param_3, u32 param_4, JKRArchive* param_5) { - nofralloc -#include "asm/d/pane/d_pane_class/dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive.s" -} -#pragma pop +bool dPaneClass_setPriority(void** i_data, JKRHeap* p_heap, J2DScreen* p_screen, + char const* resName, u32 param_4, JKRArchive* p_archive) { + if (p_archive == NULL) { + return false; + } -/* 802552B8-80255328 24FBF8 0070+00 0/0 1/0 0/0 .text __dt__20JSUMemoryInputStreamFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm JSUMemoryInputStream::~JSUMemoryInputStream() { -extern "C" asm void __dt__20JSUMemoryInputStreamFv() { - nofralloc -#include "asm/d/pane/d_pane_class/__dt__20JSUMemoryInputStreamFv.s" -} -#pragma pop + u32 size = dLib_getExpandSizeFromAramArchive((JKRAramArchive*)p_archive, resName); + if (size == 0) { + return false; + } -/* 80255328-80255388 24FC68 0060+00 0/0 1/0 0/0 .text __dt__20JSURandomInputStreamFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm JSURandomInputStream::~JSURandomInputStream() { -extern "C" asm void __dt__20JSURandomInputStreamFv() { - nofralloc -#include "asm/d/pane/d_pane_class/__dt__20JSURandomInputStreamFv.s" -} -#pragma pop + *i_data = p_heap->alloc(size, 0x20); + u32 len = p_archive->readResource(*i_data, size, resName); -/* 80255388-802553D0 24FCC8 0048+00 1/0 0/0 0/0 .text __dt__10JSUIosBaseFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -// asm JSUIosBase::~JSUIosBase() { -extern "C" asm void __dt__10JSUIosBaseFv() { - nofralloc -#include "asm/d/pane/d_pane_class/__dt__10JSUIosBaseFv.s" -} -#pragma pop + if (len != 0) { + JSUMemoryInputStream stream(*i_data, len); + return p_screen->setPriority(&stream, param_4, p_archive); + } -/* 802553D0-802553EC 24FD10 001C+00 0/0 1/0 0/0 .text __sinit_d_pane_class_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_d_pane_class_cpp() { - nofralloc -#include "asm/d/pane/d_pane_class/__sinit_d_pane_class_cpp.s" + return false; } -#pragma pop - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x802553D0, __sinit_d_pane_class_cpp); -#pragma pop diff --git a/src/d/pane/d_pane_class_alpha.cpp b/src/d/pane/d_pane_class_alpha.cpp index 2680ad9673..a32ac807d1 100644 --- a/src/d/pane/d_pane_class_alpha.cpp +++ b/src/d/pane/d_pane_class_alpha.cpp @@ -6,330 +6,300 @@ #include "d/pane/d_pane_class_alpha.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void __ct__13CPaneMgrAlphaFv(); -extern "C" void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void __dt__13CPaneMgrAlphaFv(); -extern "C" void initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap(); -extern "C" void show__13CPaneMgrAlphaFv(); -extern "C" void hide__13CPaneMgrAlphaFv(); -extern "C" void isVisible__13CPaneMgrAlphaFv(); -extern "C" void rateCalc__13CPaneMgrAlphaFssUc(); -extern "C" void setAlpha__13CPaneMgrAlphaFUc(); -extern "C" void setAlphaRate__13CPaneMgrAlphaFf(); -extern "C" void getAlphaRate__13CPaneMgrAlphaFv(); -extern "C" void alphaAnime__13CPaneMgrAlphaFsUcUcUc(); -extern "C" void alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc(); -extern "C" void childPaneCount__13CPaneMgrAlphaFP7J2DPane(); -extern "C" void childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane(); -extern "C" void childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc(); -extern "C" void __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap(); -extern "C" void __dt__17CPaneMgrAlphaMorfFv(); -extern "C" void initiateAlphaMorf__17CPaneMgrAlphaMorfFv(); -extern "C" void setBackupAlpha__17CPaneMgrAlphaMorfFv(); -extern "C" void setAlphaMorfRate__17CPaneMgrAlphaMorfFf(); -extern "C" void childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane(); -extern "C" void childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef(); - -// -// External References: -// - -extern "C" void mDoExt_getCurrentHeap__Fv(); -extern "C" void alloc__7JKRHeapFUli(); -extern "C" void free__7JKRHeapFPv(); -extern "C" void __dl__FPv(); -extern "C" void getFirstChildPane__7J2DPaneFv(); -extern "C" void getNextChildPane__7J2DPaneFv(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C2E18-803C2E28 01FF38 0010+00 2/2 0/0 0/0 .data __vt__17CPaneMgrAlphaMorf */ -SECTION_DATA extern void* __vt__17CPaneMgrAlphaMorf[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17CPaneMgrAlphaMorfFv, - (void*)setAlpha__13CPaneMgrAlphaFUc, -}; - -/* 803C2E28-803C2E38 01FF48 0010+00 3/3 0/0 0/0 .data __vt__13CPaneMgrAlpha */ -SECTION_DATA extern void* __vt__13CPaneMgrAlpha[4] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__13CPaneMgrAlphaFv, - (void*)setAlpha__13CPaneMgrAlphaFUc, -}; +#include "m_Do/m_Do_ext.h" /* 802553EC-802553FC 24FD2C 0010+00 0/0 2/2 0/0 .text __ct__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm CPaneMgrAlpha::CPaneMgrAlpha() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFv.s" -} -#pragma pop +CPaneMgrAlpha::CPaneMgrAlpha() {} /* 802553FC-8025546C 24FD3C 0070+00 1/1 9/9 1/1 .text * __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm CPaneMgrAlpha::CPaneMgrAlpha(J2DScreen* param_0, u64 param_1, u8 param_2, JKRExpHeap* param_3) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap.s" +CPaneMgrAlpha::CPaneMgrAlpha(J2DScreen* p_screen, u64 tag, u8 flags, JKRExpHeap* p_heap) { + J2DPane* pane = p_screen->search(tag); + mFlags = flags; + initiateAlpha(pane, p_heap); } -#pragma pop /* 8025546C-802554E0 24FDAC 0074+00 2/1 1/1 0/0 .text __dt__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm CPaneMgrAlpha::~CPaneMgrAlpha() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/__dt__13CPaneMgrAlphaFv.s" +CPaneMgrAlpha::~CPaneMgrAlpha() { + if (mpFirstStackAlpha != NULL) { + heap->free(mpFirstStackAlpha); + mpFirstStackAlpha = NULL; + } } -#pragma pop /* 802554E0-802555C8 24FE20 00E8+00 1/1 0/0 0/0 .text * initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::initiateAlpha(J2DPane* param_0, JKRExpHeap* param_1) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap.s" +void CPaneMgrAlpha::initiateAlpha(J2DPane* p_pane, JKRExpHeap* p_heap) { + mPane = p_pane; + + if (p_heap != NULL) { + heap = p_heap; + } else { + heap = (JKRExpHeap*)mDoExt_getCurrentHeap(); + } + + mpFirstStackAlpha = NULL; + field_0x10 = NULL; + mChildPaneCount = 0; + + if (mFlags != 0) { + childPaneCount(mPane->getFirstChildPane()); + + if (mFlags & 2) { + mpFirstStackAlpha = heap->alloc(mChildPaneCount, 0x20); + field_0x10 = (u8*)mpFirstStackAlpha; + childPaneGetAlpha(mPane->getFirstChildPane()); + } + } + + if (p_pane->getKind() == 'PAN2') { + mInitAlpha = 255; + } else { + mInitAlpha = p_pane->getAlpha(); + } + + mAlphaTimer = 0; } -#pragma pop /* 802555C8-80255608 24FF08 0040+00 0/0 40/40 2/2 .text show__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::show() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/show__13CPaneMgrAlphaFv.s" +void CPaneMgrAlpha::show() { + if (!isVisible()) { + mPane->show(); + } } -#pragma pop /* 80255608-8025564C 24FF48 0044+00 0/0 46/46 2/2 .text hide__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::hide() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/hide__13CPaneMgrAlphaFv.s" +void CPaneMgrAlpha::hide() { + if (isVisible() == true) { + mPane->hide(); + } } -#pragma pop /* 8025564C-80255658 24FF8C 000C+00 2/2 12/12 0/0 .text isVisible__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::isVisible() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/isVisible__13CPaneMgrAlphaFv.s" +bool CPaneMgrAlpha::isVisible() { + return mPane->isVisible(); } -#pragma pop - -/* ############################################################################################## */ -/* 80454EB8-80454EC0 0034B8 0004+04 1/1 0/0 0/0 .sdata2 @3692 */ -SECTION_SDATA2 static f32 lit_3692[1 + 1 /* padding */] = { - 1.0f, - /* padding */ - 0.0f, -}; - -/* 80454EC0-80454EC8 0034C0 0008+00 3/3 0/0 0/0 .sdata2 @3694 */ -SECTION_SDATA2 static f64 lit_3694 = 4503601774854144.0 /* cast s32 to float */; /* 80255658-80255758 24FF98 0100+00 2/2 2/2 0/0 .text rateCalc__13CPaneMgrAlphaFssUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 CPaneMgrAlpha::rateCalc(s16 param_0, s16 param_1, u8 param_2) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/rateCalc__13CPaneMgrAlphaFssUc.s" +f32 CPaneMgrAlpha::rateCalc(s16 maxTimer, s16 curTimer, u8 calcType) { + if (maxTimer <= curTimer) { + return 1.0f; + } + + switch (calcType) { + case 1: + return (f32)(curTimer * curTimer) / (f32)(maxTimer * maxTimer); + case 2: + return (f32)((maxTimer - curTimer) * (maxTimer - curTimer)) / (f32)(maxTimer * maxTimer); + default: + return (f32)curTimer / (f32)maxTimer; + } } -#pragma pop /* 80255758-802557D0 250098 0078+00 2/0 0/0 0/0 .text setAlpha__13CPaneMgrAlphaFUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::setAlpha(u8 param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/setAlpha__13CPaneMgrAlphaFUc.s" +void CPaneMgrAlpha::setAlpha(u8 alpha) { + if (mFlags & 2) { + field_0x10 = (u8*)mpFirstStackAlpha; + childPaneSetAlpha(mPane->getFirstChildPane(), alpha); + } + mPane->setAlpha(alpha); } -#pragma pop - -/* ############################################################################################## */ -/* 80454EC8-80454ED0 0034C8 0008+00 6/6 0/0 0/0 .sdata2 @3708 */ -SECTION_SDATA2 static f64 lit_3708 = 4503599627370496.0 /* cast u32 to float */; /* 802557D0-80255828 250110 0058+00 1/1 173/173 5/5 .text setAlphaRate__13CPaneMgrAlphaFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::setAlphaRate(f32 param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/setAlphaRate__13CPaneMgrAlphaFf.s" +void CPaneMgrAlpha::setAlphaRate(f32 rate) { + setAlpha(mInitAlpha * rate); } -#pragma pop - -/* ############################################################################################## */ -/* 80454ED0-80454ED8 0034D0 0004+04 2/2 0/0 0/0 .sdata2 @3721 */ -SECTION_SDATA2 static f32 lit_3721[1 + 1 /* padding */] = { - 0.0f, - /* padding */ - 0.0f, -}; /* 80255828-80255878 250168 0050+00 0/0 107/107 2/2 .text getAlphaRate__13CPaneMgrAlphaFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm f32 CPaneMgrAlpha::getAlphaRate() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/getAlphaRate__13CPaneMgrAlphaFv.s" +f32 CPaneMgrAlpha::getAlphaRate() { + f32 rate = 0.0f; + + if (mInitAlpha != 0) { + rate = getAlpha() / (f32)mInitAlpha; + } + + return rate; } -#pragma pop /* 80255878-80255964 2501B8 00EC+00 0/0 31/31 1/1 .text alphaAnime__13CPaneMgrAlphaFsUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::alphaAnime(s16 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/alphaAnime__13CPaneMgrAlphaFsUcUcUc.s" +bool CPaneMgrAlpha::alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType) { + if (mAlphaTimer < timer - 1) { + mAlphaTimer++; + f32 rate = rateCalc(timer, mAlphaTimer, calcType); + setAlpha(startAlpha + rate * (f32)(endAlpha - startAlpha)); + } else { + mAlphaTimer = timer; + setAlpha(endAlpha); + return true; + } + + return false; } -#pragma pop /* 80255964-80255A60 2502A4 00FC+00 0/0 0/0 1/1 .text alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::alphaAnimeLoop(s16 param_0, u8 param_1, u8 param_2, u8 param_3) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc.s" +bool CPaneMgrAlpha::alphaAnimeLoop(s16 param_0, u8 param_1, u8 param_2, u8 param_3) { + bool ret = false; + s16 temp_r4 = param_0 / 2; + + mAlphaTimer++; + + if (mAlphaTimer >= param_0) { + mAlphaTimer = 0; + ret = true; + } + + s16 tmp; + if (mAlphaTimer < temp_r4) { + tmp = mAlphaTimer; + } else { + tmp = param_0 - mAlphaTimer; + } + + f32 rate = rateCalc(temp_r4, tmp, param_3); + setAlpha(param_1 + rate * (f32)(param_2 - param_1)); + + return ret; } -#pragma pop /* 80255A60-80255ACC 2503A0 006C+00 1/1 1/1 0/0 .text childPaneCount__13CPaneMgrAlphaFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::childPaneCount(J2DPane* param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/childPaneCount__13CPaneMgrAlphaFP7J2DPane.s" +void CPaneMgrAlpha::childPaneCount(J2DPane* p_pane) { + if (p_pane != NULL) { + mChildPaneCount++; + childPaneCount(p_pane->getFirstChildPane()); + childPaneCount(p_pane->getNextChildPane()); + } } -#pragma pop /* 80255ACC-80255B5C 25040C 0090+00 1/1 1/1 0/0 .text childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::childPaneGetAlpha(J2DPane* param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane.s" +void CPaneMgrAlpha::childPaneGetAlpha(J2DPane* p_pane) { + if (p_pane != NULL) { + u8 alpha; + if (p_pane->getKind() == 'PAN2') { + alpha = 255; + } else { + alpha = p_pane->getAlpha(); + } + + *field_0x10 = alpha; + field_0x10++; + childPaneGetAlpha(p_pane->getFirstChildPane()); + childPaneGetAlpha(p_pane->getNextChildPane()); + } } -#pragma pop /* 80255B5C-80255C68 25049C 010C+00 1/1 1/1 0/0 .text * childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlpha::childPaneSetAlpha(J2DPane* param_0, u8 param_1) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc.s" +void CPaneMgrAlpha::childPaneSetAlpha(J2DPane* p_pane, u8 alpha) { + if (p_pane != NULL) { + if (!p_pane->mIsInfluencedAlpha) { + f32 tmp; + if (mInitAlpha == 0) { + tmp = 0.0f; + } else { + tmp = (f32)alpha / (f32)mInitAlpha; + } + + p_pane->setAlpha(*field_0x10 * tmp); + } + + field_0x10++; + childPaneSetAlpha(p_pane->getFirstChildPane(), alpha); + childPaneSetAlpha(p_pane->getNextChildPane(), alpha); + } } -#pragma pop /* 80255C68-80255CAC 2505A8 0044+00 0/0 5/5 0/0 .text * __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm CPaneMgrAlphaMorf::CPaneMgrAlphaMorf(J2DScreen* param_0, u64 param_1, u8 param_2, - JKRExpHeap* param_3) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap.s" +CPaneMgrAlphaMorf::CPaneMgrAlphaMorf(J2DScreen* p_screen, u64 tag, u8 flags, + JKRExpHeap* p_heap) + : CPaneMgrAlpha(p_screen, tag, flags, p_heap) { + initiateAlphaMorf(); } -#pragma pop /* 80255CAC-80255D48 2505EC 009C+00 1/0 0/0 0/0 .text __dt__17CPaneMgrAlphaMorfFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm CPaneMgrAlphaMorf::~CPaneMgrAlphaMorf() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/__dt__17CPaneMgrAlphaMorfFv.s" +CPaneMgrAlphaMorf::~CPaneMgrAlphaMorf() { + if (mpFirstSaveAlpha != NULL) { + heap->free(mpFirstSaveAlpha); + mpFirstSaveAlpha = NULL; + } + + if (mpFirstGetAlpha != NULL) { + heap->free(mpFirstGetAlpha); + mpFirstGetAlpha = NULL; + } } -#pragma pop /* 80255D48-80255DD0 250688 0088+00 1/1 0/0 0/0 .text initiateAlphaMorf__17CPaneMgrAlphaMorfFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlphaMorf::initiateAlphaMorf() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/initiateAlphaMorf__17CPaneMgrAlphaMorfFv.s" +void CPaneMgrAlphaMorf::initiateAlphaMorf() { + mpFirstSaveAlpha = NULL; + field_0x20 = NULL; + + mpFirstGetAlpha = NULL; + field_0x28 = NULL; + + if (mpFirstStackAlpha != NULL) { + mpFirstSaveAlpha = heap->alloc(mChildPaneCount, 0x20); + field_0x20 = (u8*)mpFirstSaveAlpha; + + mpFirstGetAlpha = heap->alloc(mChildPaneCount, 0x20); + field_0x28 = (u8*)mpFirstGetAlpha; + setBackupAlpha(); + } } -#pragma pop /* 80255DD0-80255E28 250710 0058+00 1/1 3/3 0/0 .text setBackupAlpha__17CPaneMgrAlphaMorfFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlphaMorf::setBackupAlpha() { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/setBackupAlpha__17CPaneMgrAlphaMorfFv.s" +void CPaneMgrAlphaMorf::setBackupAlpha() { + if (mpFirstStackAlpha != NULL) { + field_0x20 = (u8*)mpFirstSaveAlpha; + field_0x28 = (u8*)mpFirstGetAlpha; + + childPaneBackupAlpha(mPane->getFirstChildPane()); + } } -#pragma pop /* 80255E28-80255E98 250768 0070+00 0/0 3/3 0/0 .text setAlphaMorfRate__17CPaneMgrAlphaMorfFf */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlphaMorf::setAlphaMorfRate(f32 param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/setAlphaMorfRate__17CPaneMgrAlphaMorfFf.s" +void CPaneMgrAlphaMorf::setAlphaMorfRate(f32 rate) { + if (mpFirstStackAlpha != NULL) { + field_0x20 = (u8*)mpFirstSaveAlpha; + field_0x28 = (u8*)mpFirstGetAlpha; + + childPaneSetAlphaMorf(mPane->getFirstChildPane(), rate); + } else { + setAlphaRate(rate); + } } -#pragma pop /* 80255E98-80255F28 2507D8 0090+00 1/1 0/0 0/0 .text * childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlphaMorf::childPaneBackupAlpha(J2DPane* param_0) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane.s" +void CPaneMgrAlphaMorf::childPaneBackupAlpha(J2DPane* p_pane) { + if (p_pane != NULL) { + *field_0x20 = p_pane->getAlpha(); + field_0x20++; + + *field_0x28 = p_pane->getAlpha(); + field_0x28++; + + childPaneBackupAlpha(p_pane->getFirstChildPane()); + childPaneBackupAlpha(p_pane->getNextChildPane()); + } } -#pragma pop /* 80255F28-80256018 250868 00F0+00 1/1 0/0 0/0 .text * childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void CPaneMgrAlphaMorf::childPaneSetAlphaMorf(J2DPane* param_0, f32 param_1) { - nofralloc -#include "asm/d/pane/d_pane_class_alpha/childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef.s" +void CPaneMgrAlphaMorf::childPaneSetAlphaMorf(J2DPane* p_pane, f32 morf) { + if (p_pane != NULL) { + if (*field_0x20 == *field_0x28) { + p_pane->setAlpha(*field_0x20 * morf); + } else { + *field_0x20 = *field_0x28; + } + field_0x20++; + field_0x28++; + + childPaneSetAlphaMorf(p_pane->getFirstChildPane(), morf); + childPaneSetAlphaMorf(p_pane->getNextChildPane(), morf); + } } -#pragma pop diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index d46eb184db..62ddd4827e 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -469,7 +469,7 @@ extern "C" extern u32 g_whiteColor; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; extern "C" extern u8 JPTracePCB4[4]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; +extern "C" extern u8 mStayNo__20dStage_roomControl_c[4]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; // diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 7e1081a6d6..a9f6a3a140 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -137,6 +137,7 @@ extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__10dDlst_2D_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; +extern "C" extern u8 mInitFlag__17mDoAud_zelAudio_c[4]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index c613985499..008cc27ba1 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -197,6 +197,7 @@ extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mProcID__20dStage_roomControl_c[4]; extern "C" extern u8 struct_80450D8C[4]; +extern "C" extern u8 mBgmSet__17mDoAud_zelAudio_c; extern "C" u8 m_emitter__8daYkgr_c[4]; extern "C" u8 sManager__10JFWDisplay[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -238,19 +239,19 @@ static u8 g_preLoadHIO[4]; /* 80451124-80451128 -00001 0004+00 3/3 7/7 38/38 .sbss None */ /* 80451124 0001+00 data_80451124 None */ -/* 80451125 0003+00 data_80451125 None */ -s8 struct_80451124; +/* 80451125 0003+00 nextPauseTimer__9dScnPly_c None */ +s8 dScnPly_c::pauseTimer; -s8 data_80451125; +s8 dScnPly_c::nextPauseTimer; /* 80259400-80259440 253D40 0040+00 1/1 0/0 0/0 .text calcPauseTimer__9dScnPly_cFv */ s8 dScnPly_c::calcPauseTimer() { - if (data_80451125 != 0) { - struct_80451124 = data_80451125; - data_80451125 = 0; - return struct_80451124; + if (nextPauseTimer != 0) { + pauseTimer = nextPauseTimer; + nextPauseTimer = 0; + return pauseTimer; } else { - return func_80252E70(&struct_80451124); // cLib_calcTimer : 80252E70 + return func_80252E70(&pauseTimer); // cLib_calcTimer : 80252E70 } } @@ -418,7 +419,7 @@ static int dScnPly_Draw(dScnPly_c* scn) { } dMdl_mng_c::reset(); - if (!dComIfGp_isPauseFlag() && struct_80451124 == 0) { + if (!dComIfGp_isPauseFlag() && pauseTimer == 0) { if (fpcM_GetName(scn) == PROC_PLAY_SCENE) { dComIfGp_getVibration().Run(); } @@ -429,9 +430,9 @@ static int dScnPly_Draw(dScnPly_c* scn) { cCt_execCounter(); } else { dPa_control_c::onStatus(1); - if (struct_80451124 == 0) { + if (pauseTimer == 0) { dPa_control_c::onStatus(2); - if (struct_80451124 == 0) { + if (pauseTimer == 0) { dComIfGp_getVibration().Pause(); } } @@ -523,11 +524,11 @@ SECTION_DEAD static char const* const stringBase_8039A2DF = "T_JOINT"; SECTION_SDATA static char* T_JOINT_resName = "Always"; /* 80450764-80450768 -00001 0004+00 4/4 0/0 0/0 .sdata None */ -SECTION_SDATA static s8 struct_80450764 = 0xFF; +SECTION_SDATA static s8 preLoadNo = 0xFF; #pragma push #pragma force_active on -SECTION_SDATA static u8 data_80450765 = 1; +SECTION_SDATA static u8 doPreLoad = 1; #pragma pop /* 802598AC-80259AC4 2541EC 0218+00 1/0 0/0 0/0 .text dScnPly_Delete__FP9dScnPly_c */ @@ -576,7 +577,7 @@ void dScnPly_c::offReset() { if (field_0x1d4 != 0 && !fopOvlpM_IsPeek()) { mDoRst::offReset(); mDoRst::offResetPrepare(); - struct_80451501 = false; + JUTGamePad::C3ButtonReset::sResetOccurred = false; JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); field_0x1d4 = 0; } @@ -922,15 +923,15 @@ static int phase_4(dScnPly_c* i_this) { dComIfG_setBrightness(255); mDoGph_gInf_c::offFade(); mDoAud_zelAudio_c::onBgmSet(); - struct_80451124 = 0; - data_80451125 = 0; - struct_80450764 = -1; + dScnPly_c::pauseTimer = 0; + dScnPly_c::nextPauseTimer = 0; + preLoadNo = -1; - if (data_80450765 != 0 && !strcmp(dComIfGp_getStartStageName(), (char*)PreLoadInfoT[0])) { - struct_80450764 = 0; + if (doPreLoad != 0 && !strcmp(dComIfGp_getStartStageName(), (char*)PreLoadInfoT[0])) { + preLoadNo = 0; } - if (struct_80450764 < 0) { + if (preLoadNo < 0) { return 4; } diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index d415716ac8..533ade06b0 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -110,7 +110,7 @@ extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" u8 mArcBankName__20dStage_roomControl_c[4]; extern "C" u8 mArcBankData__20dStage_roomControl_c[4]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; // // Declarations: diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index d77fd5d5aa..0f7b4eb4bc 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -14,7 +14,7 @@ fapGm_HIO_c::fapGm_HIO_c() mLetterBottomShadowColor(-1) { mUsingHostIO = true; - if (data_80450580) { + if (mDoMain::developmentMode) { mDisplayMeter = true; mDisplayPrint = true; } else { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 84ba78bbd0..b542f18693 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -560,8 +560,8 @@ s32 fopAcM_callCallback(fopAc_ac_c* p_actor, heapCallbackFunc p_callbackFunc, JK /* 80450CC8-80450CCC -00001 0004+00 2/2 0/0 0/0 .sbss None */ /* 80450CC8 0001+00 data_80450CC8 None */ /* 80450CC9 0003+00 data_80450CC9 None */ -static u8 lbl_80450CC8; -static u8 lbl_80450CC9; +static u8 HeapAdjustEntry; +static u8 HeapAdjustVerbose; /* 8001A1E8-8001A4B0 014B28 02C8+00 1/1 0/0 0/0 .text * fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl */ @@ -614,7 +614,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback break; } - if (lbl_80450CC8 == 0) { + if (HeapAdjustEntry == 0) { mDoExt_adjustSolidHeap(heap00); p_actor->mHeap = heap00; return true; @@ -657,7 +657,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" OSReport_Error("緊急回避措置\n"); // "Emergency action\n" - lbl_80450CC8 = 0; + HeapAdjustEntry = 0; } } // "fopAcM_entrySolidHeap didn't work [%s]\n" @@ -668,21 +668,21 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback /* 8001A4B0-8001A528 014DF0 0078+00 0/0 4/4 446/446 .text * fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl */ bool fopAcM_entrySolidHeap(fopAc_ac_c* p_actor, heapCallbackFunc p_heapCallback, u32 size) { - u8 oldCC9 = lbl_80450CC9; + u8 oldCC9 = HeapAdjustVerbose; if (size & 0x80000000) { - lbl_80450CC9 = 1; + HeapAdjustVerbose = 1; } - u8 oldCC8 = lbl_80450CC8; + u8 oldCC8 = HeapAdjustEntry; if (size & 0x20000000) { - lbl_80450CC8 = 0; + HeapAdjustEntry = 0; } else if (size & 0x10000000) { - lbl_80450CC8 = 1; + HeapAdjustEntry = 1; } bool result = fopAcM_entrySolidHeap_(p_actor, p_heapCallback, size & 0xFFFFFF); - lbl_80450CC9 = oldCC9; - lbl_80450CC8 = oldCC8; + HeapAdjustVerbose = oldCC9; + HeapAdjustEntry = oldCC8; return result; } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 08d3f4f21a..a5a060661d 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -45,7 +45,7 @@ extern "C" void fpcMtd_IsDelete__FP20process_method_classPv(); extern "C" void fpcMtd_Delete__FP20process_method_classPv(); extern "C" void fpcMtd_Create__FP20process_method_classPv(); extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80451124[4]; +extern "C" extern u8 pauseTimer__9dScnPly_c[4]; // // Declarations: diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 63ae92cb55..7796a97e10 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -29,7 +29,7 @@ static OSAlarm Alarm; /* 8001659C-8001665C 010EDC 00C0+00 0/0 1/1 0/0 .text mDoDvdErr_ThdInit__Fv */ void mDoDvdErr_ThdInit() { - if (!data_80450C88) { + if (!mDoDvdErr_initialized) { OSTime time = OSGetTime(); OSThread* curThread = OSGetCurrentThread(); s32 priority = OSGetThreadPriority(curThread); @@ -40,16 +40,16 @@ void mDoDvdErr_ThdInit() { OSCreateAlarm(&Alarm); OSSetPeriodicAlarm(&Alarm, time, OS_BUS_CLOCK / 4, AlarmHandler); - data_80450C88 = 1; + mDoDvdErr_initialized = true; } } /* 8001665C-800166A4 010F9C 0048+00 0/0 1/1 0/0 .text mDoDvdErr_ThdCleanup__Fv */ void mDoDvdErr_ThdCleanup() { - if (data_80450C88) { + if (mDoDvdErr_initialized) { OSCancelThread(&DvdErr_thread); OSCancelAlarm(&Alarm); - data_80450C88 = 0; + mDoDvdErr_initialized = false; } } diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 7b4c12c94b..c245257fb2 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -27,7 +27,6 @@ extern "C" void mDoRst_resetCallBack__FiPv(); extern "C" u32 getResetData__6mDoRstFv(); extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80; // // External References: @@ -138,7 +137,7 @@ void mDoRst_resetCallBack(int port, void*) { cAPICPad_recalibrate(); } else { if (mDoRst::is3ButtonReset()) { - struct_80451501 = false; + JUTGamePad::C3ButtonReset::sResetOccurred = false; JUTGamePad::C3ButtonReset::sCallback = mDoRst_resetCallBack; JUTGamePad::C3ButtonReset::sCallbackArg = NULL; return; @@ -171,8 +170,10 @@ u8 struct_80450C7C; u8 struct_80450C7D; u8 struct_80450C7E; u8 struct_80450C7F; -u8 struct_80450C80; -u8 struct_80450C81; + +bool SyncWidthSound; +u8 sDefaultDirection; + u8 struct_80450C82; u8 struct_80450C83; u8 struct_80450C84; @@ -182,6 +183,6 @@ u8 struct_80450C87; #pragma pop /* 80450C88-80450C90 000188 0008+00 0/0 2/2 0/0 .sbss None */ -u8 data_80450C88; +bool mDoDvdErr_initialized; /* 80374198-80374198 0007F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 8e6d187a52..b473c71f85 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -101,7 +101,6 @@ extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B84[4]; extern "C" extern u8 data_80450B88[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern bool struct_80450C80; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; @@ -114,19 +113,18 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4]; /* 80450BB8 0001+00 data_80450BB8 None */ /* 80450BB9 0001+00 data_80450BB9 None */ /* 80450BBA 0002+00 data_80450BBA None */ -bool struct_80450BB8; - #pragma push #pragma force_active on -bool sResetFlag; +bool mDoAud_zelAudio_c::mInitFlag; -extern bool data_80450bba; -bool data_80450bba; +bool mDoAud_zelAudio_c::mResetFlag; + +bool mDoAud_zelAudio_c::mBgmSet; #pragma pop /* 80006FB4-80006FC0 0018F4 000C+00 1/1 0/0 0/0 .text reset__17mDoAud_zelAudio_cFv */ void mDoAud_zelAudio_c::reset() { - data_80450bba = false; + mBgmSet = false; } /* 803DBF40-803DBF4C 008C60 000C+00 1/1 0/1 0/0 .bss @3620 */ @@ -187,7 +185,7 @@ static void mDoAud_Create() { l_arcCommand->destroy(); mDoAud_zelAudio_c::onInitFlag(); - struct_80450C80 = true; + SyncWidthSound = true; } } diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 45f9581cce..faea2e47d8 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -4,17 +4,12 @@ // #include "m_Do/m_Do_controller_pad.h" +#include "m_Do/m_Do_main.h" #include "SSystem/SComponent/c_lib.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_ap/f_ap_game.h" -// -// External References: -// - -extern "C" extern s8 data_80450580; - // // Declarations: // @@ -31,7 +26,7 @@ void mDoCPd_c::create() { JUTGamePad* pad = new JUTGamePad(JUTGamePad::Port_1); m_gamePad[0] = pad; - if (data_80450580 != 0) { + if (mDoMain::developmentMode != 0) { m_gamePad[1] = new JUTGamePad(JUTGamePad::Port_2); m_gamePad[2] = new JUTGamePad(JUTGamePad::Port_3); m_gamePad[3] = new JUTGamePad(JUTGamePad::Port_4); diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 57faf61141..78f702774a 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -13,6 +13,7 @@ #include "dolphin/os/OSThread.h" #include "dolphin/types.h" #include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_reset.h" // // Types: @@ -26,9 +27,6 @@ struct JASDvd { static JASTaskThread* getThreadPointer(); }; -extern "C" extern u8 struct_80450C80; -extern "C" extern u8 struct_80450C81; - // // Declarations: // @@ -132,7 +130,7 @@ void mDoDvdThd_param_c::mainLoop() { while (this->waitForKick() != 0) { while (mDoDvdThd_command_c* command = this->getFirstCommand()) { this->cut(command); - if (struct_80450C80 != 0) { + if (SyncWidthSound) { JASDvd::getThreadPointer()->sendCmdMsg(cb, &command, 4); } else { cb(&command); @@ -187,7 +185,7 @@ mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8 param_0) { mArchive = NULL; mHeap = NULL; if (param_0 == 0) { - mMountDirection = struct_80450C81; + mMountDirection = sDefaultDirection; } } @@ -278,7 +276,7 @@ mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8 param_0, JKRArchive::EMo mMountMode = param_1; mHeap = NULL; if (param_0 == 0) { - mMountDirection = struct_80450C81; + mMountDirection = sDefaultDirection; } } @@ -319,7 +317,7 @@ s32 mDoDvdThd_mountXArchive_c::execute() { mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8 param_0) { mMountDirection = param_0; if (param_0 == 0) { - mMountDirection = struct_80450C81; + mMountDirection = sDefaultDirection; } } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 393ba907d0..1cd5f83c22 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -3131,7 +3131,7 @@ static asm void mDoExt_initFont2() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_getSubFont() { +asm JUTFont* mDoExt_getSubFont() { nofralloc #include "asm/m_Do/m_Do_ext/mDoExt_getSubFont__Fv.s" } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 5008983ab4..d9ebebd6a1 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -144,6 +144,7 @@ extern "C" f32 Zero__4cXyz[3]; extern "C" u8 mPadStatus__10JUTGamePad[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern s8 data_80450580; +extern "C" extern s8 developmentMode__7mDoMain; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; extern "C" u8 systemConsole__9JFWSystem[4]; extern "C" u8 sManager__10JFWDisplay[4]; @@ -222,16 +223,15 @@ f32 mDoGph_gInf_c::mFadeSpeed; /* 80450BE4-80450BE8 -00001 0004+00 8/8 9/9 11/11 .sbss None */ /* 80450BE4 0001+00 data_80450BE4 None */ /* 80450BE5 0001+00 data_80450BE5 None */ -/* 80450BE6 0001+00 data_80450BE6 None */ +/* 80450BE6 0001+00 mFade__13mDoGph_gInf_c None */ /* 80450BE7 0001+00 data_80450BE7 None */ -extern u8 struct_80450BE4; -u8 struct_80450BE4; +bool mDoGph_gInf_c::mBlureFlag; #pragma push #pragma force_active on static bool data_80450BE5; -u8 data_80450BE6; +u8 mDoGph_gInf_c::mFade; bool data_80450BE7; #pragma pop @@ -272,7 +272,7 @@ SECTION_SDATA2 static f32 lit_4063 = 1.0f; /* 80007FD8-80008028 002918 0050+00 1/1 6/4 15/15 .text fadeOut__13mDoGph_gInf_cFfR8_GXColor */ void mDoGph_gInf_c::fadeOut(f32 fadeSpeed, GXColor& fadeColor) { - data_80450BE6 = 1; + mFade = 1; mFadeSpeed = fadeSpeed; mFadeColor = fadeColor; @@ -286,7 +286,7 @@ void mDoGph_gInf_c::fadeOut(f32 fadeSpeed, GXColor& fadeColor) { /* 80008028-80008078 002968 0050+00 0/0 0/0 2/2 .text fadeOut_f__13mDoGph_gInf_cFfR8_GXColor */ void mDoGph_gInf_c::fadeOut_f(f32 fadeSpeed, GXColor& fadeColor) { - data_80450BE6 = 129; + mFade = 129; mFadeSpeed = fadeSpeed; mFadeColor = fadeColor; @@ -319,7 +319,7 @@ Mtx mDoGph_gInf_c::mBlureMtx; /* 800080A0-800080D0 0029E0 0030+00 1/1 1/1 0/0 .text onBlure__13mDoGph_gInf_cFPA4_Cf */ void mDoGph_gInf_c::onBlure(const Mtx m) { - struct_80450BE4 = 1; + mBlureFlag = true; PSMTXCopy(m, mBlureMtx); } @@ -393,12 +393,12 @@ SECTION_SDATA2 static f32 lit_4131 = 255.0f; // li instead of addi #ifdef NONMATCHING void mDoGph_gInf_c::calcFade() { - if (data_80450BE6) { + if (mDoGph_gInf_c::mFade == 1) { mFadeRate += mFadeSpeed; if (mFadeRate < 0.0f) { mFadeRate = 0.0f; - data_80450BE6 = false; + mDoGph_gInf_c::mFade = 0; } else { if (mFadeRate > 1.0f) { mFadeRate = 1.0f; @@ -468,7 +468,7 @@ int mDoGph_AfterOfDraw() { BOOL console_visible = port3_connected && fapGmHIO_isPrint(); // Dev mode check - if (!data_80450580) { + if (!mDoMain::developmentMode) { procBar_visible = false; console_visible = false; } diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index deb256ebca..6c1d3df034 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -105,6 +105,7 @@ extern "C" u32 VIGetDTVStatus(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); extern "C" extern s8 data_80450580; +extern "C" extern s8 developmentMode__7mDoMain; extern "C" u32 memMargin__7mDoMain; extern "C" u32 maxStdHeaps__Q29JFWSystem11CSetUpParam; extern "C" u32 sysHeapSize__Q29JFWSystem11CSetUpParam; @@ -123,7 +124,7 @@ extern "C" u8 systemConsole__9JFWSystem[4]; extern "C" u8 sSystemHeap__7JKRHeap[4]; extern "C" u8 sRootHeap__7JKRHeap[4]; extern "C" u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" extern bool struct_80451500; +extern "C" extern bool sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset; extern "C" u8 sErrorManager__12JUTException[4]; extern "C" u8 sConsole__12JUTException[4]; extern "C" u8 sManager__17JUTConsoleManager[4]; @@ -133,7 +134,7 @@ extern "C" u8 sManager__17JUTConsoleManager[4]; // /* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss None */ -static u8 data_80450BF0; +static u8 mDebugFill; /* 80450BF4-80450BF8 0000F4 0004+00 1/1 0/0 0/0 .sbss solidHeapErrors */ static int solidHeapErrors; @@ -285,30 +286,34 @@ static u8 debug_key2; /* 8000B68C-8000B73C 005FCC 00B0+00 1/1 0/0 0/0 .text developKeyCheck__FUlUl */ static int developKeyCheck(u32 btnTrig, u32 btnHold) { + static u8 key_link; + static u8 key_ganon; + static u8 key_zelda; + if (btnHold == (CButton::L | CButton::R | CButton::Z | CButton::DPAD_DOWN) && btnTrig == CButton::DPAD_DOWN) { - if (debug_key0 == 3 && debug_key1 == 6 && debug_key2 == 5) { - data_80450580 = 1; + if (key_link == 3 && key_ganon == 6 && key_zelda == 5) { + mDoMain::developmentMode = 1; } else { - debug_key0 = 0; - debug_key1 = 0; - debug_key2 = 0; + key_link = 0; + key_ganon = 0; + key_zelda = 0; } } if (btnHold == (CButton::L | CButton::DPAD_RIGHT) && btnTrig == CButton::L) { - debug_key0++; + key_link++; } if (btnHold == (CButton::R | CButton::DPAD_UP) && btnTrig == CButton::R) { - debug_key1++; + key_ganon++; } if (btnHold == (CButton::Z | CButton::DPAD_LEFT) && btnTrig == CButton::Z) { - debug_key2++; + key_zelda++; } - return data_80450580; + return mDoMain::developmentMode; } /* 8000B73C-8000B768 00607C 002C+00 1/1 0/0 0/0 .text mDoMch_IsProgressiveMode__Fv */ @@ -348,7 +353,7 @@ void myExceptionCallback(u16, OSContext*, u32, u32) { PPCHalt(); } else { manager->setTraceSuppress(0x80); - if (data_80450580 == 0) { + if (mDoMain::developmentMode == 0) { JUTGamePad pad(JUTGamePad::Port_1); manager->setGamePad(&pad); @@ -356,11 +361,11 @@ void myExceptionCallback(u16, OSContext*, u32, u32) { OSEnableInterrupts(); // "Accepting Key input\n" OSReport("キー入力を受け付けています\n"); - while (data_80450580 == 0) { + while (mDoMain::developmentMode == 0) { exceptionReadPad(&btnTrig, &btnHold); developKeyCheck(btnTrig, btnHold); JUTException::waitTime(30); - if (struct_80451501) { + if (JUTGamePad::C3ButtonReset::sResetOccurred) { exceptionRestart(); } } @@ -431,7 +436,7 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { u32 btnHold, btnTrig; exceptionReadPad(&btnTrig, &btnHold); - if (struct_80451501) { + if (JUTGamePad::C3ButtonReset::sResetOccurred) { OSResetSystem(1, 0, 0); } @@ -657,11 +662,11 @@ SECTION_SDATA GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaInt // reg alloc r30 - r31 #ifdef NONMATCHING int mDoMch_Create() { - if (data_80450580 == 0 || !(OSGetConsoleType() & 0x10000000)) { + if (mDoMain::developmentMode == 0 || !(OSGetConsoleType() & 0x10000000)) { OSReportDisable(); } - JKRHeap::setDefaultDebugFill(data_80450BF0); + JKRHeap::setDefaultDebugFill(mDebugFill); JFWSystem::setMaxStdHeap(1); u32 arenaHi = OSGetArenaHi(); @@ -700,7 +705,7 @@ int mDoMch_Create() { mDoExt_createAssertHeap(JKRHeap::getRootHeap()); JFWSystem::init(); - if (data_80450580 == 0) { + if (mDoMain::developmentMode == 0) { JUTAssertion::setVisible(false); JUTDbPrint::getManager()->setVisible(false); } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 119df06adb..844e00aeb1 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -43,6 +43,7 @@ extern "C" u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */]; extern "C" u32 memMargin__7mDoMain; extern "C" u8 sPowerOnTime__7mDoMain[4]; extern "C" u8 sHungUpTime__7mDoMain[4]; +extern "C" s8 developmentMode__7mDoMain; extern "C" extern u8 data_80450B38[4]; extern "C" extern u8 data_80450B3C[4]; extern "C" extern u8 data_80450B40[4]; @@ -118,7 +119,6 @@ extern "C" u8 m_gamePad__8mDoCPd_c[16]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" extern JKRSolidHeap* g_mDoAud_audioHeap; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80[8]; extern "C" u8 systemConsole__9JFWSystem[4]; extern "C" u8 sSystemHeap__7JKRHeap[4]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; @@ -278,7 +278,7 @@ void HeapCheck::heapDisplay() const { } /* 80450580-80450584 000000 0004+00 3/3 6/6 0/0 .sdata None */ -SECTION_SDATA s8 data_80450580 = 0xFF; +SECTION_SDATA s8 mDoMain::developmentMode = -1; /* 80450584-80450588 000004 0004+00 0/0 1/1 0/0 .sdata memMargin__7mDoMain */ SECTION_SDATA u32 mDoMain::memMargin = 0xFFFFFFFF; @@ -287,7 +287,7 @@ SECTION_SDATA u32 mDoMain::memMargin = 0xFFFFFFFF; SECTION_SDATA u8 mDoMain::mHeapBriefType = 4; /* 80450B00-80450B08 000000 0008+00 1/1 0/0 0/0 .sbss None */ -static u8 data_80450B00; +static u8 fillcheck_check_frame; /* 80450B08-80450B0C 000008 0004+00 1/1 1/1 0/0 .sbss sPowerOnTime__7mDoMain */ OSTime mDoMain::sPowerOnTime; @@ -299,7 +299,7 @@ OSTime mDoMain::sHungUpTime; /* 80450B18 0001+00 data_80450B18 None */ /* 80450B19 0001+00 data_80450B19 None */ /* 80450B1A 0002+00 data_80450B1A None */ -static bool struct_80450B18; // sDisplayHeapDebug +static bool mDisplayHeapSize; // sDisplayHeapDebug static u8 sDisplayHeap; static bool sCheckHeap; @@ -513,17 +513,17 @@ asm void* LOAD_COPYDATE(void* param_0) { #endif static void debug() { - if (data_80450580) { + if (mDoMain::developmentMode) { if (sCheckHeap) { CheckHeap(PAD_3); } if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::R && mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) { - struct_80450B18 ^= 1; + mDisplayHeapSize ^= 1; } - if (struct_80450B18) { + if (mDisplayHeapSize) { if ((mDoCPd_c::getGamePad(PAD_3)->getButton() & ~CButton::Z) == CButton::L && mDoCPd_c::getGamePad(PAD_3)->testTrigger(CButton::Z)) { mDoMain::mHeapBriefType < 5 ? mDoMain::mHeapBriefType++ : @@ -591,7 +591,7 @@ void main01(void) { JUTConsole* console = JFWSystem::getSystemConsole(); s32 output = 0; - if (data_80450580 != 0) { + if (mDoMain::developmentMode != 0) { output = JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE; } @@ -601,18 +601,18 @@ void main01(void) { mDoDvdThd_callback_c::create(LOAD_COPYDATE, NULL); fapGm_Create__Fv(); fopAcM_initManager__Fv(); - struct_80450B18 = 0; + mDisplayHeapSize = 0; cDyl_InitAsync__Fv(); g_mDoAud_audioHeap = JKRSolidHeap::create(0x14D800, JKRHeap::getCurrentHeap(), false); do { frame++; - if (data_80450B00 != 0 && frame % data_80450B00 == 0) { + if (fillcheck_check_frame != 0 && frame % fillcheck_check_frame == 0) { mDoMch_HeapCheckAll__Fv(); } - if (struct_80450C80[0]) { + if (SyncWidthSound) { g_mDoMemCd_control.update(); } @@ -670,16 +670,16 @@ void main() { g_dComIfG_gameInfo.ct(); - if (data_80450580 < 0) { + if (mDoMain::developmentMode < 0) { DVDDiskID* disk_id = DVDGetCurrentDiskID(); if (disk_id->game_version > 0x90) { - data_80450580 = 1; + mDoMain::developmentMode = 1; } else if (disk_id->game_version > 0x80) { u32 consoleType = OSGetConsoleType(); - data_80450580 = (consoleType >> 0x1C) & 1; + mDoMain::developmentMode = (consoleType >> 0x1C) & 1; } else { - data_80450580 = 0; + mDoMain::developmentMode = 0; } } diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 4c3ae331fe..5dcf89a8c2 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -113,16 +113,16 @@ static u32 print_warings; static u32 print_systems; /* 80450BB4-80450BB8 -00001 0004+00 3/3 0/0 0/0 .sbss None */ -static bool sOSReportInit; +static bool print_initialized; static bool data_80450BB5; /* 800068C4-800068DC 001204 0018+00 1/1 1/1 0/0 .text OSReportInit__Fv */ void OSReportInit() { - if (sOSReportInit) { + if (print_initialized) { return; } - sOSReportInit = true; + print_initialized = true; } /* ############################################################################################## */ @@ -166,7 +166,7 @@ void mDoPrintf_vprintf(char const* fmt, va_list args) { /* 80006A10-80006A9C 001350 008C+00 1/1 0/0 0/0 .text mDoPrintf_VReport */ void mDoPrintf_VReport(const char* fmt, va_list args) { - if (!sOSReportInit) { + if (!print_initialized) { OSReportInit(); } if (sOSReportForceEnable || !sOSReportDisabled) {