From 4dc0cd9d09d5a53bf6d68f0018a8053a1507ee9a Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sat, 22 Mar 2025 21:00:51 -0400 Subject: [PATCH] Debug version now builds OK and all_source compiles (#2343) * Fix missing arg to JUT_ASSERT * Fix some MWCC version diff errors * Compile m_Do_ext, d_demo, actor_mng * Add VSCode task to quickly switch between versions * Unlink magLift for debug * Update the hash of the debug dol The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment. The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol. The DOL now builds OK. * Fix all debug REL dtor splits All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds. * Add genMessage declarations to all HIO subclasses * Fixing more compilation errors * m_Do_mtx 100% on debug Cannot be linked due to weak function name mangling? * Improve various matches * Fix all remaining compilation errors * Fix new compilation errors from main * Fix retail regression * Link f_pc_profile_lst --- .vscode/tasks.json | 20 + config/GZ2E01/config.yml | 9 + config/GZ2E01/rels/d_a_andsw/symbols.txt | 8 +- config/ShieldD/build.sha1 | 2 +- config/ShieldD/config.yml | 10 +- config/ShieldD/rels/d_a_andswD/splits.txt | 2 +- config/ShieldD/rels/d_a_andswD/symbols.txt | 8 +- config/ShieldD/rels/d_a_b_gndD/splits.txt | 2 +- .../ShieldD/rels/d_a_balloon_2DD/splits.txt | 2 +- config/ShieldD/rels/d_a_bulletD/splits.txt | 2 +- config/ShieldD/rels/d_a_coach_2DD/splits.txt | 2 +- .../ShieldD/rels/d_a_coach_fireD/splits.txt | 2 +- config/ShieldD/rels/d_a_cstaFD/splits.txt | 2 +- config/ShieldD/rels/d_a_cstatueD/splits.txt | 2 +- config/ShieldD/rels/d_a_demo00D/splits.txt | 2 +- config/ShieldD/rels/d_a_demo_itemD/splits.txt | 2 +- config/ShieldD/rels/d_a_door_pushD/splits.txt | 2 +- config/ShieldD/rels/d_a_dshutterD/splits.txt | 2 +- config/ShieldD/rels/d_a_e_krD/splits.txt | 2 +- config/ShieldD/rels/d_a_e_sgD/splits.txt | 2 +- config/ShieldD/rels/d_a_e_sm2D/splits.txt | 2 +- config/ShieldD/rels/d_a_e_wbD/splits.txt | 2 +- config/ShieldD/rels/d_a_e_yrD/splits.txt | 2 +- .../rels/d_a_formation_mngD/splits.txt | 2 +- config/ShieldD/rels/d_a_guard_mngD/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag03D/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag06D/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag09D/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag10D/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag11D/splits.txt | 2 +- config/ShieldD/rels/d_a_kytag13D/splits.txt | 2 +- config/ShieldD/rels/d_a_mg_rodD/splits.txt | 2 +- config/ShieldD/rels/d_a_mynaD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_aruD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_ashBD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_ashD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_bansD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_besuD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_blue_nsD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_bouD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_bouSD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_chatD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_chinD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_clerkaD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_clerkbD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_clerktD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_coachD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_dfD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_docD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_doorboyD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_drainSolD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_fairyD/splits.txt | 2 +- .../rels/d_a_npc_fairy_seireiD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_gndD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_graD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grcD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grdD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grmD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grmcD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_groD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grrD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grsD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_grzD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_gwolfD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_hanjoD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_hozD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_impalD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_insD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_jagarD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_kakashiD/splits.txt | 2 +- .../rels/d_a_npc_kasi_hanaD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_kasi_kyuD/splits.txt | 2 +- .../rels/d_a_npc_kasi_michD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_kdkD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_kkriD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_knD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_knjD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_kolinD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_kolinbD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_kyuryD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_lenD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_ludD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_maroD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_midpD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_moiD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_moirD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_myna2D/splits.txt | 2 +- .../rels/d_a_npc_pachi_besuD/splits.txt | 2 +- .../rels/d_a_npc_pachi_maroD/splits.txt | 2 +- .../rels/d_a_npc_pachi_taroD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_postD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_pouyaD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_prayerD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_racaD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_rafrelD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_saruD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_seibD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_seicD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_seidD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_seira2D/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_seiraD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_seireiD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_shadD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_shamanD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_shoeD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_solaD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_soldierAD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_soldierBD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_taroD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_theBD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_theD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_tkcD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_tkjD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_tksD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_tobyD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_uriD/splits.txt | 2 +- .../ShieldD/rels/d_a_npc_wrestlerD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_yamidD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_yamisD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_yamitD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_yeliaD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_ykmD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_ykwD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zanbD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zantD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zelRD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zelRoD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zeldaD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zraD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zrcD/splits.txt | 2 +- config/ShieldD/rels/d_a_npc_zrzD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_TuraraD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_TvCdlstD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_Y_taihouD/splits.txt | 2 +- .../rels/d_a_obj_amiShutterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_automataD/splits.txt | 2 +- .../rels/d_a_obj_avalancheD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_barDeskD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_bboxD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_bedD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_bemosD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_bk_leafD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_bkdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_bmWindowD/splits.txt | 2 +- .../rels/d_a_obj_bmshutterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_bosswarpD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_boumatoD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_bsGateD/splits.txt | 2 +- .../rels/d_a_obj_bubblePilarD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_catdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_cblockD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_chestD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_cwallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_damCpsD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_digsnowD/splits.txt | 2 +- .../rels/d_a_obj_dmelevatorD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_dropD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_fallobjD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_fanD/splits.txt | 2 +- .../rels/d_a_obj_fireWood2D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_fireWoodD/splits.txt | 2 +- .../rels/d_a_obj_firepillar2D/splits.txt | 2 +- .../rels/d_a_obj_firepillarD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_gadgetD/splits.txt | 2 +- .../rels/d_a_obj_ganonwall2D/splits.txt | 2 +- .../rels/d_a_obj_ganonwallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_geyserD/splits.txt | 2 +- .../rels/d_a_obj_glowSphereD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_goGateD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_gpTaruD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_gra2D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_graWallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_gra_rockD/splits.txt | 2 +- .../rels/d_a_obj_grave_stoneD/splits.txt | 2 +- .../rels/d_a_obj_groundwaterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_grz_rockD/splits.txt | 2 +- .../rels/d_a_obj_hbombkoyaD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_heavySwD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_hfutaD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_hsTargetD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_iceblockD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_iceleafD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_inoboneD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_itamatoD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_kagoD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_kanteraD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_kbacketD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_kgateD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_kiPotD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_kjgjsD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_kkanbanD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_klift00D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_knBulletD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_ktOnFireD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_kwheel00D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_kwheel01D/splits.txt | 2 +- .../rels/d_a_obj_life_containerD/splits.txt | 2 +- .../rels/d_a_obj_lv1Candle00D/splits.txt | 2 +- .../rels/d_a_obj_lv1Candle01D/splits.txt | 2 +- .../rels/d_a_obj_lv2CandleD/splits.txt | 2 +- .../rels/d_a_obj_lv3CandleD/splits.txt | 2 +- .../rels/d_a_obj_lv3Water2D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv3WaterD/splits.txt | 2 +- .../rels/d_a_obj_lv3saka00D/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTagD/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleTagD/splits.txt | 2 +- .../rels/d_a_obj_lv4EdShutterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv4GateD/splits.txt | 2 +- .../rels/d_a_obj_lv4HsTargetD/splits.txt | 2 +- .../rels/d_a_obj_lv4PoGateD/splits.txt | 2 +- .../rels/d_a_obj_lv4RailWallD/splits.txt | 2 +- .../rels/d_a_obj_lv4SlideWallD/splits.txt | 2 +- .../rels/d_a_obj_lv4bridgeD/splits.txt | 2 +- .../rels/d_a_obj_lv4chandelierD/splits.txt | 2 +- .../rels/d_a_obj_lv4digsandD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv4floorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv4gearD/splits.txt | 2 +- .../rels/d_a_obj_lv4prelvtrD/splits.txt | 2 +- .../rels/d_a_obj_lv4prwallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv4sandD/splits.txt | 2 +- .../rels/d_a_obj_lv5FloorBoardD/splits.txt | 2 +- .../rels/d_a_obj_lv5IceWallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv5SwIceD/splits.txt | 2 +- .../rels/d_a_obj_lv5ychndlrD/splits.txt | 2 +- .../rels/d_a_obj_lv5yiblltrayD/splits.txt | 2 +- .../rels/d_a_obj_lv6ChangeGateD/splits.txt | 2 +- .../rels/d_a_obj_lv6FurikoTrapD/splits.txt | 2 +- .../rels/d_a_obj_lv6LblockD/splits.txt | 2 +- .../rels/d_a_obj_lv6SwGateD/splits.txt | 2 +- .../rels/d_a_obj_lv6SzGateD/splits.txt | 2 +- .../rels/d_a_obj_lv6TenbinD/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeRollD/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeTrapD/splits.txt | 2 +- .../rels/d_a_obj_lv6bemos2D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv6bemosD/splits.txt | 2 +- .../rels/d_a_obj_lv6elevtaD/splits.txt | 2 +- .../rels/d_a_obj_lv6swturnD/splits.txt | 2 +- .../rels/d_a_obj_lv7BsGateD/splits.txt | 2 +- .../rels/d_a_obj_lv7PropellerYD/splits.txt | 2 +- .../rels/d_a_obj_lv7bridgeD/splits.txt | 2 +- .../rels/d_a_obj_lv8KekkaiTrapD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_lv8LiftD/splits.txt | 2 +- .../rels/d_a_obj_lv8OptiLiftD/splits.txt | 2 +- .../rels/d_a_obj_lv8UdFloorD/splits.txt | 2 +- .../rels/d_a_obj_lv9SwShutterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_magLiftD/splits.txt | 2 +- .../rels/d_a_obj_magLiftRotD/splits.txt | 2 +- .../rels/d_a_obj_magne_armD/splits.txt | 2 +- .../rels/d_a_obj_master_swordD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_metalboxD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_mgateD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_mholeD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_mieD/splits.txt | 2 +- .../rels/d_a_obj_mirror_screwD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_moveboxD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_mvstairD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_nouguD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_onsenD/splits.txt | 2 +- .../rels/d_a_obj_onsenTaruD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_pdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_pdtileD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_pillarD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_pleafD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_poCandleD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_poFireD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_poTboxD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_pumpkinD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_rfHoleD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_rgateD/splits.txt | 2 +- .../rels/d_a_obj_rope_bridgeD/splits.txt | 2 +- .../rels/d_a_obj_rotBridgeD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_rotTrapD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_rstairD/splits.txt | 2 +- .../rels/d_a_obj_sWallShutterD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_saidanD/splits.txt | 2 +- .../rels/d_a_obj_scannon_crsD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_sekidoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_sekizoD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_sekizoaD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_shieldD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_smallkeyD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_smgdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_smtileD/splits.txt | 2 +- .../rels/d_a_obj_snowEffTagD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_spinLiftD/splits.txt | 2 +- .../rels/d_a_obj_stairBlockD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_stickD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_stoneD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_stopperD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swBallAD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swBallBD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swBallCD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swLightD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swchainD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swhangD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_swordD/splits.txt | 2 +- .../rels/d_a_obj_swpropellerD/splits.txt | 2 +- .../rels/d_a_obj_swspinnerD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_swturnD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_syRockD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_szbridgeD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_taFenceD/splits.txt | 2 +- .../rels/d_a_obj_takaraDaiD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_testcubeD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_thdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_timeFireD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_tksD/splits.txt | 2 +- .../rels/d_a_obj_tobyhouseD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_togeTrapD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_tornado2D/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_tornadoD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_treeshD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_twGateD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_volcballD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_volcbomD/splits.txt | 2 +- .../rels/d_a_obj_warp_kbrgD/splits.txt | 2 +- .../rels/d_a_obj_warp_obrgD/splits.txt | 2 +- .../rels/d_a_obj_waterGateD/splits.txt | 2 +- .../rels/d_a_obj_waterPillarD/splits.txt | 2 +- .../rels/d_a_obj_waterfallD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_wdStickD/splits.txt | 2 +- .../rels/d_a_obj_well_coverD/splits.txt | 2 +- .../rels/d_a_obj_wood_pendulumD/splits.txt | 2 +- .../rels/d_a_obj_wood_statueD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_wswordD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_yel_bagD/splits.txt | 2 +- config/ShieldD/rels/d_a_obj_zdoorD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_zrTuraraD/splits.txt | 2 +- .../rels/d_a_obj_zrTuraraRockD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_zraMarkD/splits.txt | 2 +- .../rels/d_a_obj_zra_freezeD/splits.txt | 2 +- .../ShieldD/rels/d_a_obj_zra_rockD/splits.txt | 2 +- .../ShieldD/rels/d_a_passer_mngD/splits.txt | 2 +- config/ShieldD/rels/d_a_peruD/splits.txt | 2 +- .../ShieldD/rels/d_a_scene_exit2D/splits.txt | 2 +- .../ShieldD/rels/d_a_startAndGoalD/splits.txt | 2 +- config/ShieldD/rels/d_a_swBallD/splits.txt | 2 +- config/ShieldD/rels/d_a_swLBallD/splits.txt | 2 +- config/ShieldD/rels/d_a_swTimeD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_CstaSwD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_TWgateD/splits.txt | 2 +- .../rels/d_a_tag_attack_itemD/splits.txt | 2 +- .../rels/d_a_tag_attentionD/splits.txt | 2 +- .../rels/d_a_tag_chgrestartD/splits.txt | 2 +- config/ShieldD/rels/d_a_tag_cswD/splits.txt | 2 +- config/ShieldD/rels/d_a_tag_hjumpD/splits.txt | 2 +- config/ShieldD/rels/d_a_tag_hstopD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_lanternD/splits.txt | 2 +- .../rels/d_a_tag_lv6CstaSwD/splits.txt | 2 +- config/ShieldD/rels/d_a_tag_mistD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_poFireD/splits.txt | 2 +- config/ShieldD/rels/d_a_tag_qsD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_ret_roomD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_rmbit_swD/splits.txt | 2 +- .../rels/d_a_tag_setrestartD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_spinnerD/splits.txt | 2 +- .../ShieldD/rels/d_a_tag_springD/splits.txt | 2 +- .../rels/d_a_tag_statue_evtD/splits.txt | 2 +- config/ShieldD/rels/d_a_tbox2D/splits.txt | 2 +- config/ShieldD/rels/d_a_tboxD/splits.txt | 2 +- config/ShieldD/rels/d_a_ykgrD/splits.txt | 2 +- configure.py | 8 +- include/DynamicLink.h | 5 +- include/JSystem/J2DGraph/J2DPictureEx.h | 10 +- include/JSystem/J3DGraphBase/J3DMaterial.h | 2 +- include/JSystem/JFramework/JFWSystem.h | 6 +- include/JSystem/JGadget/define.h | 46 +++ include/JSystem/JGeometry.h | 2 +- include/JSystem/JHostIO/JORReflexible.h | 4 + include/JSystem/JMath/JMath.h | 7 +- include/JSystem/JStage/JSGActor.h | 10 + .../JSystem/JStudio/JStudio/jstudio-object.h | 2 + .../JSystem/JStudio/JStudio_JStage/control.h | 9 + include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTGraphFifo.h | 2 +- include/SSystem/SComponent/c_xyz.h | 2 +- include/Z2AudioLib/Z2Instances.h | 52 +-- include/Z2AudioLib/Z2SoundInfo.h | 2 + include/d/actor/d_a_andsw.h | 11 +- include/d/actor/d_a_b_dr.h | 4 +- include/d/actor/d_a_e_pz.h | 4 +- include/d/actor/d_a_myna.h | 2 + include/d/actor/d_a_npc_cd2.h | 2 +- include/d/actor/d_a_obj_Turara.h | 2 + include/d/actor/d_a_obj_TvCdlst.h | 4 +- include/d/actor/d_a_obj_barDesk.h | 2 + include/d/actor/d_a_obj_bmWindow.h | 2 + include/d/actor/d_a_obj_bsGate.h | 2 + include/d/actor/d_a_obj_bubblePilar.h | 2 + include/d/actor/d_a_obj_drop.h | 5 + include/d/actor/d_a_obj_fireWood.h | 2 + include/d/actor/d_a_obj_fireWood2.h | 2 + include/d/actor/d_a_obj_glowSphere.h | 2 + include/d/actor/d_a_obj_groundwater.h | 2 + include/d/actor/d_a_obj_heavySw.h | 2 + include/d/actor/d_a_obj_hsTarget.h | 4 +- include/d/actor/d_a_obj_kiPot.h | 3 +- include/d/actor/d_a_obj_ktOnFire.h | 10 +- include/d/actor/d_a_obj_lv1Candle00.h | 2 + include/d/actor/d_a_obj_lv1Candle01.h | 2 + include/d/actor/d_a_obj_lv2Candle.h | 2 + include/d/actor/d_a_obj_lv3Candle.h | 2 + include/d/actor/d_a_obj_lv3Water.h | 3 +- include/d/actor/d_a_obj_lv3Water2.h | 2 - include/d/actor/d_a_obj_lv4CandleDemoTag.h | 2 + include/d/actor/d_a_obj_lv4CandleTag.h | 2 + include/d/actor/d_a_obj_lv4Gate.h | 2 + include/d/actor/d_a_obj_lv4HsTarget.h | 2 + include/d/actor/d_a_obj_lv4PoGate.h | 2 + include/d/actor/d_a_obj_lv5FloorBoard.h | 2 + include/d/actor/d_a_obj_lv5IceWall.h | 2 + include/d/actor/d_a_obj_lv5SwIce.h | 2 + include/d/actor/d_a_obj_lv8OptiLift.h | 2 + include/d/actor/d_a_obj_magLift.h | 2 + include/d/actor/d_a_obj_magLiftRot.h | 2 + include/d/actor/d_a_obj_onsenTaru.h | 2 + include/d/actor/d_a_obj_pillar.h | 2 + include/d/actor/d_a_obj_rfHole.h | 2 + include/d/actor/d_a_obj_sWallShutter.h | 2 + include/d/actor/d_a_obj_saidan.h | 2 + include/d/actor/d_a_obj_snowEffTag.h | 2 + include/d/actor/d_a_obj_syRock.h | 2 + include/d/actor/d_a_obj_timeFire.h | 2 + include/d/actor/d_a_obj_treesh.h | 2 + include/d/actor/d_a_obj_waterGate.h | 2 - include/d/actor/d_a_obj_waterPillar.h | 2 + include/d/actor/d_a_obj_wdStick.h | 2 + include/d/actor/d_a_obj_yobikusa.h | 4 +- include/d/actor/d_a_obj_zrTurara.h | 2 + include/d/actor/d_a_obj_zrTuraraRock.h | 2 + include/d/actor/d_a_tag_CstaSw.h | 2 + include/d/actor/d_a_tag_lv6CstaSw.h | 2 + include/d/actor/d_a_tag_poFire.h | 2 + include/d/actor/d_a_tbox.h | 4 +- include/d/actor/d_a_ykgr.h | 4 +- include/d/d_bg_s_acch.h | 2 + include/d/d_camera.h | 2 + include/d/d_demo.h | 8 +- include/d/d_kankyo.h | 9 + include/d/d_map_path_dmap.h | 2 +- include/d/d_menu_letter.h | 2 +- include/d/d_resorce.h | 2 +- include/d/d_s_play.h | 2 + include/d/d_save.h | 3 +- include/dolphin/gx/GXGeometry.h | 2 +- include/dolphin/os.h | 2 +- include/dolphin/types.h | 2 + include/f_op/f_op_actor.h | 6 + include/f_op/f_op_actor_mng.h | 10 +- include/m_Do/m_Do_mtx.h | 4 +- src/JSystem/J2DGraph/J2DPictureEx.cpp | 10 +- src/JSystem/J3DGraphAnimator/J3DCluster.cpp | 3 +- src/JSystem/JAudio2/JAIStreamMgr.cpp | 2 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 2 +- src/JSystem/JFramework/JFWSystem.cpp | 9 +- src/JSystem/JHostIO/JHIhioASync.cpp | 1 + src/JSystem/JHostIO/JORServer.cpp | 18 +- src/JSystem/JParticle/JPAMath.cpp | 10 +- src/JSystem/JStudio/JStudio_JStage/object.cpp | 4 +- .../MSL/MSL_C/MSL_Common/Include/cstring.h | 13 +- .../MSL/MSL_C/MSL_Common/Include/float.h | 7 +- .../MSL/MSL_C/MSL_Common/Include/string.h | 4 +- src/Z2AudioLib/Z2SpeechMgr2.cpp | 2 +- src/d/actor/d_a_andsw.cpp | 52 ++- src/d/actor/d_a_b_bq.cpp | 8 +- src/d/actor/d_a_b_dr.cpp | 2 +- src/d/actor/d_a_b_ds.cpp | 10 +- src/d/actor/d_a_b_ob.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 6 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_door_mbossL1.cpp | 2 +- src/d/actor/d_a_door_shutter.cpp | 4 +- src/d/actor/d_a_e_arrow.cpp | 2 +- src/d/actor/d_a_e_bi_leaf.cpp | 2 +- src/d/actor/d_a_e_ph.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 8 +- src/d/actor/d_a_itembase.cpp | 14 +- src/d/actor/d_a_kytag08.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 6 +- src/d/actor/d_a_movie_player.cpp | 6 +- src/d/actor/d_a_nbomb.cpp | 8 +- src/d/actor/d_a_no_chg_room.cpp | 6 +- src/d/actor/d_a_npc_cd2.cpp | 42 +- src/d/actor/d_a_npc_hanjo.cpp | 3 +- src/d/actor/d_a_obj_Lv5Key.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 4 +- src/d/actor/d_a_obj_crvsteel.cpp | 3 +- src/d/actor/d_a_obj_drop.cpp | 4 + src/d/actor/d_a_obj_firepillar.cpp | 3 +- src/d/actor/d_a_obj_iceblock.cpp | 6 +- src/d/actor/d_a_obj_item.cpp | 8 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 4 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 2 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 4 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 2 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 4 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 6 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 2 +- src/d/actor/d_a_obj_movebox.cpp | 6 +- src/d/actor/d_a_obj_oiltubo.cpp | 4 +- src/d/actor/d_a_obj_pdoor.cpp | 2 +- src/d/actor/d_a_obj_pillar.cpp | 6 +- src/d/actor/d_a_obj_shield.cpp | 4 +- src/d/actor/d_a_obj_udoor.cpp | 2 +- src/d/actor/d_a_obj_waterPillar.cpp | 2 +- src/d/actor/d_a_obj_wflag.cpp | 2 +- src/d/actor/d_a_passer_mng.cpp | 2 +- src/d/actor/d_a_shop_item.cpp | 1 + src/d/actor/d_a_startAndGoal.cpp | 2 +- src/d/actor/d_a_tag_msg.cpp | 2 +- src/d/actor/d_a_tbox2.cpp | 4 +- src/d/actor/d_a_vrbox2.cpp | 365 ++++-------------- src/d/actor/d_a_warp_bug.cpp | 1 + src/d/d_a_obj.cpp | 4 +- src/d/d_bg_w.cpp | 46 +-- src/d/d_bright_check.cpp | 4 +- src/d/d_demo.cpp | 55 +-- src/d/d_door_param2.cpp | 12 +- src/d/d_ev_camera.cpp | 3 +- src/d/d_file_sel_info.cpp | 2 +- src/d/d_file_sel_warning.cpp | 6 +- src/d/d_gameover.cpp | 8 +- src/d/d_map.cpp | 52 +-- src/d/d_menu_dmap.cpp | 2 +- src/d/d_menu_letter.cpp | 68 ++-- src/d/d_meter2_draw.cpp | 175 ++++----- src/d/d_meter_haihai.cpp | 8 +- src/d/d_meter_hakusha.cpp | 20 +- src/d/d_meter_string.cpp | 12 +- src/d/d_msg_object.cpp | 4 +- src/d/d_msg_scrn_3select.cpp | 42 +- src/d/d_msg_scrn_arrow.cpp | 12 +- src/d/d_msg_scrn_jimaku.cpp | 16 +- src/d/d_msg_scrn_light.cpp | 8 +- src/d/d_name.cpp | 8 +- src/d/d_ovlp_fade.cpp | 2 +- src/d/d_resorce.cpp | 10 +- src/d/d_save.cpp | 2 +- src/d/d_shop_system.cpp | 2 +- src/d/d_timer.cpp | 44 +-- src/f_op/f_op_actor_mng.cpp | 68 ++-- src/m_Do/m_Do_ext.cpp | 32 +- src/m_Do/m_Do_mtx.cpp | 85 ++-- 543 files changed, 1413 insertions(+), 1278 deletions(-) create mode 100644 include/JSystem/JGadget/define.h diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6dc12130bc3..d0a87dbe784 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,6 +2,20 @@ // Use Ctrl+Shift+B to run build tasks. // Or "Run Build Task" in the Command Palette. "version": "2.0.0", + "inputs": [ + { + "id": "gameVersion", + "type": "pickString", + "options": [ + "GZ2E01", + "GZ2P01", + "GZ2J01", + "ShieldD", + ], + "default": "GZ2E01", + "description": "Game version to build." + }, + ], "tasks": [ { "label": "ninja", @@ -12,5 +26,11 @@ "isDefault": true } }, + { + "label": "configure", + "type": "shell", + "command": "${command:python.interpreterPath} configure.py --version ${input:gameVersion}", + "problemMatcher": [], + }, ] } diff --git a/config/GZ2E01/config.yml b/config/GZ2E01/config.yml index 1e6a1b199d6..ac267026d9a 100644 --- a/config/GZ2E01/config.yml +++ b/config/GZ2E01/config.yml @@ -9,6 +9,15 @@ quick_analysis: true # Initial analysis completed force_active: [ _MetroTRK_Has_Framing, ] + +block_relocations: +- source: .sdata:0x804505ac +add_relocations: +- source: .sdata:0x804505ac + type: abs + target: buffer__14mDoMtx_stack_c + addend: 0x300 + modules: - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel hash: 183231361986731ad6bd26624a03a44dceda905b diff --git a/config/GZ2E01/rels/d_a_andsw/symbols.txt b/config/GZ2E01/rels/d_a_andsw/symbols.txt index 0a6ec2c4bf1..bca16605386 100644 --- a/config/GZ2E01/rels/d_a_andsw/symbols.txt +++ b/config/GZ2E01/rels/d_a_andsw/symbols.txt @@ -5,10 +5,10 @@ Create__9daAndsw_cFv = .text:0x00000078; // type:function size:0x40 scope:global create__9daAndsw_cFv = .text:0x000000B8; // type:function size:0x68 scope:global execute__9daAndsw_cFv = .text:0x00000120; // type:function size:0x9C scope:global _delete__9daAndsw_cFv = .text:0x000001BC; // type:function size:0x8 scope:global -daAndsw_Execute__FP9daAndsw_c = .text:0x000001C4; // type:function size:0x20 scope:global -daAndsw_Delete__FP9daAndsw_c = .text:0x000001E4; // type:function size:0x20 scope:global -daAndsw_Create__FP10fopAc_ac_c = .text:0x00000204; // type:function size:0x20 scope:global +daAndsw_Execute__FP9daAndsw_c = .text:0x000001C4; // type:function size:0x20 scope:local +daAndsw_Delete__FP9daAndsw_c = .text:0x000001E4; // type:function size:0x20 scope:local +daAndsw_Create__FP10fopAc_ac_c = .text:0x00000204; // type:function size:0x20 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -l_daAndsw_Method = .data:0x00000000; // type:object size:0x20 scope:global +l_daAndsw_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_ANDSW = .data:0x00000020; // type:object size:0x30 scope:global diff --git a/config/ShieldD/build.sha1 b/config/ShieldD/build.sha1 index decb3930843..1bd6a4cfec5 100644 --- a/config/ShieldD/build.sha1 +++ b/config/ShieldD/build.sha1 @@ -1,4 +1,4 @@ -cbea5fad2ab6d04b96c18d1280643a41d87214b0 build/ShieldD/framework.dol +16415549d9adce985b8cf736f1a5d7afb570b48e build/ShieldD/framework.dol f8631666f2f163dd0d5c8e0a56af82f4db5c525a build/ShieldD/d_a_L7demo_drD/d_a_L7demo_drD.rel 22ccf35f33dc61c2b6bd27dd4f8e60ba5d8d5141 build/ShieldD/d_a_L7low_drD/d_a_L7low_drD.rel 12a27b9dfe1b69bd7b58de4bb0652f2a0b8e152f build/ShieldD/d_a_L7op_demo_drD/d_a_L7op_demo_drD.rel diff --git a/config/ShieldD/config.yml b/config/ShieldD/config.yml index 8fab73ca26c..3f8ad3516fc 100644 --- a/config/ShieldD/config.yml +++ b/config/ShieldD/config.yml @@ -1,7 +1,7 @@ name: framework object_base: orig/ShieldD object: sys/main.dol -hash: cbea5fad2ab6d04b96c18d1280643a41d87214b0 +hash: 16415549d9adce985b8cf736f1a5d7afb570b48e symbols: config/ShieldD/symbols.txt splits: config/ShieldD/splits.txt # map: orig/ShieldD/fixed_maps/RframeworkD.map @@ -9,6 +9,14 @@ mw_comment_version: 14 write_asm: true ldscript_template: config/ShieldD/ldscript.tpl +block_relocations: +- source: .sdata:0x8073f3f4 +add_relocations: +- source: .sdata:0x8073f3f4 + type: abs + target: buffer__14mDoMtx_stack_c + addend: 0x300 + modules: - object: files/rel/RVL/Debug/d_a_alldieD.rel hash: a2c9e702b4c87ea0efa440a83799cc28eeedcfe2 diff --git a/config/ShieldD/rels/d_a_andswD/splits.txt b/config/ShieldD/rels/d_a_andswD/splits.txt index 932cd280c6f..1014abeed0f 100644 --- a/config/ShieldD/rels/d_a_andswD/splits.txt +++ b/config/ShieldD/rels/d_a_andswD/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_andsw.cpp: diff --git a/config/ShieldD/rels/d_a_andswD/symbols.txt b/config/ShieldD/rels/d_a_andswD/symbols.txt index dc7e5031f67..9a9876801e9 100644 --- a/config/ShieldD/rels/d_a_andswD/symbols.txt +++ b/config/ShieldD/rels/d_a_andswD/symbols.txt @@ -14,9 +14,9 @@ __ct__9daAndsw_cFv = .text:0x00000430; // type:function size:0x34 scope:global execute__9daAndsw_cFv = .text:0x00000470; // type:function size:0x114 scope:global getType__9daAndsw_cFv = .text:0x00000590; // type:function size:0x3C scope:global _delete__9daAndsw_cFv = .text:0x000005D0; // type:function size:0x2C scope:global -daAndsw_Execute__FP9daAndsw_c = .text:0x00000600; // type:function size:0x28 scope:global -daAndsw_Delete__FP9daAndsw_c = .text:0x00000630; // type:function size:0x44 scope:global -daAndsw_Create__FP10fopAc_ac_c = .text:0x00000680; // type:function size:0x50 scope:global +daAndsw_Execute__FP9daAndsw_c = .text:0x00000600; // type:function size:0x28 scope:local +daAndsw_Delete__FP9daAndsw_c = .text:0x00000630; // type:function size:0x44 scope:local +daAndsw_Create__FP10fopAc_ac_c = .text:0x00000680; // type:function size:0x50 scope:local __dt__13daAndsw_HIO_cFv = .text:0x000006D0; // type:function size:0x5C scope:global __sinit_\d_a_andsw_cpp = .text:0x00000730; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -31,7 +31,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @114232 = .data:0x00000094; // type:object size:0x17 scope:local @114272 = .data:0x000000B0; // type:object size:0x18 scope:local data:string @114288 = .data:0x000000C8; // type:object size:0x18 scope:local data:string -l_daAndsw_Method = .data:0x000000E0; // type:object size:0x20 scope:global +l_daAndsw_Method = .data:0x000000E0; // type:object size:0x20 scope:local g_profile_ANDSW = .data:0x00000100; // type:object size:0x30 scope:global __vt__13daAndsw_HIO_c = .data:0x00000130; // type:object size:0x20 scope:global @114290 = .data:0x00000150; // type:object size:0xE scope:local data:string diff --git a/config/ShieldD/rels/d_a_b_gndD/splits.txt b/config/ShieldD/rels/d_a_b_gndD/splits.txt index 105c5bab5cf..24dc1a2a388 100644 --- a/config/ShieldD/rels/d_a_b_gndD/splits.txt +++ b/config/ShieldD/rels/d_a_b_gndD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gnd.cpp: diff --git a/config/ShieldD/rels/d_a_balloon_2DD/splits.txt b/config/ShieldD/rels/d_a_balloon_2DD/splits.txt index 743bfe78500..97a832c646a 100644 --- a/config/ShieldD/rels/d_a_balloon_2DD/splits.txt +++ b/config/ShieldD/rels/d_a_balloon_2DD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_balloon_2D.cpp: diff --git a/config/ShieldD/rels/d_a_bulletD/splits.txt b/config/ShieldD/rels/d_a_bulletD/splits.txt index 5b95e513208..da78fb8d188 100644 --- a/config/ShieldD/rels/d_a_bulletD/splits.txt +++ b/config/ShieldD/rels/d_a_bulletD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bullet.cpp: diff --git a/config/ShieldD/rels/d_a_coach_2DD/splits.txt b/config/ShieldD/rels/d_a_coach_2DD/splits.txt index 7403cc6964c..8bfc189542c 100644 --- a/config/ShieldD/rels/d_a_coach_2DD/splits.txt +++ b/config/ShieldD/rels/d_a_coach_2DD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_coach_2D.cpp: diff --git a/config/ShieldD/rels/d_a_coach_fireD/splits.txt b/config/ShieldD/rels/d_a_coach_fireD/splits.txt index 9b2422fbee2..78962df8c1b 100644 --- a/config/ShieldD/rels/d_a_coach_fireD/splits.txt +++ b/config/ShieldD/rels/d_a_coach_fireD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_coach_fire.cpp: diff --git a/config/ShieldD/rels/d_a_cstaFD/splits.txt b/config/ShieldD/rels/d_a_cstaFD/splits.txt index 79d3bea4d8b..213c1c19e99 100644 --- a/config/ShieldD/rels/d_a_cstaFD/splits.txt +++ b/config/ShieldD/rels/d_a_cstaFD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cstaF.cpp: diff --git a/config/ShieldD/rels/d_a_cstatueD/splits.txt b/config/ShieldD/rels/d_a_cstatueD/splits.txt index f268e85803a..98f72d6bf73 100644 --- a/config/ShieldD/rels/d_a_cstatueD/splits.txt +++ b/config/ShieldD/rels/d_a_cstatueD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cstatue.cpp: diff --git a/config/ShieldD/rels/d_a_demo00D/splits.txt b/config/ShieldD/rels/d_a_demo00D/splits.txt index adbe240260b..85badb39434 100644 --- a/config/ShieldD/rels/d_a_demo00D/splits.txt +++ b/config/ShieldD/rels/d_a_demo00D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo00.cpp: diff --git a/config/ShieldD/rels/d_a_demo_itemD/splits.txt b/config/ShieldD/rels/d_a_demo_itemD/splits.txt index 3d327b5326f..8da6106ad59 100644 --- a/config/ShieldD/rels/d_a_demo_itemD/splits.txt +++ b/config/ShieldD/rels/d_a_demo_itemD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo_item.cpp: diff --git a/config/ShieldD/rels/d_a_door_pushD/splits.txt b/config/ShieldD/rels/d_a_door_pushD/splits.txt index e2ec8b11e25..e73966b0b31 100644 --- a/config/ShieldD/rels/d_a_door_pushD/splits.txt +++ b/config/ShieldD/rels/d_a_door_pushD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_door_push.cpp: diff --git a/config/ShieldD/rels/d_a_dshutterD/splits.txt b/config/ShieldD/rels/d_a_dshutterD/splits.txt index b87113dc430..1a7561a34b6 100644 --- a/config/ShieldD/rels/d_a_dshutterD/splits.txt +++ b/config/ShieldD/rels/d_a_dshutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_dshutter.cpp: diff --git a/config/ShieldD/rels/d_a_e_krD/splits.txt b/config/ShieldD/rels/d_a_e_krD/splits.txt index 633730138a1..b2b36561fbc 100644 --- a/config/ShieldD/rels/d_a_e_krD/splits.txt +++ b/config/ShieldD/rels/d_a_e_krD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kr.cpp: diff --git a/config/ShieldD/rels/d_a_e_sgD/splits.txt b/config/ShieldD/rels/d_a_e_sgD/splits.txt index f6cdf3174ce..48e8df38506 100644 --- a/config/ShieldD/rels/d_a_e_sgD/splits.txt +++ b/config/ShieldD/rels/d_a_e_sgD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sg.cpp: diff --git a/config/ShieldD/rels/d_a_e_sm2D/splits.txt b/config/ShieldD/rels/d_a_e_sm2D/splits.txt index a000d1da1e4..5ea013919cf 100644 --- a/config/ShieldD/rels/d_a_e_sm2D/splits.txt +++ b/config/ShieldD/rels/d_a_e_sm2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm2.cpp: diff --git a/config/ShieldD/rels/d_a_e_wbD/splits.txt b/config/ShieldD/rels/d_a_e_wbD/splits.txt index cdcbb8db187..7c1b6c64fa4 100644 --- a/config/ShieldD/rels/d_a_e_wbD/splits.txt +++ b/config/ShieldD/rels/d_a_e_wbD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_wb.cpp: diff --git a/config/ShieldD/rels/d_a_e_yrD/splits.txt b/config/ShieldD/rels/d_a_e_yrD/splits.txt index f6e89e32112..54759875476 100644 --- a/config/ShieldD/rels/d_a_e_yrD/splits.txt +++ b/config/ShieldD/rels/d_a_e_yrD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yr.cpp: diff --git a/config/ShieldD/rels/d_a_formation_mngD/splits.txt b/config/ShieldD/rels/d_a_formation_mngD/splits.txt index 86f1961daba..fb31570e144 100644 --- a/config/ShieldD/rels/d_a_formation_mngD/splits.txt +++ b/config/ShieldD/rels/d_a_formation_mngD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_formation_mng.cpp: diff --git a/config/ShieldD/rels/d_a_guard_mngD/splits.txt b/config/ShieldD/rels/d_a_guard_mngD/splits.txt index 6c0d1c55c6c..857db2c781c 100644 --- a/config/ShieldD/rels/d_a_guard_mngD/splits.txt +++ b/config/ShieldD/rels/d_a_guard_mngD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_guard_mng.cpp: diff --git a/config/ShieldD/rels/d_a_kytag03D/splits.txt b/config/ShieldD/rels/d_a_kytag03D/splits.txt index aed08138129..c19c4fe062e 100644 --- a/config/ShieldD/rels/d_a_kytag03D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag03D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag03.cpp: diff --git a/config/ShieldD/rels/d_a_kytag06D/splits.txt b/config/ShieldD/rels/d_a_kytag06D/splits.txt index 48228a58d6a..c40873255f5 100644 --- a/config/ShieldD/rels/d_a_kytag06D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag06D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag06.cpp: diff --git a/config/ShieldD/rels/d_a_kytag09D/splits.txt b/config/ShieldD/rels/d_a_kytag09D/splits.txt index e88ad64eb66..294619f7e9b 100644 --- a/config/ShieldD/rels/d_a_kytag09D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag09D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag09.cpp: diff --git a/config/ShieldD/rels/d_a_kytag10D/splits.txt b/config/ShieldD/rels/d_a_kytag10D/splits.txt index fe5f70b9796..1e961e4d76e 100644 --- a/config/ShieldD/rels/d_a_kytag10D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag10D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag10.cpp: diff --git a/config/ShieldD/rels/d_a_kytag11D/splits.txt b/config/ShieldD/rels/d_a_kytag11D/splits.txt index 6956451665c..d90b8558657 100644 --- a/config/ShieldD/rels/d_a_kytag11D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag11D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag11.cpp: diff --git a/config/ShieldD/rels/d_a_kytag13D/splits.txt b/config/ShieldD/rels/d_a_kytag13D/splits.txt index 27963aa1751..b35571eb74f 100644 --- a/config/ShieldD/rels/d_a_kytag13D/splits.txt +++ b/config/ShieldD/rels/d_a_kytag13D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag13.cpp: diff --git a/config/ShieldD/rels/d_a_mg_rodD/splits.txt b/config/ShieldD/rels/d_a_mg_rodD/splits.txt index b47c49f653d..b7dd7b55aa7 100644 --- a/config/ShieldD/rels/d_a_mg_rodD/splits.txt +++ b/config/ShieldD/rels/d_a_mg_rodD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_rod.cpp: diff --git a/config/ShieldD/rels/d_a_mynaD/splits.txt b/config/ShieldD/rels/d_a_mynaD/splits.txt index bf71767b08b..ba2e1558c56 100644 --- a/config/ShieldD/rels/d_a_mynaD/splits.txt +++ b/config/ShieldD/rels/d_a_mynaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_myna.cpp: diff --git a/config/ShieldD/rels/d_a_npc_aruD/splits.txt b/config/ShieldD/rels/d_a_npc_aruD/splits.txt index 920533f40d5..b6aa9ff14dd 100644 --- a/config/ShieldD/rels/d_a_npc_aruD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_aruD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_aru.cpp: diff --git a/config/ShieldD/rels/d_a_npc_ashBD/splits.txt b/config/ShieldD/rels/d_a_npc_ashBD/splits.txt index ed51369053b..8bbbac53a65 100644 --- a/config/ShieldD/rels/d_a_npc_ashBD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_ashBD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ashB.cpp: diff --git a/config/ShieldD/rels/d_a_npc_ashD/splits.txt b/config/ShieldD/rels/d_a_npc_ashD/splits.txt index a6544e7382e..0304af7d0f5 100644 --- a/config/ShieldD/rels/d_a_npc_ashD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_ashD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ash.cpp: diff --git a/config/ShieldD/rels/d_a_npc_bansD/splits.txt b/config/ShieldD/rels/d_a_npc_bansD/splits.txt index fd7875fa325..1d11f165a97 100644 --- a/config/ShieldD/rels/d_a_npc_bansD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_bansD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bans.cpp: diff --git a/config/ShieldD/rels/d_a_npc_besuD/splits.txt b/config/ShieldD/rels/d_a_npc_besuD/splits.txt index 1711ecab714..9e787a88aa9 100644 --- a/config/ShieldD/rels/d_a_npc_besuD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_besuD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_besu.cpp: diff --git a/config/ShieldD/rels/d_a_npc_blue_nsD/splits.txt b/config/ShieldD/rels/d_a_npc_blue_nsD/splits.txt index 42d2be5f673..8287fce7c12 100644 --- a/config/ShieldD/rels/d_a_npc_blue_nsD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_blue_nsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_blue_ns.cpp: diff --git a/config/ShieldD/rels/d_a_npc_bouD/splits.txt b/config/ShieldD/rels/d_a_npc_bouD/splits.txt index 1370d0b40a6..4d8992e5b65 100644 --- a/config/ShieldD/rels/d_a_npc_bouD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_bouD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bou.cpp: diff --git a/config/ShieldD/rels/d_a_npc_bouSD/splits.txt b/config/ShieldD/rels/d_a_npc_bouSD/splits.txt index 84b70bd622a..3adc7286e5d 100644 --- a/config/ShieldD/rels/d_a_npc_bouSD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_bouSD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bouS.cpp: diff --git a/config/ShieldD/rels/d_a_npc_chatD/splits.txt b/config/ShieldD/rels/d_a_npc_chatD/splits.txt index 96d4a32879e..b71d433c5db 100644 --- a/config/ShieldD/rels/d_a_npc_chatD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_chatD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chat.cpp: diff --git a/config/ShieldD/rels/d_a_npc_chinD/splits.txt b/config/ShieldD/rels/d_a_npc_chinD/splits.txt index 8c252297f9d..d3294ae30c2 100644 --- a/config/ShieldD/rels/d_a_npc_chinD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_chinD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chin.cpp: diff --git a/config/ShieldD/rels/d_a_npc_clerkaD/splits.txt b/config/ShieldD/rels/d_a_npc_clerkaD/splits.txt index 4523b594177..f34a9a2c695 100644 --- a/config/ShieldD/rels/d_a_npc_clerkaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_clerkaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerka.cpp: diff --git a/config/ShieldD/rels/d_a_npc_clerkbD/splits.txt b/config/ShieldD/rels/d_a_npc_clerkbD/splits.txt index 79c59933067..8a66b582dde 100644 --- a/config/ShieldD/rels/d_a_npc_clerkbD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_clerkbD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkb.cpp: diff --git a/config/ShieldD/rels/d_a_npc_clerktD/splits.txt b/config/ShieldD/rels/d_a_npc_clerktD/splits.txt index 0cd4113d372..8395681cd62 100644 --- a/config/ShieldD/rels/d_a_npc_clerktD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_clerktD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkt.cpp: diff --git a/config/ShieldD/rels/d_a_npc_coachD/splits.txt b/config/ShieldD/rels/d_a_npc_coachD/splits.txt index 925e3aefa9d..693526fc7e6 100644 --- a/config/ShieldD/rels/d_a_npc_coachD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_coachD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_coach.cpp: diff --git a/config/ShieldD/rels/d_a_npc_dfD/splits.txt b/config/ShieldD/rels/d_a_npc_dfD/splits.txt index 4d93554d092..2d2f38df65f 100644 --- a/config/ShieldD/rels/d_a_npc_dfD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_dfD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_df.cpp: diff --git a/config/ShieldD/rels/d_a_npc_docD/splits.txt b/config/ShieldD/rels/d_a_npc_docD/splits.txt index 356aa53e9cc..a79ed85ab4a 100644 --- a/config/ShieldD/rels/d_a_npc_docD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_docD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doc.cpp: diff --git a/config/ShieldD/rels/d_a_npc_doorboyD/splits.txt b/config/ShieldD/rels/d_a_npc_doorboyD/splits.txt index 2abc8b53a36..da082e799cd 100644 --- a/config/ShieldD/rels/d_a_npc_doorboyD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_doorboyD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doorboy.cpp: diff --git a/config/ShieldD/rels/d_a_npc_drainSolD/splits.txt b/config/ShieldD/rels/d_a_npc_drainSolD/splits.txt index b37ef1004bc..dc98562d608 100644 --- a/config/ShieldD/rels/d_a_npc_drainSolD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_drainSolD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_drainSol.cpp: diff --git a/config/ShieldD/rels/d_a_npc_fairyD/splits.txt b/config/ShieldD/rels/d_a_npc_fairyD/splits.txt index a00c614b942..2530876f92f 100644 --- a/config/ShieldD/rels/d_a_npc_fairyD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_fairyD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy.cpp: diff --git a/config/ShieldD/rels/d_a_npc_fairy_seireiD/splits.txt b/config/ShieldD/rels/d_a_npc_fairy_seireiD/splits.txt index e00d24b3d45..1db98bd6f53 100644 --- a/config/ShieldD/rels/d_a_npc_fairy_seireiD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_fairy_seireiD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy_seirei.cpp: diff --git a/config/ShieldD/rels/d_a_npc_gndD/splits.txt b/config/ShieldD/rels/d_a_npc_gndD/splits.txt index 3ac4a5c21c0..c38af571769 100644 --- a/config/ShieldD/rels/d_a_npc_gndD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_gndD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gnd.cpp: diff --git a/config/ShieldD/rels/d_a_npc_graD/splits.txt b/config/ShieldD/rels/d_a_npc_graD/splits.txt index c61ff15eb58..9f22f09d040 100644 --- a/config/ShieldD/rels/d_a_npc_graD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_graD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gra.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grcD/splits.txt b/config/ShieldD/rels/d_a_npc_grcD/splits.txt index 73b01a7ce8a..07dba587105 100644 --- a/config/ShieldD/rels/d_a_npc_grcD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grcD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grc.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grdD/splits.txt b/config/ShieldD/rels/d_a_npc_grdD/splits.txt index a5e06ea4457..8689edd5caf 100644 --- a/config/ShieldD/rels/d_a_npc_grdD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grdD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grd.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grmD/splits.txt b/config/ShieldD/rels/d_a_npc_grmD/splits.txt index 77c5ac9e395..5cd4773f093 100644 --- a/config/ShieldD/rels/d_a_npc_grmD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grmD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grm.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grmcD/splits.txt b/config/ShieldD/rels/d_a_npc_grmcD/splits.txt index 7619200a113..a532b3470df 100644 --- a/config/ShieldD/rels/d_a_npc_grmcD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grmcD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grmc.cpp: diff --git a/config/ShieldD/rels/d_a_npc_groD/splits.txt b/config/ShieldD/rels/d_a_npc_groD/splits.txt index 4066247674a..f1c29cc9047 100644 --- a/config/ShieldD/rels/d_a_npc_groD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_groD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gro.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grrD/splits.txt b/config/ShieldD/rels/d_a_npc_grrD/splits.txt index 2e288b5d919..7e71c3189f9 100644 --- a/config/ShieldD/rels/d_a_npc_grrD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grrD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grr.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grsD/splits.txt b/config/ShieldD/rels/d_a_npc_grsD/splits.txt index 70d6e1c93f6..451e71e29e0 100644 --- a/config/ShieldD/rels/d_a_npc_grsD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grs.cpp: diff --git a/config/ShieldD/rels/d_a_npc_grzD/splits.txt b/config/ShieldD/rels/d_a_npc_grzD/splits.txt index 534a85ea3b1..248842358cd 100644 --- a/config/ShieldD/rels/d_a_npc_grzD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_grzD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grz.cpp: diff --git a/config/ShieldD/rels/d_a_npc_gwolfD/splits.txt b/config/ShieldD/rels/d_a_npc_gwolfD/splits.txt index b1cc23e1f40..48204222338 100644 --- a/config/ShieldD/rels/d_a_npc_gwolfD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_gwolfD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gwolf.cpp: diff --git a/config/ShieldD/rels/d_a_npc_hanjoD/splits.txt b/config/ShieldD/rels/d_a_npc_hanjoD/splits.txt index 3c7e20fef4f..55f6932759d 100644 --- a/config/ShieldD/rels/d_a_npc_hanjoD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_hanjoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hanjo.cpp: diff --git a/config/ShieldD/rels/d_a_npc_hozD/splits.txt b/config/ShieldD/rels/d_a_npc_hozD/splits.txt index d24e8595dd4..dbf940d8c80 100644 --- a/config/ShieldD/rels/d_a_npc_hozD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_hozD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hoz.cpp: diff --git a/config/ShieldD/rels/d_a_npc_impalD/splits.txt b/config/ShieldD/rels/d_a_npc_impalD/splits.txt index b9d8c1addc2..765b30f5829 100644 --- a/config/ShieldD/rels/d_a_npc_impalD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_impalD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_impal.cpp: diff --git a/config/ShieldD/rels/d_a_npc_insD/splits.txt b/config/ShieldD/rels/d_a_npc_insD/splits.txt index 50bb0990bdb..0d558c1bc53 100644 --- a/config/ShieldD/rels/d_a_npc_insD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_insD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ins.cpp: diff --git a/config/ShieldD/rels/d_a_npc_jagarD/splits.txt b/config/ShieldD/rels/d_a_npc_jagarD/splits.txt index 00ee9eaf399..fb311c9cb17 100644 --- a/config/ShieldD/rels/d_a_npc_jagarD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_jagarD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_jagar.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kakashiD/splits.txt b/config/ShieldD/rels/d_a_npc_kakashiD/splits.txt index 2031f5feba1..4d2ab40e18e 100644 --- a/config/ShieldD/rels/d_a_npc_kakashiD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kakashiD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kakashi.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kasi_hanaD/splits.txt b/config/ShieldD/rels/d_a_npc_kasi_hanaD/splits.txt index a40f692f946..e5ff55aaca0 100644 --- a/config/ShieldD/rels/d_a_npc_kasi_hanaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kasi_hanaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_hana.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kasi_kyuD/splits.txt b/config/ShieldD/rels/d_a_npc_kasi_kyuD/splits.txt index 47ff3d121cc..4ece85a3ce5 100644 --- a/config/ShieldD/rels/d_a_npc_kasi_kyuD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kasi_kyuD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_kyu.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kasi_michD/splits.txt b/config/ShieldD/rels/d_a_npc_kasi_michD/splits.txt index 4d53d25457e..c58742b32b8 100644 --- a/config/ShieldD/rels/d_a_npc_kasi_michD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kasi_michD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_mich.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kdkD/splits.txt b/config/ShieldD/rels/d_a_npc_kdkD/splits.txt index e0ba72e6b7c..197901f5cfd 100644 --- a/config/ShieldD/rels/d_a_npc_kdkD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kdkD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kdk.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kkriD/splits.txt b/config/ShieldD/rels/d_a_npc_kkriD/splits.txt index 8ed9650e2ed..c4970faab20 100644 --- a/config/ShieldD/rels/d_a_npc_kkriD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kkriD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kkri.cpp: diff --git a/config/ShieldD/rels/d_a_npc_knD/splits.txt b/config/ShieldD/rels/d_a_npc_knD/splits.txt index 8b0805ed01a..b6e7aec9ed5 100644 --- a/config/ShieldD/rels/d_a_npc_knD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_knD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kn.cpp: diff --git a/config/ShieldD/rels/d_a_npc_knjD/splits.txt b/config/ShieldD/rels/d_a_npc_knjD/splits.txt index 75378b76473..aaa9faaa63b 100644 --- a/config/ShieldD/rels/d_a_npc_knjD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_knjD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_knj.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kolinD/splits.txt b/config/ShieldD/rels/d_a_npc_kolinD/splits.txt index 30e2446bf25..ceec43b1c89 100644 --- a/config/ShieldD/rels/d_a_npc_kolinD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kolinD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolin.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kolinbD/splits.txt b/config/ShieldD/rels/d_a_npc_kolinbD/splits.txt index 064331f516b..485e756e089 100644 --- a/config/ShieldD/rels/d_a_npc_kolinbD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kolinbD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolinb.cpp: diff --git a/config/ShieldD/rels/d_a_npc_kyuryD/splits.txt b/config/ShieldD/rels/d_a_npc_kyuryD/splits.txt index 96e83073497..7f2e6afbe29 100644 --- a/config/ShieldD/rels/d_a_npc_kyuryD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_kyuryD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kyury.cpp: diff --git a/config/ShieldD/rels/d_a_npc_lenD/splits.txt b/config/ShieldD/rels/d_a_npc_lenD/splits.txt index 1c6b911da63..1d081dd4491 100644 --- a/config/ShieldD/rels/d_a_npc_lenD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_lenD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_len.cpp: diff --git a/config/ShieldD/rels/d_a_npc_ludD/splits.txt b/config/ShieldD/rels/d_a_npc_ludD/splits.txt index d72c0c8742d..5044b7a327b 100644 --- a/config/ShieldD/rels/d_a_npc_ludD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_ludD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lud.cpp: diff --git a/config/ShieldD/rels/d_a_npc_maroD/splits.txt b/config/ShieldD/rels/d_a_npc_maroD/splits.txt index 4cb533cde4d..09018bca8fb 100644 --- a/config/ShieldD/rels/d_a_npc_maroD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_maroD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_maro.cpp: diff --git a/config/ShieldD/rels/d_a_npc_midpD/splits.txt b/config/ShieldD/rels/d_a_npc_midpD/splits.txt index d5a327cead4..2da0a622ec8 100644 --- a/config/ShieldD/rels/d_a_npc_midpD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_midpD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_midp.cpp: diff --git a/config/ShieldD/rels/d_a_npc_moiD/splits.txt b/config/ShieldD/rels/d_a_npc_moiD/splits.txt index 0354394a1ee..873920a680e 100644 --- a/config/ShieldD/rels/d_a_npc_moiD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_moiD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moi.cpp: diff --git a/config/ShieldD/rels/d_a_npc_moirD/splits.txt b/config/ShieldD/rels/d_a_npc_moirD/splits.txt index 10ab2f90140..a452e79dc11 100644 --- a/config/ShieldD/rels/d_a_npc_moirD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_moirD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moir.cpp: diff --git a/config/ShieldD/rels/d_a_npc_myna2D/splits.txt b/config/ShieldD/rels/d_a_npc_myna2D/splits.txt index a42547fc13b..5cdfeaf083e 100644 --- a/config/ShieldD/rels/d_a_npc_myna2D/splits.txt +++ b/config/ShieldD/rels/d_a_npc_myna2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_myna2.cpp: diff --git a/config/ShieldD/rels/d_a_npc_pachi_besuD/splits.txt b/config/ShieldD/rels/d_a_npc_pachi_besuD/splits.txt index b6cd7164a35..eef09111f45 100644 --- a/config/ShieldD/rels/d_a_npc_pachi_besuD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_pachi_besuD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_besu.cpp: diff --git a/config/ShieldD/rels/d_a_npc_pachi_maroD/splits.txt b/config/ShieldD/rels/d_a_npc_pachi_maroD/splits.txt index 3e348890935..45bbb9c3a68 100644 --- a/config/ShieldD/rels/d_a_npc_pachi_maroD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_pachi_maroD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_maro.cpp: diff --git a/config/ShieldD/rels/d_a_npc_pachi_taroD/splits.txt b/config/ShieldD/rels/d_a_npc_pachi_taroD/splits.txt index 8da39ba233d..0ef4afe7127 100644 --- a/config/ShieldD/rels/d_a_npc_pachi_taroD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_pachi_taroD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_taro.cpp: diff --git a/config/ShieldD/rels/d_a_npc_postD/splits.txt b/config/ShieldD/rels/d_a_npc_postD/splits.txt index 0a1e7baa0cb..99b365ed7cd 100644 --- a/config/ShieldD/rels/d_a_npc_postD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_postD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_post.cpp: diff --git a/config/ShieldD/rels/d_a_npc_pouyaD/splits.txt b/config/ShieldD/rels/d_a_npc_pouyaD/splits.txt index f614cc6d0f0..e5beddf056e 100644 --- a/config/ShieldD/rels/d_a_npc_pouyaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_pouyaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pouya.cpp: diff --git a/config/ShieldD/rels/d_a_npc_prayerD/splits.txt b/config/ShieldD/rels/d_a_npc_prayerD/splits.txt index 087e4ec1c87..2d330f5561b 100644 --- a/config/ShieldD/rels/d_a_npc_prayerD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_prayerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_prayer.cpp: diff --git a/config/ShieldD/rels/d_a_npc_racaD/splits.txt b/config/ShieldD/rels/d_a_npc_racaD/splits.txt index 2e533f75f53..602c0bd8730 100644 --- a/config/ShieldD/rels/d_a_npc_racaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_racaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_raca.cpp: diff --git a/config/ShieldD/rels/d_a_npc_rafrelD/splits.txt b/config/ShieldD/rels/d_a_npc_rafrelD/splits.txt index bfdac54aef1..79ac98ea009 100644 --- a/config/ShieldD/rels/d_a_npc_rafrelD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_rafrelD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_rafrel.cpp: diff --git a/config/ShieldD/rels/d_a_npc_saruD/splits.txt b/config/ShieldD/rels/d_a_npc_saruD/splits.txt index 000a31af82b..879342da72a 100644 --- a/config/ShieldD/rels/d_a_npc_saruD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_saruD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_saru.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seibD/splits.txt b/config/ShieldD/rels/d_a_npc_seibD/splits.txt index c84bc8c0616..c9063d2aa6b 100644 --- a/config/ShieldD/rels/d_a_npc_seibD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seibD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seib.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seicD/splits.txt b/config/ShieldD/rels/d_a_npc_seicD/splits.txt index 56bb03dd3f3..b626773e85c 100644 --- a/config/ShieldD/rels/d_a_npc_seicD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seicD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seic.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seidD/splits.txt b/config/ShieldD/rels/d_a_npc_seidD/splits.txt index 7ed0dc147b4..ffaff0e6454 100644 --- a/config/ShieldD/rels/d_a_npc_seidD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seidD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seid.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seira2D/splits.txt b/config/ShieldD/rels/d_a_npc_seira2D/splits.txt index c3a85a511db..6f249977d39 100644 --- a/config/ShieldD/rels/d_a_npc_seira2D/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seira2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira2.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seiraD/splits.txt b/config/ShieldD/rels/d_a_npc_seiraD/splits.txt index fee0af4068d..28cd889f942 100644 --- a/config/ShieldD/rels/d_a_npc_seiraD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seiraD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira.cpp: diff --git a/config/ShieldD/rels/d_a_npc_seireiD/splits.txt b/config/ShieldD/rels/d_a_npc_seireiD/splits.txt index 9027f9e9453..ac4b0cfc865 100644 --- a/config/ShieldD/rels/d_a_npc_seireiD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_seireiD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seirei.cpp: diff --git a/config/ShieldD/rels/d_a_npc_shadD/splits.txt b/config/ShieldD/rels/d_a_npc_shadD/splits.txt index 04e80723822..3a350cff9a4 100644 --- a/config/ShieldD/rels/d_a_npc_shadD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_shadD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shad.cpp: diff --git a/config/ShieldD/rels/d_a_npc_shamanD/splits.txt b/config/ShieldD/rels/d_a_npc_shamanD/splits.txt index b84f3fbd75a..1fc12ee96b3 100644 --- a/config/ShieldD/rels/d_a_npc_shamanD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_shamanD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shaman.cpp: diff --git a/config/ShieldD/rels/d_a_npc_shoeD/splits.txt b/config/ShieldD/rels/d_a_npc_shoeD/splits.txt index 9b19264ef03..79329fe48be 100644 --- a/config/ShieldD/rels/d_a_npc_shoeD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_shoeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shoe.cpp: diff --git a/config/ShieldD/rels/d_a_npc_solaD/splits.txt b/config/ShieldD/rels/d_a_npc_solaD/splits.txt index 15c3d8bcb31..b6dca63fec2 100644 --- a/config/ShieldD/rels/d_a_npc_solaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_solaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sola.cpp: diff --git a/config/ShieldD/rels/d_a_npc_soldierAD/splits.txt b/config/ShieldD/rels/d_a_npc_soldierAD/splits.txt index cf394fbf772..dea4eb367d0 100644 --- a/config/ShieldD/rels/d_a_npc_soldierAD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_soldierAD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierA.cpp: diff --git a/config/ShieldD/rels/d_a_npc_soldierBD/splits.txt b/config/ShieldD/rels/d_a_npc_soldierBD/splits.txt index 0ab9a833dc2..180088f7935 100644 --- a/config/ShieldD/rels/d_a_npc_soldierBD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_soldierBD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierB.cpp: diff --git a/config/ShieldD/rels/d_a_npc_taroD/splits.txt b/config/ShieldD/rels/d_a_npc_taroD/splits.txt index 78c59661131..d33b0d12958 100644 --- a/config/ShieldD/rels/d_a_npc_taroD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_taroD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_taro.cpp: diff --git a/config/ShieldD/rels/d_a_npc_theBD/splits.txt b/config/ShieldD/rels/d_a_npc_theBD/splits.txt index 9b087d8673d..109349d7148 100644 --- a/config/ShieldD/rels/d_a_npc_theBD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_theBD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_theB.cpp: diff --git a/config/ShieldD/rels/d_a_npc_theD/splits.txt b/config/ShieldD/rels/d_a_npc_theD/splits.txt index fc7424e3140..af4d2885c97 100644 --- a/config/ShieldD/rels/d_a_npc_theD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_theD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_the.cpp: diff --git a/config/ShieldD/rels/d_a_npc_tkcD/splits.txt b/config/ShieldD/rels/d_a_npc_tkcD/splits.txt index 3e5a6e59b21..5d0b76eea9e 100644 --- a/config/ShieldD/rels/d_a_npc_tkcD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_tkcD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkc.cpp: diff --git a/config/ShieldD/rels/d_a_npc_tkjD/splits.txt b/config/ShieldD/rels/d_a_npc_tkjD/splits.txt index 63a5e652aea..9ee34d48ad7 100644 --- a/config/ShieldD/rels/d_a_npc_tkjD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_tkjD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj.cpp: diff --git a/config/ShieldD/rels/d_a_npc_tksD/splits.txt b/config/ShieldD/rels/d_a_npc_tksD/splits.txt index 0292fe7a856..2c262e6aebf 100644 --- a/config/ShieldD/rels/d_a_npc_tksD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_tksD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tks.cpp: diff --git a/config/ShieldD/rels/d_a_npc_tobyD/splits.txt b/config/ShieldD/rels/d_a_npc_tobyD/splits.txt index 0df46c723bf..8420aa0c406 100644 --- a/config/ShieldD/rels/d_a_npc_tobyD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_tobyD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_toby.cpp: diff --git a/config/ShieldD/rels/d_a_npc_uriD/splits.txt b/config/ShieldD/rels/d_a_npc_uriD/splits.txt index 4c36539fc26..53eb34c01e3 100644 --- a/config/ShieldD/rels/d_a_npc_uriD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_uriD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_uri.cpp: diff --git a/config/ShieldD/rels/d_a_npc_wrestlerD/splits.txt b/config/ShieldD/rels/d_a_npc_wrestlerD/splits.txt index 58d4d25a360..ddee37475dd 100644 --- a/config/ShieldD/rels/d_a_npc_wrestlerD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_wrestlerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_wrestler.cpp: diff --git a/config/ShieldD/rels/d_a_npc_yamidD/splits.txt b/config/ShieldD/rels/d_a_npc_yamidD/splits.txt index da7e7e7a251..77dd9701224 100644 --- a/config/ShieldD/rels/d_a_npc_yamidD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_yamidD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamid.cpp: diff --git a/config/ShieldD/rels/d_a_npc_yamisD/splits.txt b/config/ShieldD/rels/d_a_npc_yamisD/splits.txt index 71008cdb7df..036ef304cd0 100644 --- a/config/ShieldD/rels/d_a_npc_yamisD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_yamisD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamis.cpp: diff --git a/config/ShieldD/rels/d_a_npc_yamitD/splits.txt b/config/ShieldD/rels/d_a_npc_yamitD/splits.txt index d8a9641102f..0374743be38 100644 --- a/config/ShieldD/rels/d_a_npc_yamitD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_yamitD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamit.cpp: diff --git a/config/ShieldD/rels/d_a_npc_yeliaD/splits.txt b/config/ShieldD/rels/d_a_npc_yeliaD/splits.txt index a115d485b1b..6cb1fc85237 100644 --- a/config/ShieldD/rels/d_a_npc_yeliaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_yeliaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yelia.cpp: diff --git a/config/ShieldD/rels/d_a_npc_ykmD/splits.txt b/config/ShieldD/rels/d_a_npc_ykmD/splits.txt index 4228f56ac10..091224456ec 100644 --- a/config/ShieldD/rels/d_a_npc_ykmD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_ykmD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykm.cpp: diff --git a/config/ShieldD/rels/d_a_npc_ykwD/splits.txt b/config/ShieldD/rels/d_a_npc_ykwD/splits.txt index 86906e21df8..8d3fbed0c65 100644 --- a/config/ShieldD/rels/d_a_npc_ykwD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_ykwD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykw.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zanbD/splits.txt b/config/ShieldD/rels/d_a_npc_zanbD/splits.txt index 6ca2f084afc..6137afc4b17 100644 --- a/config/ShieldD/rels/d_a_npc_zanbD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zanbD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zanb.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zantD/splits.txt b/config/ShieldD/rels/d_a_npc_zantD/splits.txt index d2a37fba2b1..749521d9731 100644 --- a/config/ShieldD/rels/d_a_npc_zantD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zantD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zant.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zelRD/splits.txt b/config/ShieldD/rels/d_a_npc_zelRD/splits.txt index f74a9ad643c..75ab4c6b030 100644 --- a/config/ShieldD/rels/d_a_npc_zelRD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zelRD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelR.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zelRoD/splits.txt b/config/ShieldD/rels/d_a_npc_zelRoD/splits.txt index 12b11ac37b1..707968c3ae0 100644 --- a/config/ShieldD/rels/d_a_npc_zelRoD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zelRoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelRo.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zeldaD/splits.txt b/config/ShieldD/rels/d_a_npc_zeldaD/splits.txt index 7a3d77c810c..1bf512ec145 100644 --- a/config/ShieldD/rels/d_a_npc_zeldaD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zeldaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelda.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zraD/splits.txt b/config/ShieldD/rels/d_a_npc_zraD/splits.txt index a386de7f338..8b73bc95460 100644 --- a/config/ShieldD/rels/d_a_npc_zraD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zraD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zra.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zrcD/splits.txt b/config/ShieldD/rels/d_a_npc_zrcD/splits.txt index 0fd526a44ec..508ea8f3fbf 100644 --- a/config/ShieldD/rels/d_a_npc_zrcD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zrcD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrc.cpp: diff --git a/config/ShieldD/rels/d_a_npc_zrzD/splits.txt b/config/ShieldD/rels/d_a_npc_zrzD/splits.txt index 983c6acfe16..9b56ac92835 100644 --- a/config/ShieldD/rels/d_a_npc_zrzD/splits.txt +++ b/config/ShieldD/rels/d_a_npc_zrzD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrz.cpp: diff --git a/config/ShieldD/rels/d_a_obj_TuraraD/splits.txt b/config/ShieldD/rels/d_a_obj_TuraraD/splits.txt index 02db91e784a..3971648e708 100644 --- a/config/ShieldD/rels/d_a_obj_TuraraD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_TuraraD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Turara.cpp: diff --git a/config/ShieldD/rels/d_a_obj_TvCdlstD/splits.txt b/config/ShieldD/rels/d_a_obj_TvCdlstD/splits.txt index 14bb2ddc017..f0a5b723a22 100644 --- a/config/ShieldD/rels/d_a_obj_TvCdlstD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_TvCdlstD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_TvCdlst.cpp: diff --git a/config/ShieldD/rels/d_a_obj_Y_taihouD/splits.txt b/config/ShieldD/rels/d_a_obj_Y_taihouD/splits.txt index 295674599e0..97fa4e91424 100644 --- a/config/ShieldD/rels/d_a_obj_Y_taihouD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_Y_taihouD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Y_taihou.cpp: diff --git a/config/ShieldD/rels/d_a_obj_amiShutterD/splits.txt b/config/ShieldD/rels/d_a_obj_amiShutterD/splits.txt index 0252f3620bb..4c9fcac0dfc 100644 --- a/config/ShieldD/rels/d_a_obj_amiShutterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_amiShutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_amiShutter.cpp: diff --git a/config/ShieldD/rels/d_a_obj_automataD/splits.txt b/config/ShieldD/rels/d_a_obj_automataD/splits.txt index 5b9230b8979..c9ccfaab90a 100644 --- a/config/ShieldD/rels/d_a_obj_automataD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_automataD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_automata.cpp: diff --git a/config/ShieldD/rels/d_a_obj_avalancheD/splits.txt b/config/ShieldD/rels/d_a_obj_avalancheD/splits.txt index e11feb7f10a..c19b2cbe6ad 100644 --- a/config/ShieldD/rels/d_a_obj_avalancheD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_avalancheD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_avalanche.cpp: diff --git a/config/ShieldD/rels/d_a_obj_barDeskD/splits.txt b/config/ShieldD/rels/d_a_obj_barDeskD/splits.txt index 0ab8c31edfe..280c5e33989 100644 --- a/config/ShieldD/rels/d_a_obj_barDeskD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_barDeskD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_barDesk.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bboxD/splits.txt b/config/ShieldD/rels/d_a_obj_bboxD/splits.txt index d18c81b549c..d4975a7932e 100644 --- a/config/ShieldD/rels/d_a_obj_bboxD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bboxD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bbox.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bedD/splits.txt b/config/ShieldD/rels/d_a_obj_bedD/splits.txt index ee4681332f3..bfef77155a9 100644 --- a/config/ShieldD/rels/d_a_obj_bedD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bedD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bed.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bemosD/splits.txt b/config/ShieldD/rels/d_a_obj_bemosD/splits.txt index a7d642e0603..b7c77dce399 100644 --- a/config/ShieldD/rels/d_a_obj_bemosD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bemosD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bemos.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bk_leafD/splits.txt b/config/ShieldD/rels/d_a_obj_bk_leafD/splits.txt index f3c5050278e..b0c604fa69a 100644 --- a/config/ShieldD/rels/d_a_obj_bk_leafD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bk_leafD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bk_leaf.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bkdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_bkdoorD/splits.txt index 93ad82d4109..4a6d60d049c 100644 --- a/config/ShieldD/rels/d_a_obj_bkdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bkdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bkdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bmWindowD/splits.txt b/config/ShieldD/rels/d_a_obj_bmWindowD/splits.txt index 3a66ec252c9..c0dd3eca954 100644 --- a/config/ShieldD/rels/d_a_obj_bmWindowD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bmWindowD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bmWindow.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bmshutterD/splits.txt b/config/ShieldD/rels/d_a_obj_bmshutterD/splits.txt index bfd7cf51b3b..4685caa6641 100644 --- a/config/ShieldD/rels/d_a_obj_bmshutterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bmshutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bmshutter.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bosswarpD/splits.txt b/config/ShieldD/rels/d_a_obj_bosswarpD/splits.txt index e1ee078c8af..137be5551a8 100644 --- a/config/ShieldD/rels/d_a_obj_bosswarpD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bosswarpD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bosswarp.cpp: diff --git a/config/ShieldD/rels/d_a_obj_boumatoD/splits.txt b/config/ShieldD/rels/d_a_obj_boumatoD/splits.txt index 2db327a07fa..89d48003bad 100644 --- a/config/ShieldD/rels/d_a_obj_boumatoD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_boumatoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_boumato.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bsGateD/splits.txt b/config/ShieldD/rels/d_a_obj_bsGateD/splits.txt index 290faea7e79..10813ee82e0 100644 --- a/config/ShieldD/rels/d_a_obj_bsGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bsGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bsGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_bubblePilarD/splits.txt b/config/ShieldD/rels/d_a_obj_bubblePilarD/splits.txt index f5f0e61fae9..a9c089d04fa 100644 --- a/config/ShieldD/rels/d_a_obj_bubblePilarD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_bubblePilarD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bubblePilar.cpp: diff --git a/config/ShieldD/rels/d_a_obj_catdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_catdoorD/splits.txt index 5e8d819c149..dfe32ca26a5 100644 --- a/config/ShieldD/rels/d_a_obj_catdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_catdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_catdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_cblockD/splits.txt b/config/ShieldD/rels/d_a_obj_cblockD/splits.txt index 512475bb586..e59b526dbf7 100644 --- a/config/ShieldD/rels/d_a_obj_cblockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_cblockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cblock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_chestD/splits.txt b/config/ShieldD/rels/d_a_obj_chestD/splits.txt index 314b086f08d..546083c2948 100644 --- a/config/ShieldD/rels/d_a_obj_chestD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_chestD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_chest.cpp: diff --git a/config/ShieldD/rels/d_a_obj_cwallD/splits.txt b/config/ShieldD/rels/d_a_obj_cwallD/splits.txt index a0e2336fde1..96b824c235e 100644 --- a/config/ShieldD/rels/d_a_obj_cwallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_cwallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cwall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_damCpsD/splits.txt b/config/ShieldD/rels/d_a_obj_damCpsD/splits.txt index 35c704bd202..f566c075fca 100644 --- a/config/ShieldD/rels/d_a_obj_damCpsD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_damCpsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_damCps.cpp: diff --git a/config/ShieldD/rels/d_a_obj_digsnowD/splits.txt b/config/ShieldD/rels/d_a_obj_digsnowD/splits.txt index 29a7c7f64e8..790f0e68dd2 100644 --- a/config/ShieldD/rels/d_a_obj_digsnowD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_digsnowD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_digsnow.cpp: diff --git a/config/ShieldD/rels/d_a_obj_dmelevatorD/splits.txt b/config/ShieldD/rels/d_a_obj_dmelevatorD/splits.txt index ab8471141a5..124185c4cfc 100644 --- a/config/ShieldD/rels/d_a_obj_dmelevatorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_dmelevatorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dmelevator.cpp: diff --git a/config/ShieldD/rels/d_a_obj_dropD/splits.txt b/config/ShieldD/rels/d_a_obj_dropD/splits.txt index d366f53af8d..9d75e2980cd 100644 --- a/config/ShieldD/rels/d_a_obj_dropD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_dropD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_drop.cpp: diff --git a/config/ShieldD/rels/d_a_obj_fallobjD/splits.txt b/config/ShieldD/rels/d_a_obj_fallobjD/splits.txt index 46e7980f71b..420bea9b987 100644 --- a/config/ShieldD/rels/d_a_obj_fallobjD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_fallobjD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fallobj.cpp: diff --git a/config/ShieldD/rels/d_a_obj_fanD/splits.txt b/config/ShieldD/rels/d_a_obj_fanD/splits.txt index e4f5895a7c5..652e460a3fa 100644 --- a/config/ShieldD/rels/d_a_obj_fanD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_fanD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fan.cpp: diff --git a/config/ShieldD/rels/d_a_obj_fireWood2D/splits.txt b/config/ShieldD/rels/d_a_obj_fireWood2D/splits.txt index c616647e53b..29a231e9fc7 100644 --- a/config/ShieldD/rels/d_a_obj_fireWood2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_fireWood2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_fireWoodD/splits.txt b/config/ShieldD/rels/d_a_obj_fireWoodD/splits.txt index f5d59b98dc4..43156f7ef07 100644 --- a/config/ShieldD/rels/d_a_obj_fireWoodD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_fireWoodD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood.cpp: diff --git a/config/ShieldD/rels/d_a_obj_firepillar2D/splits.txt b/config/ShieldD/rels/d_a_obj_firepillar2D/splits.txt index 3cdd9df53b6..89f911242cd 100644 --- a/config/ShieldD/rels/d_a_obj_firepillar2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_firepillar2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_firepillar2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_firepillarD/splits.txt b/config/ShieldD/rels/d_a_obj_firepillarD/splits.txt index 82d23ecd81a..c8c3ec83402 100644 --- a/config/ShieldD/rels/d_a_obj_firepillarD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_firepillarD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_firepillar.cpp: diff --git a/config/ShieldD/rels/d_a_obj_gadgetD/splits.txt b/config/ShieldD/rels/d_a_obj_gadgetD/splits.txt index 50a326be1da..6eacc96c480 100644 --- a/config/ShieldD/rels/d_a_obj_gadgetD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_gadgetD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gadget.cpp: diff --git a/config/ShieldD/rels/d_a_obj_ganonwall2D/splits.txt b/config/ShieldD/rels/d_a_obj_ganonwall2D/splits.txt index f7ca5896228..adb080ac5bf 100644 --- a/config/ShieldD/rels/d_a_obj_ganonwall2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_ganonwall2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ganonwall2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_ganonwallD/splits.txt b/config/ShieldD/rels/d_a_obj_ganonwallD/splits.txt index d087069064c..18bac6c7b72 100644 --- a/config/ShieldD/rels/d_a_obj_ganonwallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_ganonwallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ganonwall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_geyserD/splits.txt b/config/ShieldD/rels/d_a_obj_geyserD/splits.txt index f6efebc40a9..c11d2a0501c 100644 --- a/config/ShieldD/rels/d_a_obj_geyserD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_geyserD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_geyser.cpp: diff --git a/config/ShieldD/rels/d_a_obj_glowSphereD/splits.txt b/config/ShieldD/rels/d_a_obj_glowSphereD/splits.txt index 2134c1931f6..1c27dbbb6cd 100644 --- a/config/ShieldD/rels/d_a_obj_glowSphereD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_glowSphereD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_glowSphere.cpp: diff --git a/config/ShieldD/rels/d_a_obj_goGateD/splits.txt b/config/ShieldD/rels/d_a_obj_goGateD/splits.txt index 6b953610144..a619270e00a 100644 --- a/config/ShieldD/rels/d_a_obj_goGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_goGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_goGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_gpTaruD/splits.txt b/config/ShieldD/rels/d_a_obj_gpTaruD/splits.txt index 774bc206f8a..0150248798f 100644 --- a/config/ShieldD/rels/d_a_obj_gpTaruD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_gpTaruD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gpTaru.cpp: diff --git a/config/ShieldD/rels/d_a_obj_gra2D/splits.txt b/config/ShieldD/rels/d_a_obj_gra2D/splits.txt index c886654e7a7..ef111526be8 100644 --- a/config/ShieldD/rels/d_a_obj_gra2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_gra2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gra2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_graWallD/splits.txt b/config/ShieldD/rels/d_a_obj_graWallD/splits.txt index fbf5b87e110..94a22e041a6 100644 --- a/config/ShieldD/rels/d_a_obj_graWallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_graWallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_graWall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_gra_rockD/splits.txt b/config/ShieldD/rels/d_a_obj_gra_rockD/splits.txt index 669a0009127..81d47284fa3 100644 --- a/config/ShieldD/rels/d_a_obj_gra_rockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_gra_rockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gra_rock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_grave_stoneD/splits.txt b/config/ShieldD/rels/d_a_obj_grave_stoneD/splits.txt index 57e5e0d1a04..a50b056d2fb 100644 --- a/config/ShieldD/rels/d_a_obj_grave_stoneD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_grave_stoneD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_grave_stone.cpp: diff --git a/config/ShieldD/rels/d_a_obj_groundwaterD/splits.txt b/config/ShieldD/rels/d_a_obj_groundwaterD/splits.txt index 443945a0c45..91143059ac7 100644 --- a/config/ShieldD/rels/d_a_obj_groundwaterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_groundwaterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_groundwater.cpp: diff --git a/config/ShieldD/rels/d_a_obj_grz_rockD/splits.txt b/config/ShieldD/rels/d_a_obj_grz_rockD/splits.txt index e831ae5df44..3e507d8cdd0 100644 --- a/config/ShieldD/rels/d_a_obj_grz_rockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_grz_rockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_grz_rock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_hbombkoyaD/splits.txt b/config/ShieldD/rels/d_a_obj_hbombkoyaD/splits.txt index adc7596ce1b..a24ea77574f 100644 --- a/config/ShieldD/rels/d_a_obj_hbombkoyaD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_hbombkoyaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hbombkoya.cpp: diff --git a/config/ShieldD/rels/d_a_obj_heavySwD/splits.txt b/config/ShieldD/rels/d_a_obj_heavySwD/splits.txt index 9133252c25b..22ec32e1f2f 100644 --- a/config/ShieldD/rels/d_a_obj_heavySwD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_heavySwD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_heavySw.cpp: diff --git a/config/ShieldD/rels/d_a_obj_hfutaD/splits.txt b/config/ShieldD/rels/d_a_obj_hfutaD/splits.txt index 5ee2ff83c7b..377fd7a3177 100644 --- a/config/ShieldD/rels/d_a_obj_hfutaD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_hfutaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hfuta.cpp: diff --git a/config/ShieldD/rels/d_a_obj_hsTargetD/splits.txt b/config/ShieldD/rels/d_a_obj_hsTargetD/splits.txt index 5ec7b81dc6e..3c9e52cfc30 100644 --- a/config/ShieldD/rels/d_a_obj_hsTargetD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_hsTargetD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hsTarget.cpp: diff --git a/config/ShieldD/rels/d_a_obj_iceblockD/splits.txt b/config/ShieldD/rels/d_a_obj_iceblockD/splits.txt index 7c7ab5abdef..3301210a506 100644 --- a/config/ShieldD/rels/d_a_obj_iceblockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_iceblockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_iceblock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_iceleafD/splits.txt b/config/ShieldD/rels/d_a_obj_iceleafD/splits.txt index 3211be9cf3d..7f761d07845 100644 --- a/config/ShieldD/rels/d_a_obj_iceleafD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_iceleafD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_iceleaf.cpp: diff --git a/config/ShieldD/rels/d_a_obj_inoboneD/splits.txt b/config/ShieldD/rels/d_a_obj_inoboneD/splits.txt index 4b350c9f97e..77e1d94affe 100644 --- a/config/ShieldD/rels/d_a_obj_inoboneD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_inoboneD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_inobone.cpp: diff --git a/config/ShieldD/rels/d_a_obj_itamatoD/splits.txt b/config/ShieldD/rels/d_a_obj_itamatoD/splits.txt index 30866ab0121..dc5e559cfdf 100644 --- a/config/ShieldD/rels/d_a_obj_itamatoD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_itamatoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_itamato.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kagoD/splits.txt b/config/ShieldD/rels/d_a_obj_kagoD/splits.txt index 4c65e635c20..d72c4511cf7 100644 --- a/config/ShieldD/rels/d_a_obj_kagoD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kagoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kago.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kanteraD/splits.txt b/config/ShieldD/rels/d_a_obj_kanteraD/splits.txt index 9b0a5e5855e..a4bd5c57d57 100644 --- a/config/ShieldD/rels/d_a_obj_kanteraD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kanteraD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kantera.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kbacketD/splits.txt b/config/ShieldD/rels/d_a_obj_kbacketD/splits.txt index 7da696f68e9..104ea6bf47e 100644 --- a/config/ShieldD/rels/d_a_obj_kbacketD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kbacketD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbacket.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kgateD/splits.txt b/config/ShieldD/rels/d_a_obj_kgateD/splits.txt index a32cf23ae07..5711e2db489 100644 --- a/config/ShieldD/rels/d_a_obj_kgateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kgateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kgate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kiPotD/splits.txt b/config/ShieldD/rels/d_a_obj_kiPotD/splits.txt index d59bfdfead3..eea3740fb91 100644 --- a/config/ShieldD/rels/d_a_obj_kiPotD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kiPotD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kiPot.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kjgjsD/splits.txt b/config/ShieldD/rels/d_a_obj_kjgjsD/splits.txt index beb55ff6c2b..a1e4e4868fc 100644 --- a/config/ShieldD/rels/d_a_obj_kjgjsD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kjgjsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kjgjs.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kkanbanD/splits.txt b/config/ShieldD/rels/d_a_obj_kkanbanD/splits.txt index b540e1a8ae4..a275deb2476 100644 --- a/config/ShieldD/rels/d_a_obj_kkanbanD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kkanbanD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kkanban.cpp: diff --git a/config/ShieldD/rels/d_a_obj_klift00D/splits.txt b/config/ShieldD/rels/d_a_obj_klift00D/splits.txt index 05b9808e7da..3f87d2182c3 100644 --- a/config/ShieldD/rels/d_a_obj_klift00D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_klift00D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_klift00.cpp: diff --git a/config/ShieldD/rels/d_a_obj_knBulletD/splits.txt b/config/ShieldD/rels/d_a_obj_knBulletD/splits.txt index bebeefd0aa6..52937323f3e 100644 --- a/config/ShieldD/rels/d_a_obj_knBulletD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_knBulletD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_knBullet.cpp: diff --git a/config/ShieldD/rels/d_a_obj_ktOnFireD/splits.txt b/config/ShieldD/rels/d_a_obj_ktOnFireD/splits.txt index 1e52dc97793..22030270e76 100644 --- a/config/ShieldD/rels/d_a_obj_ktOnFireD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_ktOnFireD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ktOnFire.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kwheel00D/splits.txt b/config/ShieldD/rels/d_a_obj_kwheel00D/splits.txt index f447c3c9a66..a60b75d7a09 100644 --- a/config/ShieldD/rels/d_a_obj_kwheel00D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kwheel00D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kwheel00.cpp: diff --git a/config/ShieldD/rels/d_a_obj_kwheel01D/splits.txt b/config/ShieldD/rels/d_a_obj_kwheel01D/splits.txt index c144de8b453..1d083819146 100644 --- a/config/ShieldD/rels/d_a_obj_kwheel01D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_kwheel01D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kwheel01.cpp: diff --git a/config/ShieldD/rels/d_a_obj_life_containerD/splits.txt b/config/ShieldD/rels/d_a_obj_life_containerD/splits.txt index bec3440b288..1e505b02254 100644 --- a/config/ShieldD/rels/d_a_obj_life_containerD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_life_containerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_life_container.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv1Candle00D/splits.txt b/config/ShieldD/rels/d_a_obj_lv1Candle00D/splits.txt index a4e303ad212..40c8b0f9dfb 100644 --- a/config/ShieldD/rels/d_a_obj_lv1Candle00D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv1Candle00D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle00.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv1Candle01D/splits.txt b/config/ShieldD/rels/d_a_obj_lv1Candle01D/splits.txt index f227b641dfe..563c08101e4 100644 --- a/config/ShieldD/rels/d_a_obj_lv1Candle01D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv1Candle01D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle01.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv2CandleD/splits.txt b/config/ShieldD/rels/d_a_obj_lv2CandleD/splits.txt index 4c38e9cc98f..8e5a572f576 100644 --- a/config/ShieldD/rels/d_a_obj_lv2CandleD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv2CandleD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv2Candle.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv3CandleD/splits.txt b/config/ShieldD/rels/d_a_obj_lv3CandleD/splits.txt index 192ff1e867e..dd6234bdda6 100644 --- a/config/ShieldD/rels/d_a_obj_lv3CandleD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv3CandleD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Candle.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv3Water2D/splits.txt b/config/ShieldD/rels/d_a_obj_lv3Water2D/splits.txt index e1b71cf09b0..32189923e96 100644 --- a/config/ShieldD/rels/d_a_obj_lv3Water2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv3Water2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv3WaterD/splits.txt b/config/ShieldD/rels/d_a_obj_lv3WaterD/splits.txt index 05cc56797f8..0f334bc114d 100644 --- a/config/ShieldD/rels/d_a_obj_lv3WaterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv3WaterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv3saka00D/splits.txt b/config/ShieldD/rels/d_a_obj_lv3saka00D/splits.txt index acbc0de3e8f..8bda4f315b1 100644 --- a/config/ShieldD/rels/d_a_obj_lv3saka00D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv3saka00D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3saka00.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4CandleDemoTagD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4CandleDemoTagD/splits.txt index a1eac484782..b2b8713bd21 100644 --- a/config/ShieldD/rels/d_a_obj_lv4CandleDemoTagD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4CandleDemoTagD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleDemoTag.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4CandleTagD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4CandleTagD/splits.txt index 9d7f148ad61..c9165b88a72 100644 --- a/config/ShieldD/rels/d_a_obj_lv4CandleTagD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4CandleTagD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleTag.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4EdShutterD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4EdShutterD/splits.txt index d8eeeb878bd..ee43270d412 100644 --- a/config/ShieldD/rels/d_a_obj_lv4EdShutterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4EdShutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4EdShutter.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4GateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4GateD/splits.txt index 655e74b61e7..ba5885bdcc7 100644 --- a/config/ShieldD/rels/d_a_obj_lv4GateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4GateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4Gate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4HsTargetD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4HsTargetD/splits.txt index ea8e6232f92..fda6c832408 100644 --- a/config/ShieldD/rels/d_a_obj_lv4HsTargetD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4HsTargetD/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4HsTarget.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4PoGateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4PoGateD/splits.txt index 0f07f29a39a..ae4af5d36e7 100644 --- a/config/ShieldD/rels/d_a_obj_lv4PoGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4PoGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4PoGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4RailWallD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4RailWallD/splits.txt index b3c9d6597b6..e3d3216dbf5 100644 --- a/config/ShieldD/rels/d_a_obj_lv4RailWallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4RailWallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4RailWall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4SlideWallD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4SlideWallD/splits.txt index f0fdb44d477..e5a65dc4380 100644 --- a/config/ShieldD/rels/d_a_obj_lv4SlideWallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4SlideWallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4SlideWall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4bridgeD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4bridgeD/splits.txt index f014bf0cd5d..a63ce413920 100644 --- a/config/ShieldD/rels/d_a_obj_lv4bridgeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4bridgeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4bridge.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4chandelierD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4chandelierD/splits.txt index 4d4c6e90397..cc3ab499943 100644 --- a/config/ShieldD/rels/d_a_obj_lv4chandelierD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4chandelierD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4chandelier.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4digsandD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4digsandD/splits.txt index 2c7bbd2e83f..cc6e0b77007 100644 --- a/config/ShieldD/rels/d_a_obj_lv4digsandD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4digsandD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4digsand.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4floorD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4floorD/splits.txt index d6c1744db6c..3e4b8912ecd 100644 --- a/config/ShieldD/rels/d_a_obj_lv4floorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4floorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4floor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4gearD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4gearD/splits.txt index 5524080a36f..dd7c1648300 100644 --- a/config/ShieldD/rels/d_a_obj_lv4gearD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4gearD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4gear.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4prelvtrD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4prelvtrD/splits.txt index 103e3f9deba..9beef638406 100644 --- a/config/ShieldD/rels/d_a_obj_lv4prelvtrD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4prelvtrD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4prelvtr.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4prwallD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4prwallD/splits.txt index 3ef56a13bb9..3605a13c067 100644 --- a/config/ShieldD/rels/d_a_obj_lv4prwallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4prwallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4prwall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv4sandD/splits.txt b/config/ShieldD/rels/d_a_obj_lv4sandD/splits.txt index cabf3475a0c..a6cb49ea4ef 100644 --- a/config/ShieldD/rels/d_a_obj_lv4sandD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv4sandD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4sand.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv5FloorBoardD/splits.txt b/config/ShieldD/rels/d_a_obj_lv5FloorBoardD/splits.txt index 4a9f379491a..8df0464559c 100644 --- a/config/ShieldD/rels/d_a_obj_lv5FloorBoardD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv5FloorBoardD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5FloorBoard.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv5IceWallD/splits.txt b/config/ShieldD/rels/d_a_obj_lv5IceWallD/splits.txt index 9572d8e704c..ed30a107c48 100644 --- a/config/ShieldD/rels/d_a_obj_lv5IceWallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv5IceWallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5IceWall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv5SwIceD/splits.txt b/config/ShieldD/rels/d_a_obj_lv5SwIceD/splits.txt index 0498720799d..6f0be20dea7 100644 --- a/config/ShieldD/rels/d_a_obj_lv5SwIceD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv5SwIceD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5SwIce.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv5ychndlrD/splits.txt b/config/ShieldD/rels/d_a_obj_lv5ychndlrD/splits.txt index 7b9a5db01b1..927ac16b1db 100644 --- a/config/ShieldD/rels/d_a_obj_lv5ychndlrD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv5ychndlrD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5ychndlr.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv5yiblltrayD/splits.txt b/config/ShieldD/rels/d_a_obj_lv5yiblltrayD/splits.txt index 06191e6bd0a..d5b98166283 100644 --- a/config/ShieldD/rels/d_a_obj_lv5yiblltrayD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv5yiblltrayD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5yiblltray.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6ChangeGateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6ChangeGateD/splits.txt index a390309a15c..0e59e759bfc 100644 --- a/config/ShieldD/rels/d_a_obj_lv6ChangeGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6ChangeGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6ChangeGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6FurikoTrapD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6FurikoTrapD/splits.txt index 32ecaaa039a..9f30ebb9f70 100644 --- a/config/ShieldD/rels/d_a_obj_lv6FurikoTrapD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6FurikoTrapD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6FurikoTrap.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6LblockD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6LblockD/splits.txt index b76cd743e81..31ef5b4e60f 100644 --- a/config/ShieldD/rels/d_a_obj_lv6LblockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6LblockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Lblock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6SwGateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6SwGateD/splits.txt index 183fbf92bd8..36a9af33a34 100644 --- a/config/ShieldD/rels/d_a_obj_lv6SwGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6SwGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SwGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6SzGateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6SzGateD/splits.txt index dc7bc8fe7ad..bfe1dffb984 100644 --- a/config/ShieldD/rels/d_a_obj_lv6SzGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6SzGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SzGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6TenbinD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6TenbinD/splits.txt index 7ec7372b459..520b8a89416 100644 --- a/config/ShieldD/rels/d_a_obj_lv6TenbinD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6TenbinD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Tenbin.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6TogeRollD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6TogeRollD/splits.txt index 81b2293b315..2ac3cab8fe0 100644 --- a/config/ShieldD/rels/d_a_obj_lv6TogeRollD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6TogeRollD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeRoll.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6TogeTrapD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6TogeTrapD/splits.txt index b2fe6aaed4b..8c30078d5f3 100644 --- a/config/ShieldD/rels/d_a_obj_lv6TogeTrapD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6TogeTrapD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeTrap.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6bemos2D/splits.txt b/config/ShieldD/rels/d_a_obj_lv6bemos2D/splits.txt index 3e6be5fa317..009a0e63ce6 100644 --- a/config/ShieldD/rels/d_a_obj_lv6bemos2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6bemos2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6bemos2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6bemosD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6bemosD/splits.txt index b56d30be9a5..b2675d7f859 100644 --- a/config/ShieldD/rels/d_a_obj_lv6bemosD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6bemosD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6bemos.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6elevtaD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6elevtaD/splits.txt index 20de7a49f85..064c12357d6 100644 --- a/config/ShieldD/rels/d_a_obj_lv6elevtaD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6elevtaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6elevta.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv6swturnD/splits.txt b/config/ShieldD/rels/d_a_obj_lv6swturnD/splits.txt index 0d07867519b..9aff859edf1 100644 --- a/config/ShieldD/rels/d_a_obj_lv6swturnD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv6swturnD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6swturn.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv7BsGateD/splits.txt b/config/ShieldD/rels/d_a_obj_lv7BsGateD/splits.txt index f59b591f0e9..5a0de18840c 100644 --- a/config/ShieldD/rels/d_a_obj_lv7BsGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv7BsGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7BsGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv7PropellerYD/splits.txt b/config/ShieldD/rels/d_a_obj_lv7PropellerYD/splits.txt index 477698be64f..8db77081df8 100644 --- a/config/ShieldD/rels/d_a_obj_lv7PropellerYD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv7PropellerYD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7PropellerY.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv7bridgeD/splits.txt b/config/ShieldD/rels/d_a_obj_lv7bridgeD/splits.txt index d0a25c27f55..73effe27348 100644 --- a/config/ShieldD/rels/d_a_obj_lv7bridgeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv7bridgeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7bridge.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv8KekkaiTrapD/splits.txt b/config/ShieldD/rels/d_a_obj_lv8KekkaiTrapD/splits.txt index 037dc9c5368..46a07f1a23a 100644 --- a/config/ShieldD/rels/d_a_obj_lv8KekkaiTrapD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv8KekkaiTrapD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8KekkaiTrap.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv8LiftD/splits.txt b/config/ShieldD/rels/d_a_obj_lv8LiftD/splits.txt index 2f0eba49858..31b13759c33 100644 --- a/config/ShieldD/rels/d_a_obj_lv8LiftD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv8LiftD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8Lift.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv8OptiLiftD/splits.txt b/config/ShieldD/rels/d_a_obj_lv8OptiLiftD/splits.txt index 9799a83e901..258858c5a52 100644 --- a/config/ShieldD/rels/d_a_obj_lv8OptiLiftD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv8OptiLiftD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8OptiLift.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv8UdFloorD/splits.txt b/config/ShieldD/rels/d_a_obj_lv8UdFloorD/splits.txt index 3c9d02774bb..f2e7fc9bad1 100644 --- a/config/ShieldD/rels/d_a_obj_lv8UdFloorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv8UdFloorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8UdFloor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_lv9SwShutterD/splits.txt b/config/ShieldD/rels/d_a_obj_lv9SwShutterD/splits.txt index ba6a436af62..f1436cb0777 100644 --- a/config/ShieldD/rels/d_a_obj_lv9SwShutterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_lv9SwShutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv9SwShutter.cpp: diff --git a/config/ShieldD/rels/d_a_obj_magLiftD/splits.txt b/config/ShieldD/rels/d_a_obj_magLiftD/splits.txt index 194d821c818..6e524ddb1bf 100644 --- a/config/ShieldD/rels/d_a_obj_magLiftD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_magLiftD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLift.cpp: diff --git a/config/ShieldD/rels/d_a_obj_magLiftRotD/splits.txt b/config/ShieldD/rels/d_a_obj_magLiftRotD/splits.txt index 3bfc2ae3c11..660118aa205 100644 --- a/config/ShieldD/rels/d_a_obj_magLiftRotD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_magLiftRotD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLiftRot.cpp: diff --git a/config/ShieldD/rels/d_a_obj_magne_armD/splits.txt b/config/ShieldD/rels/d_a_obj_magne_armD/splits.txt index a72cb7ad0ea..6a835b2f316 100644 --- a/config/ShieldD/rels/d_a_obj_magne_armD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_magne_armD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magne_arm.cpp: diff --git a/config/ShieldD/rels/d_a_obj_master_swordD/splits.txt b/config/ShieldD/rels/d_a_obj_master_swordD/splits.txt index a79e6f1be12..f9c6bb73f86 100644 --- a/config/ShieldD/rels/d_a_obj_master_swordD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_master_swordD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_master_sword.cpp: diff --git a/config/ShieldD/rels/d_a_obj_metalboxD/splits.txt b/config/ShieldD/rels/d_a_obj_metalboxD/splits.txt index 8843ef25aea..aa57289cced 100644 --- a/config/ShieldD/rels/d_a_obj_metalboxD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_metalboxD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_metalbox.cpp: diff --git a/config/ShieldD/rels/d_a_obj_mgateD/splits.txt b/config/ShieldD/rels/d_a_obj_mgateD/splits.txt index 722594827f6..a9ebcccb341 100644 --- a/config/ShieldD/rels/d_a_obj_mgateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_mgateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mgate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_mholeD/splits.txt b/config/ShieldD/rels/d_a_obj_mholeD/splits.txt index 76768e09702..665aab3055d 100644 --- a/config/ShieldD/rels/d_a_obj_mholeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_mholeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mhole.cpp: diff --git a/config/ShieldD/rels/d_a_obj_mieD/splits.txt b/config/ShieldD/rels/d_a_obj_mieD/splits.txt index 0b99d041450..cd59faf0fe9 100644 --- a/config/ShieldD/rels/d_a_obj_mieD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_mieD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mie.cpp: diff --git a/config/ShieldD/rels/d_a_obj_mirror_screwD/splits.txt b/config/ShieldD/rels/d_a_obj_mirror_screwD/splits.txt index 063eb213d1b..813dcf4403d 100644 --- a/config/ShieldD/rels/d_a_obj_mirror_screwD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_mirror_screwD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mirror_screw.cpp: diff --git a/config/ShieldD/rels/d_a_obj_moveboxD/splits.txt b/config/ShieldD/rels/d_a_obj_moveboxD/splits.txt index 020daf146a6..a5b44cc13b4 100644 --- a/config/ShieldD/rels/d_a_obj_moveboxD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_moveboxD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_movebox.cpp: diff --git a/config/ShieldD/rels/d_a_obj_mvstairD/splits.txt b/config/ShieldD/rels/d_a_obj_mvstairD/splits.txt index 5ee65d2a1c6..6b9958841df 100644 --- a/config/ShieldD/rels/d_a_obj_mvstairD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_mvstairD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mvstair.cpp: diff --git a/config/ShieldD/rels/d_a_obj_nouguD/splits.txt b/config/ShieldD/rels/d_a_obj_nouguD/splits.txt index 01257da55ad..86091610f66 100644 --- a/config/ShieldD/rels/d_a_obj_nouguD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_nouguD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nougu.cpp: diff --git a/config/ShieldD/rels/d_a_obj_onsenD/splits.txt b/config/ShieldD/rels/d_a_obj_onsenD/splits.txt index 78bb22a864a..8744ebaee6b 100644 --- a/config/ShieldD/rels/d_a_obj_onsenD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_onsenD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_onsen.cpp: diff --git a/config/ShieldD/rels/d_a_obj_onsenTaruD/splits.txt b/config/ShieldD/rels/d_a_obj_onsenTaruD/splits.txt index 2f27d110f34..48ae92b122a 100644 --- a/config/ShieldD/rels/d_a_obj_onsenTaruD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_onsenTaruD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_onsenTaru.cpp: diff --git a/config/ShieldD/rels/d_a_obj_pdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_pdoorD/splits.txt index d8b30fef34c..e9ed8cec146 100644 --- a/config/ShieldD/rels/d_a_obj_pdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_pdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_pdtileD/splits.txt b/config/ShieldD/rels/d_a_obj_pdtileD/splits.txt index 09576596088..1f09b03c81b 100644 --- a/config/ShieldD/rels/d_a_obj_pdtileD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_pdtileD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pdtile.cpp: diff --git a/config/ShieldD/rels/d_a_obj_pillarD/splits.txt b/config/ShieldD/rels/d_a_obj_pillarD/splits.txt index 6911a176c33..714cd04eb76 100644 --- a/config/ShieldD/rels/d_a_obj_pillarD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_pillarD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pillar.cpp: diff --git a/config/ShieldD/rels/d_a_obj_pleafD/splits.txt b/config/ShieldD/rels/d_a_obj_pleafD/splits.txt index 8f69ed09c48..6c89d04b338 100644 --- a/config/ShieldD/rels/d_a_obj_pleafD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_pleafD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pleaf.cpp: diff --git a/config/ShieldD/rels/d_a_obj_poCandleD/splits.txt b/config/ShieldD/rels/d_a_obj_poCandleD/splits.txt index 669190219fe..fe3a4b1c3a5 100644 --- a/config/ShieldD/rels/d_a_obj_poCandleD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_poCandleD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poCandle.cpp: diff --git a/config/ShieldD/rels/d_a_obj_poFireD/splits.txt b/config/ShieldD/rels/d_a_obj_poFireD/splits.txt index 9a01686cf8d..a90cac8f26c 100644 --- a/config/ShieldD/rels/d_a_obj_poFireD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_poFireD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poFire.cpp: diff --git a/config/ShieldD/rels/d_a_obj_poTboxD/splits.txt b/config/ShieldD/rels/d_a_obj_poTboxD/splits.txt index d1f6d6175fc..b6b98665bef 100644 --- a/config/ShieldD/rels/d_a_obj_poTboxD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_poTboxD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poTbox.cpp: diff --git a/config/ShieldD/rels/d_a_obj_pumpkinD/splits.txt b/config/ShieldD/rels/d_a_obj_pumpkinD/splits.txt index 5ec4d81acd2..847841056bb 100644 --- a/config/ShieldD/rels/d_a_obj_pumpkinD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_pumpkinD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pumpkin.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rfHoleD/splits.txt b/config/ShieldD/rels/d_a_obj_rfHoleD/splits.txt index 518a3c47d72..7d35886bb0e 100644 --- a/config/ShieldD/rels/d_a_obj_rfHoleD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rfHoleD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rfHole.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rgateD/splits.txt b/config/ShieldD/rels/d_a_obj_rgateD/splits.txt index 359874a40b4..d86e6058d02 100644 --- a/config/ShieldD/rels/d_a_obj_rgateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rgateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rgate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rope_bridgeD/splits.txt b/config/ShieldD/rels/d_a_obj_rope_bridgeD/splits.txt index 6dc3bc26dc3..6cc87c4ae2e 100644 --- a/config/ShieldD/rels/d_a_obj_rope_bridgeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rope_bridgeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rope_bridge.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rotBridgeD/splits.txt b/config/ShieldD/rels/d_a_obj_rotBridgeD/splits.txt index d055f960b7c..d3adab057a3 100644 --- a/config/ShieldD/rels/d_a_obj_rotBridgeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rotBridgeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotBridge.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rotTrapD/splits.txt b/config/ShieldD/rels/d_a_obj_rotTrapD/splits.txt index b975b8a55aa..534da5565a7 100644 --- a/config/ShieldD/rels/d_a_obj_rotTrapD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rotTrapD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotTrap.cpp: diff --git a/config/ShieldD/rels/d_a_obj_rstairD/splits.txt b/config/ShieldD/rels/d_a_obj_rstairD/splits.txt index b46d73a0d7b..82091855c72 100644 --- a/config/ShieldD/rels/d_a_obj_rstairD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_rstairD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rstair.cpp: diff --git a/config/ShieldD/rels/d_a_obj_sWallShutterD/splits.txt b/config/ShieldD/rels/d_a_obj_sWallShutterD/splits.txt index 9d032e4354d..36a100788a1 100644 --- a/config/ShieldD/rels/d_a_obj_sWallShutterD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_sWallShutterD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sWallShutter.cpp: diff --git a/config/ShieldD/rels/d_a_obj_saidanD/splits.txt b/config/ShieldD/rels/d_a_obj_saidanD/splits.txt index a8159fa41d3..73d686a2058 100644 --- a/config/ShieldD/rels/d_a_obj_saidanD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_saidanD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_saidan.cpp: diff --git a/config/ShieldD/rels/d_a_obj_scannon_crsD/splits.txt b/config/ShieldD/rels/d_a_obj_scannon_crsD/splits.txt index 7b38a151d49..bf6c2bf6fd3 100644 --- a/config/ShieldD/rels/d_a_obj_scannon_crsD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_scannon_crsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_scannon_crs.cpp: diff --git a/config/ShieldD/rels/d_a_obj_sekidoorD/splits.txt b/config/ShieldD/rels/d_a_obj_sekidoorD/splits.txt index ecbc741ab8a..29d3bf6ea6d 100644 --- a/config/ShieldD/rels/d_a_obj_sekidoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_sekidoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekidoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_sekizoD/splits.txt b/config/ShieldD/rels/d_a_obj_sekizoD/splits.txt index b2388176d9d..3f017875145 100644 --- a/config/ShieldD/rels/d_a_obj_sekizoD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_sekizoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizo.cpp: diff --git a/config/ShieldD/rels/d_a_obj_sekizoaD/splits.txt b/config/ShieldD/rels/d_a_obj_sekizoaD/splits.txt index b1be9128466..9e4ff11b3ba 100644 --- a/config/ShieldD/rels/d_a_obj_sekizoaD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_sekizoaD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizoa.cpp: diff --git a/config/ShieldD/rels/d_a_obj_shieldD/splits.txt b/config/ShieldD/rels/d_a_obj_shieldD/splits.txt index baef062a768..26d978ebdef 100644 --- a/config/ShieldD/rels/d_a_obj_shieldD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_shieldD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_shield.cpp: diff --git a/config/ShieldD/rels/d_a_obj_smallkeyD/splits.txt b/config/ShieldD/rels/d_a_obj_smallkeyD/splits.txt index 9cc51c66158..ebe5e7c21f3 100644 --- a/config/ShieldD/rels/d_a_obj_smallkeyD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_smallkeyD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smallkey.cpp: diff --git a/config/ShieldD/rels/d_a_obj_smgdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_smgdoorD/splits.txt index b0c70e6a88c..f8ea1d75f73 100644 --- a/config/ShieldD/rels/d_a_obj_smgdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_smgdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smgdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_smtileD/splits.txt b/config/ShieldD/rels/d_a_obj_smtileD/splits.txt index 5579138af40..024c6944fed 100644 --- a/config/ShieldD/rels/d_a_obj_smtileD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_smtileD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smtile.cpp: diff --git a/config/ShieldD/rels/d_a_obj_snowEffTagD/splits.txt b/config/ShieldD/rels/d_a_obj_snowEffTagD/splits.txt index 7571775489b..2d9140c078e 100644 --- a/config/ShieldD/rels/d_a_obj_snowEffTagD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_snowEffTagD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_snowEffTag.cpp: diff --git a/config/ShieldD/rels/d_a_obj_spinLiftD/splits.txt b/config/ShieldD/rels/d_a_obj_spinLiftD/splits.txt index aeaf907b35e..e2d15f4c007 100644 --- a/config/ShieldD/rels/d_a_obj_spinLiftD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_spinLiftD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_spinLift.cpp: diff --git a/config/ShieldD/rels/d_a_obj_stairBlockD/splits.txt b/config/ShieldD/rels/d_a_obj_stairBlockD/splits.txt index b8174f8ddcb..86c77268b42 100644 --- a/config/ShieldD/rels/d_a_obj_stairBlockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_stairBlockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stairBlock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_stickD/splits.txt b/config/ShieldD/rels/d_a_obj_stickD/splits.txt index 13caf22ebe0..6489e0872ea 100644 --- a/config/ShieldD/rels/d_a_obj_stickD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_stickD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stick.cpp: diff --git a/config/ShieldD/rels/d_a_obj_stoneD/splits.txt b/config/ShieldD/rels/d_a_obj_stoneD/splits.txt index 8d0ee6fb6fc..ac4d2cd4bc1 100644 --- a/config/ShieldD/rels/d_a_obj_stoneD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_stoneD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stone.cpp: diff --git a/config/ShieldD/rels/d_a_obj_stopperD/splits.txt b/config/ShieldD/rels/d_a_obj_stopperD/splits.txt index be3c45b43b6..acd8f73531e 100644 --- a/config/ShieldD/rels/d_a_obj_stopperD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_stopperD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stopper.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swBallAD/splits.txt b/config/ShieldD/rels/d_a_obj_swBallAD/splits.txt index 17b6bb3a80e..f8f928b74ec 100644 --- a/config/ShieldD/rels/d_a_obj_swBallAD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swBallAD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swBallA.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swBallBD/splits.txt b/config/ShieldD/rels/d_a_obj_swBallBD/splits.txt index 027e1ca0970..021ce1bbdab 100644 --- a/config/ShieldD/rels/d_a_obj_swBallBD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swBallBD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swBallB.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swBallCD/splits.txt b/config/ShieldD/rels/d_a_obj_swBallCD/splits.txt index f36480fcce5..eb41e6dc325 100644 --- a/config/ShieldD/rels/d_a_obj_swBallCD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swBallCD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swBallC.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swLightD/splits.txt b/config/ShieldD/rels/d_a_obj_swLightD/splits.txt index fba53a7c3d8..7b5afb0aed9 100644 --- a/config/ShieldD/rels/d_a_obj_swLightD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swLightD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swLight.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swchainD/splits.txt b/config/ShieldD/rels/d_a_obj_swchainD/splits.txt index 38d5b0cc9be..d30afa0d8ec 100644 --- a/config/ShieldD/rels/d_a_obj_swchainD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swchainD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swchain.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swhangD/splits.txt b/config/ShieldD/rels/d_a_obj_swhangD/splits.txt index 026b999d97f..09a3e8c263c 100644 --- a/config/ShieldD/rels/d_a_obj_swhangD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swhangD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swhang.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swordD/splits.txt b/config/ShieldD/rels/d_a_obj_swordD/splits.txt index 2aab0a87440..63d57c4aa6e 100644 --- a/config/ShieldD/rels/d_a_obj_swordD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swordD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sword.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swpropellerD/splits.txt b/config/ShieldD/rels/d_a_obj_swpropellerD/splits.txt index 73da2f69dc5..9869ecef2ff 100644 --- a/config/ShieldD/rels/d_a_obj_swpropellerD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swpropellerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpropeller.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swspinnerD/splits.txt b/config/ShieldD/rels/d_a_obj_swspinnerD/splits.txt index 5857aae89dc..4d89d40182a 100644 --- a/config/ShieldD/rels/d_a_obj_swspinnerD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swspinnerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swspinner.cpp: diff --git a/config/ShieldD/rels/d_a_obj_swturnD/splits.txt b/config/ShieldD/rels/d_a_obj_swturnD/splits.txt index 6ce9f61d34c..aa4984bb913 100644 --- a/config/ShieldD/rels/d_a_obj_swturnD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_swturnD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swturn.cpp: diff --git a/config/ShieldD/rels/d_a_obj_syRockD/splits.txt b/config/ShieldD/rels/d_a_obj_syRockD/splits.txt index bd2a80ea53a..9c2dfdc5fae 100644 --- a/config/ShieldD/rels/d_a_obj_syRockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_syRockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_syRock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_szbridgeD/splits.txt b/config/ShieldD/rels/d_a_obj_szbridgeD/splits.txt index a15c9645256..4cdde2ba93c 100644 --- a/config/ShieldD/rels/d_a_obj_szbridgeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_szbridgeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_szbridge.cpp: diff --git a/config/ShieldD/rels/d_a_obj_taFenceD/splits.txt b/config/ShieldD/rels/d_a_obj_taFenceD/splits.txt index 4bd9ba84764..3314e205123 100644 --- a/config/ShieldD/rels/d_a_obj_taFenceD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_taFenceD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_taFence.cpp: diff --git a/config/ShieldD/rels/d_a_obj_takaraDaiD/splits.txt b/config/ShieldD/rels/d_a_obj_takaraDaiD/splits.txt index bf63e24e4df..32d341c564c 100644 --- a/config/ShieldD/rels/d_a_obj_takaraDaiD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_takaraDaiD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_takaraDai.cpp: diff --git a/config/ShieldD/rels/d_a_obj_testcubeD/splits.txt b/config/ShieldD/rels/d_a_obj_testcubeD/splits.txt index f38a2dd5b3c..9388b0111c2 100644 --- a/config/ShieldD/rels/d_a_obj_testcubeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_testcubeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_testcube.cpp: diff --git a/config/ShieldD/rels/d_a_obj_thdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_thdoorD/splits.txt index 39efdbda26f..d642678cc1a 100644 --- a/config/ShieldD/rels/d_a_obj_thdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_thdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_thdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_timeFireD/splits.txt b/config/ShieldD/rels/d_a_obj_timeFireD/splits.txt index 8ef9bcfcbf7..12d19dfd021 100644 --- a/config/ShieldD/rels/d_a_obj_timeFireD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_timeFireD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_timeFire.cpp: diff --git a/config/ShieldD/rels/d_a_obj_tksD/splits.txt b/config/ShieldD/rels/d_a_obj_tksD/splits.txt index e2712e68d23..3c98e19dce2 100644 --- a/config/ShieldD/rels/d_a_obj_tksD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_tksD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tks.cpp: diff --git a/config/ShieldD/rels/d_a_obj_tobyhouseD/splits.txt b/config/ShieldD/rels/d_a_obj_tobyhouseD/splits.txt index f588e7dc2f4..b43c5e3969e 100644 --- a/config/ShieldD/rels/d_a_obj_tobyhouseD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_tobyhouseD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tobyhouse.cpp: diff --git a/config/ShieldD/rels/d_a_obj_togeTrapD/splits.txt b/config/ShieldD/rels/d_a_obj_togeTrapD/splits.txt index 8884d42ee46..376ca971f15 100644 --- a/config/ShieldD/rels/d_a_obj_togeTrapD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_togeTrapD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_togeTrap.cpp: diff --git a/config/ShieldD/rels/d_a_obj_tornado2D/splits.txt b/config/ShieldD/rels/d_a_obj_tornado2D/splits.txt index 672e12a7188..8fc26931d8d 100644 --- a/config/ShieldD/rels/d_a_obj_tornado2D/splits.txt +++ b/config/ShieldD/rels/d_a_obj_tornado2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tornado2.cpp: diff --git a/config/ShieldD/rels/d_a_obj_tornadoD/splits.txt b/config/ShieldD/rels/d_a_obj_tornadoD/splits.txt index 6515a961b54..75d764f930f 100644 --- a/config/ShieldD/rels/d_a_obj_tornadoD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_tornadoD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tornado.cpp: diff --git a/config/ShieldD/rels/d_a_obj_treeshD/splits.txt b/config/ShieldD/rels/d_a_obj_treeshD/splits.txt index dc214918fd6..75c27d6faa5 100644 --- a/config/ShieldD/rels/d_a_obj_treeshD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_treeshD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_treesh.cpp: diff --git a/config/ShieldD/rels/d_a_obj_twGateD/splits.txt b/config/ShieldD/rels/d_a_obj_twGateD/splits.txt index 15023cf9512..8bea63d884c 100644 --- a/config/ShieldD/rels/d_a_obj_twGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_twGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_twGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_volcballD/splits.txt b/config/ShieldD/rels/d_a_obj_volcballD/splits.txt index b30c16f2012..ef1009a6aeb 100644 --- a/config/ShieldD/rels/d_a_obj_volcballD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_volcballD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_volcball.cpp: diff --git a/config/ShieldD/rels/d_a_obj_volcbomD/splits.txt b/config/ShieldD/rels/d_a_obj_volcbomD/splits.txt index 60721d49826..88e2c425e2b 100644 --- a/config/ShieldD/rels/d_a_obj_volcbomD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_volcbomD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_volcbom.cpp: diff --git a/config/ShieldD/rels/d_a_obj_warp_kbrgD/splits.txt b/config/ShieldD/rels/d_a_obj_warp_kbrgD/splits.txt index ca850a28b67..cee3afeeb78 100644 --- a/config/ShieldD/rels/d_a_obj_warp_kbrgD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_warp_kbrgD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_warp_kbrg.cpp: diff --git a/config/ShieldD/rels/d_a_obj_warp_obrgD/splits.txt b/config/ShieldD/rels/d_a_obj_warp_obrgD/splits.txt index 76c396a4cfd..9c46d95b773 100644 --- a/config/ShieldD/rels/d_a_obj_warp_obrgD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_warp_obrgD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_warp_obrg.cpp: diff --git a/config/ShieldD/rels/d_a_obj_waterGateD/splits.txt b/config/ShieldD/rels/d_a_obj_waterGateD/splits.txt index 6d8b6ef136d..f79cf41f5f6 100644 --- a/config/ShieldD/rels/d_a_obj_waterGateD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_waterGateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterGate.cpp: diff --git a/config/ShieldD/rels/d_a_obj_waterPillarD/splits.txt b/config/ShieldD/rels/d_a_obj_waterPillarD/splits.txt index c2d09468768..a396f454a73 100644 --- a/config/ShieldD/rels/d_a_obj_waterPillarD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_waterPillarD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterPillar.cpp: diff --git a/config/ShieldD/rels/d_a_obj_waterfallD/splits.txt b/config/ShieldD/rels/d_a_obj_waterfallD/splits.txt index 773ab302efa..d549d13c65c 100644 --- a/config/ShieldD/rels/d_a_obj_waterfallD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_waterfallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterfall.cpp: diff --git a/config/ShieldD/rels/d_a_obj_wdStickD/splits.txt b/config/ShieldD/rels/d_a_obj_wdStickD/splits.txt index 639f581c5ea..cf59c22dfbe 100644 --- a/config/ShieldD/rels/d_a_obj_wdStickD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_wdStickD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wdStick.cpp: diff --git a/config/ShieldD/rels/d_a_obj_well_coverD/splits.txt b/config/ShieldD/rels/d_a_obj_well_coverD/splits.txt index ad3a77f8cf7..7d91970604a 100644 --- a/config/ShieldD/rels/d_a_obj_well_coverD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_well_coverD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_well_cover.cpp: diff --git a/config/ShieldD/rels/d_a_obj_wood_pendulumD/splits.txt b/config/ShieldD/rels/d_a_obj_wood_pendulumD/splits.txt index f29adff83e6..8dae107f162 100644 --- a/config/ShieldD/rels/d_a_obj_wood_pendulumD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_wood_pendulumD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wood_pendulum.cpp: diff --git a/config/ShieldD/rels/d_a_obj_wood_statueD/splits.txt b/config/ShieldD/rels/d_a_obj_wood_statueD/splits.txt index 48aed339534..85ba7c244ff 100644 --- a/config/ShieldD/rels/d_a_obj_wood_statueD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_wood_statueD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wood_statue.cpp: diff --git a/config/ShieldD/rels/d_a_obj_wswordD/splits.txt b/config/ShieldD/rels/d_a_obj_wswordD/splits.txt index ee49047f5f9..4edb4692972 100644 --- a/config/ShieldD/rels/d_a_obj_wswordD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_wswordD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wsword.cpp: diff --git a/config/ShieldD/rels/d_a_obj_yel_bagD/splits.txt b/config/ShieldD/rels/d_a_obj_yel_bagD/splits.txt index 524969dff5f..3d6a0616acf 100644 --- a/config/ShieldD/rels/d_a_obj_yel_bagD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_yel_bagD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_yel_bag.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zdoorD/splits.txt b/config/ShieldD/rels/d_a_obj_zdoorD/splits.txt index 943dac6f1e0..50288818f86 100644 --- a/config/ShieldD/rels/d_a_obj_zdoorD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zdoorD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zdoor.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zrTuraraD/splits.txt b/config/ShieldD/rels/d_a_obj_zrTuraraD/splits.txt index f1646484d9c..08c347a89cc 100644 --- a/config/ShieldD/rels/d_a_obj_zrTuraraD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zrTuraraD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTurara.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zrTuraraRockD/splits.txt b/config/ShieldD/rels/d_a_obj_zrTuraraRockD/splits.txt index 6200fd751df..9098d3b0b47 100644 --- a/config/ShieldD/rels/d_a_obj_zrTuraraRockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zrTuraraRockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTuraraRock.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zraMarkD/splits.txt b/config/ShieldD/rels/d_a_obj_zraMarkD/splits.txt index 49fb55a9e85..07006999fce 100644 --- a/config/ShieldD/rels/d_a_obj_zraMarkD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zraMarkD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zraMark.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zra_freezeD/splits.txt b/config/ShieldD/rels/d_a_obj_zra_freezeD/splits.txt index e9beffb7b82..b9100969dce 100644 --- a/config/ShieldD/rels/d_a_obj_zra_freezeD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zra_freezeD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zra_freeze.cpp: diff --git a/config/ShieldD/rels/d_a_obj_zra_rockD/splits.txt b/config/ShieldD/rels/d_a_obj_zra_rockD/splits.txt index c2068e9362c..f2b9340f264 100644 --- a/config/ShieldD/rels/d_a_obj_zra_rockD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_zra_rockD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zra_rock.cpp: diff --git a/config/ShieldD/rels/d_a_passer_mngD/splits.txt b/config/ShieldD/rels/d_a_passer_mngD/splits.txt index e3d58a45eab..af0659834d5 100644 --- a/config/ShieldD/rels/d_a_passer_mngD/splits.txt +++ b/config/ShieldD/rels/d_a_passer_mngD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_passer_mng.cpp: diff --git a/config/ShieldD/rels/d_a_peruD/splits.txt b/config/ShieldD/rels/d_a_peruD/splits.txt index 7e5ccce9c1d..9e1e98c817b 100644 --- a/config/ShieldD/rels/d_a_peruD/splits.txt +++ b/config/ShieldD/rels/d_a_peruD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_peru.cpp: diff --git a/config/ShieldD/rels/d_a_scene_exit2D/splits.txt b/config/ShieldD/rels/d_a_scene_exit2D/splits.txt index 495a6c1f519..7879ff0d94c 100644 --- a/config/ShieldD/rels/d_a_scene_exit2D/splits.txt +++ b/config/ShieldD/rels/d_a_scene_exit2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_scene_exit2.cpp: diff --git a/config/ShieldD/rels/d_a_startAndGoalD/splits.txt b/config/ShieldD/rels/d_a_startAndGoalD/splits.txt index 97aeb6512c7..acc548dd6fb 100644 --- a/config/ShieldD/rels/d_a_startAndGoalD/splits.txt +++ b/config/ShieldD/rels/d_a_startAndGoalD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_startAndGoal.cpp: diff --git a/config/ShieldD/rels/d_a_swBallD/splits.txt b/config/ShieldD/rels/d_a_swBallD/splits.txt index b912b13c9d9..24d7bceb6d1 100644 --- a/config/ShieldD/rels/d_a_swBallD/splits.txt +++ b/config/ShieldD/rels/d_a_swBallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_swBall.cpp: diff --git a/config/ShieldD/rels/d_a_swLBallD/splits.txt b/config/ShieldD/rels/d_a_swLBallD/splits.txt index 0363c9d9351..506681d01dc 100644 --- a/config/ShieldD/rels/d_a_swLBallD/splits.txt +++ b/config/ShieldD/rels/d_a_swLBallD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_swLBall.cpp: diff --git a/config/ShieldD/rels/d_a_swTimeD/splits.txt b/config/ShieldD/rels/d_a_swTimeD/splits.txt index f64a7c0ac8c..106953842cb 100644 --- a/config/ShieldD/rels/d_a_swTimeD/splits.txt +++ b/config/ShieldD/rels/d_a_swTimeD/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_swTime.cpp: diff --git a/config/ShieldD/rels/d_a_tag_CstaSwD/splits.txt b/config/ShieldD/rels/d_a_tag_CstaSwD/splits.txt index 49e4cbc35b9..99fee6a581e 100644 --- a/config/ShieldD/rels/d_a_tag_CstaSwD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_CstaSwD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_CstaSw.cpp: diff --git a/config/ShieldD/rels/d_a_tag_TWgateD/splits.txt b/config/ShieldD/rels/d_a_tag_TWgateD/splits.txt index c4f3a819e70..6e0022154e0 100644 --- a/config/ShieldD/rels/d_a_tag_TWgateD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_TWgateD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_TWgate.cpp: diff --git a/config/ShieldD/rels/d_a_tag_attack_itemD/splits.txt b/config/ShieldD/rels/d_a_tag_attack_itemD/splits.txt index b4d092b9b22..ce793a05517 100644 --- a/config/ShieldD/rels/d_a_tag_attack_itemD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_attack_itemD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_attack_item.cpp: diff --git a/config/ShieldD/rels/d_a_tag_attentionD/splits.txt b/config/ShieldD/rels/d_a_tag_attentionD/splits.txt index fae22b6d34b..c486982bbfa 100644 --- a/config/ShieldD/rels/d_a_tag_attentionD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_attentionD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_attention.cpp: diff --git a/config/ShieldD/rels/d_a_tag_chgrestartD/splits.txt b/config/ShieldD/rels/d_a_tag_chgrestartD/splits.txt index e5cc459a274..93641d55852 100644 --- a/config/ShieldD/rels/d_a_tag_chgrestartD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_chgrestartD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_chgrestart.cpp: diff --git a/config/ShieldD/rels/d_a_tag_cswD/splits.txt b/config/ShieldD/rels/d_a_tag_cswD/splits.txt index 94567a1770a..e8f4e3f72c6 100644 --- a/config/ShieldD/rels/d_a_tag_cswD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_cswD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_csw.cpp: diff --git a/config/ShieldD/rels/d_a_tag_hjumpD/splits.txt b/config/ShieldD/rels/d_a_tag_hjumpD/splits.txt index e9b8dbdebb9..9c1d176dc12 100644 --- a/config/ShieldD/rels/d_a_tag_hjumpD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_hjumpD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_hjump.cpp: diff --git a/config/ShieldD/rels/d_a_tag_hstopD/splits.txt b/config/ShieldD/rels/d_a_tag_hstopD/splits.txt index e778caf240e..290e489df45 100644 --- a/config/ShieldD/rels/d_a_tag_hstopD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_hstopD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_hstop.cpp: diff --git a/config/ShieldD/rels/d_a_tag_lanternD/splits.txt b/config/ShieldD/rels/d_a_tag_lanternD/splits.txt index 7c71f1afa2a..fb2d246f067 100644 --- a/config/ShieldD/rels/d_a_tag_lanternD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_lanternD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lantern.cpp: diff --git a/config/ShieldD/rels/d_a_tag_lv6CstaSwD/splits.txt b/config/ShieldD/rels/d_a_tag_lv6CstaSwD/splits.txt index efd47fb5486..4ccdc381972 100644 --- a/config/ShieldD/rels/d_a_tag_lv6CstaSwD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_lv6CstaSwD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lv6CstaSw.cpp: diff --git a/config/ShieldD/rels/d_a_tag_mistD/splits.txt b/config/ShieldD/rels/d_a_tag_mistD/splits.txt index f1b9c26fb22..fad284b1356 100644 --- a/config/ShieldD/rels/d_a_tag_mistD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_mistD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_mist.cpp: diff --git a/config/ShieldD/rels/d_a_tag_poFireD/splits.txt b/config/ShieldD/rels/d_a_tag_poFireD/splits.txt index bd3acb835d9..ecb943e2246 100644 --- a/config/ShieldD/rels/d_a_tag_poFireD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_poFireD/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_poFire.cpp: diff --git a/config/ShieldD/rels/d_a_tag_qsD/splits.txt b/config/ShieldD/rels/d_a_tag_qsD/splits.txt index 4a84ba1c24f..cc4568f268c 100644 --- a/config/ShieldD/rels/d_a_tag_qsD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_qsD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_qs.cpp: diff --git a/config/ShieldD/rels/d_a_tag_ret_roomD/splits.txt b/config/ShieldD/rels/d_a_tag_ret_roomD/splits.txt index f77a104679b..5558a42ca93 100644 --- a/config/ShieldD/rels/d_a_tag_ret_roomD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_ret_roomD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_ret_room.cpp: diff --git a/config/ShieldD/rels/d_a_tag_rmbit_swD/splits.txt b/config/ShieldD/rels/d_a_tag_rmbit_swD/splits.txt index 64213f1c2e9..d9bd81fae49 100644 --- a/config/ShieldD/rels/d_a_tag_rmbit_swD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_rmbit_swD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_rmbit_sw.cpp: diff --git a/config/ShieldD/rels/d_a_tag_setrestartD/splits.txt b/config/ShieldD/rels/d_a_tag_setrestartD/splits.txt index db662345f33..1027b547058 100644 --- a/config/ShieldD/rels/d_a_tag_setrestartD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_setrestartD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_setrestart.cpp: diff --git a/config/ShieldD/rels/d_a_tag_spinnerD/splits.txt b/config/ShieldD/rels/d_a_tag_spinnerD/splits.txt index b42bb6e4816..618981de1c6 100644 --- a/config/ShieldD/rels/d_a_tag_spinnerD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_spinnerD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_spinner.cpp: diff --git a/config/ShieldD/rels/d_a_tag_springD/splits.txt b/config/ShieldD/rels/d_a_tag_springD/splits.txt index b1e93f76e44..30d5fa2ebdc 100644 --- a/config/ShieldD/rels/d_a_tag_springD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_springD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_spring.cpp: diff --git a/config/ShieldD/rels/d_a_tag_statue_evtD/splits.txt b/config/ShieldD/rels/d_a_tag_statue_evtD/splits.txt index 1979cda4abf..fa53a1eb2a1 100644 --- a/config/ShieldD/rels/d_a_tag_statue_evtD/splits.txt +++ b/config/ShieldD/rels/d_a_tag_statue_evtD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_statue_evt.cpp: diff --git a/config/ShieldD/rels/d_a_tbox2D/splits.txt b/config/ShieldD/rels/d_a_tbox2D/splits.txt index bf67e3d23ef..14a2b61e2eb 100644 --- a/config/ShieldD/rels/d_a_tbox2D/splits.txt +++ b/config/ShieldD/rels/d_a_tbox2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tbox2.cpp: diff --git a/config/ShieldD/rels/d_a_tboxD/splits.txt b/config/ShieldD/rels/d_a_tboxD/splits.txt index 99059e23ced..a11dad4f4b2 100644 --- a/config/ShieldD/rels/d_a_tboxD/splits.txt +++ b/config/ShieldD/rels/d_a_tboxD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tbox.cpp: diff --git a/config/ShieldD/rels/d_a_ykgrD/splits.txt b/config/ShieldD/rels/d_a_ykgrD/splits.txt index 5593e2a40b7..ce89bea1651 100644 --- a/config/ShieldD/rels/d_a_ykgrD/splits.txt +++ b/config/ShieldD/rels/d_a_ykgrD/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000080 end:0x00000100 - .dtors start:0x00000000 end:0x00000008 + .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ykgr.cpp: diff --git a/configure.py b/configure.py index 72782adb7c3..7a745d0841f 100755 --- a/configure.py +++ b/configure.py @@ -395,7 +395,7 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "m_Do/m_Do_controller_pad.cpp"), Object(Equivalent, "m_Do/m_Do_graphic.cpp"), # weak func order Object(NonMatching, "m_Do/m_Do_machine.cpp"), - Object(MatchingFor("GZ2E01"), "m_Do/m_Do_mtx.cpp"), + Object(MatchingFor("GZ2E01"), "m_Do/m_Do_mtx.cpp", extra_cflags=["-sym off"]), Object(NonMatching, "m_Do/m_Do_ext.cpp"), Object(MatchingFor("GZ2E01"), "m_Do/m_Do_lib.cpp"), Object(MatchingFor("GZ2E01"), "m_Do/m_Do_Reset.cpp"), @@ -509,7 +509,7 @@ config.libs = [ Object(MatchingFor("GZ2E01"), "d/d_a_shop_item_static.cpp"), Object(MatchingFor("GZ2E01"), "d/d_a_horse_static.cpp"), Object(NonMatching, "d/d_demo.cpp"), - Object(MatchingFor("GZ2E01"), "d/d_door_param2.cpp"), + Object(MatchingFor("GZ2E01"), "d/d_door_param2.cpp", extra_cflags=['-pragma "nosyminline on"']), Object(NonMatching, "d/d_resorce.cpp"), Object(MatchingFor("GZ2E01"), "d/d_map_path.cpp"), Object(NonMatching, "d/d_map_path_fmap.cpp"), @@ -1438,7 +1438,7 @@ config.libs = [ ), ], }, - Rel("f_pc_profile_lst", [Object(MatchingFor("GZ2E01"), "f_pc/f_pc_profile_lst.cpp")]), + Rel("f_pc_profile_lst", [Object(Matching, "f_pc/f_pc_profile_lst.cpp")]), ActorRel(MatchingFor("GZ2E01"), "d_a_andsw"), ActorRel(NonMatching, "d_a_bg"), ActorRel(NonMatching, "d_a_bg_obj"), @@ -2002,7 +2002,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_lv8OptiLift"), ActorRel(NonMatching, "d_a_obj_lv8UdFloor"), ActorRel(NonMatching, "d_a_obj_lv9SwShutter"), - ActorRel(Matching, "d_a_obj_magLift"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLift"), ActorRel(NonMatching, "d_a_obj_magLiftRot"), ActorRel(NonMatching, "d_a_obj_maki"), ActorRel(NonMatching, "d_a_obj_master_sword"), diff --git a/include/DynamicLink.h b/include/DynamicLink.h index df6dfd3ab9f..db282a3ee9c 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -18,7 +18,10 @@ struct DynamicModuleControlBase { /* 800188DC */ virtual const char* getModuleName() const { return NULL; }; /* 80263210 */ virtual int getModuleSize() const { return 0; }; /* 80263200 */ virtual const char* getModuleTypeString() const {return "Base";}; - virtual void dump(); +#if __MWERKS__ && __MWERKS__ < 0x4200 + // This is illegal function overloading, but MWCC for GC allows it. MWCC for Wii does not. + virtual void dump(); +#endif /* 80262470 */ static void dump(); /* 802631FC */ virtual void dump2() {}; /* 802631DC */ virtual bool do_load() {return true;}; diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h index f1386577494..e8252bb4f50 100644 --- a/include/JSystem/J2DGraph/J2DPictureEx.h +++ b/include/JSystem/J2DGraph/J2DPictureEx.h @@ -33,8 +33,8 @@ public: /* 803069D8 */ virtual void setCullBack(_GXCullMode); /* 803069B8 */ virtual void setAlpha(u8); /* 80303AB4 */ virtual void drawSelf(f32, f32, f32 (*)[3][4]); - /* 80306A24 */ virtual void isUsed(ResTIMG const*); - /* 803071A4 */ virtual void isUsed(ResFONT const*); + /* 80306A24 */ virtual bool isUsed(ResTIMG const*); + /* 803071A4 */ virtual bool isUsed(ResFONT const*); /* 80306A0C */ virtual void rewriteAlpha(); /* 803071C4 */ virtual void setAnimation(J2DAnmBase*); /* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); } @@ -44,7 +44,7 @@ public: /* 80306B48 */ virtual void setAnimation(J2DAnmTevRegKey*); /* 80306B74 */ virtual void setAnimation(J2DAnmVisibilityFull*); /* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*); - /* 80306C70 */ virtual void animationPane(J2DAnmTransform const*); + /* 80306C70 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*); /* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*); /* 803039CC */ virtual bool prepareTexture(u8); /* 80306ED4 */ virtual bool append(ResTIMG const*, f32); @@ -84,8 +84,8 @@ public: /* 80306370 */ virtual bool setBlack(JUtility::TColor); /* 803063F8 */ virtual bool setWhite(JUtility::TColor); /* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor); - /* 803068F8 */ virtual void getBlack() const; - /* 80306958 */ virtual void getWhite() const; + /* 803068F8 */ virtual JUtility::TColor getBlack() const; + /* 80306958 */ virtual JUtility::TColor getWhite() const; /* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; } /* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]); /* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16, diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index e6b668d27f5..902a24ba55f 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -52,7 +52,7 @@ public: J3DTevBlock* getTevBlock() const { return mTevBlock; } J3DColorBlock* getColorBlock() const { return mColorBlock; } J3DTexGenBlock* getTexGenBlock() const { return mTexGenBlock; } - J3DDisplayListObj* getSharedDisplayListObj() const { return mSharedDLObj; } + J3DDisplayListObj* getSharedDisplayListObj() { return mSharedDLObj; } J3DIndBlock* getIndBlock() const { return mIndBlock; } J3DShape* getShape() { return mShape; } J3DJoint* getJoint() { return mJoint; } diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index 7a3fa71c665..fd8156e587a 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -23,9 +23,9 @@ struct JFWSystem { static u32 fifoBufSize; static u32 aramAudioBufSize; static u32 aramGraphBufSize; - static u32 streamPriority; - static u32 decompPriority; - static u32 aPiecePriority; + static s32 streamPriority; + static s32 decompPriority; + static s32 aPiecePriority; static ResFONT* systemFontRes; static GXRenderModeObj* renderMode; static u32 exConsoleBufferSize; diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h new file mode 100644 index 00000000000..753bc9d5ab1 --- /dev/null +++ b/include/JSystem/JGadget/define.h @@ -0,0 +1,46 @@ +#ifndef DEFINE_H +#define DEFINE_H + +#include "types.h" + +#ifdef __cplusplus +extern "C" { + +class JGadget_outMessage { +public: + typedef void (*MessageFunc)(const char*, int, const char*); + + static void warning(const char*, int, const char*); + + JGadget_outMessage(MessageFunc fn, const char* file, int line); + ~JGadget_outMessage(); + + JGadget_outMessage& operator<<(int param_1) { return *this << (s32)param_1; } + JGadget_outMessage& operator<<(u16); + JGadget_outMessage& operator<<(unsigned int); + JGadget_outMessage& operator<<(u8); + JGadget_outMessage& operator<<(const char* str); + JGadget_outMessage& operator<<(s8); + JGadget_outMessage& operator<<(s32); + JGadget_outMessage& operator<<(u32); + JGadget_outMessage& operator<<(const void*); + +private: + MessageFunc mMsgFunc; + char mBuffer[256]; + char* mWrite_p; + char* mFile; + int mLine; +}; + +#define JGADGET_ASSERTWARN(cond) ((cond) || (false)) + +#define JGADGET_EXITWARN(cond) \ + if (!(cond)) { \ + false; \ + return false; \ + } +} +#endif + +#endif diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index a34ec2b705d..fca7ba42f51 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -341,7 +341,7 @@ struct TVec3 : public Vec { } bool isZero() const { - return squared() <= 32.0f * FLT_EPSILON; + return squared() <= TUtil::epsilon(); } void cross(const TVec3& a, const TVec3& b) { diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 3a066f70add..0e82126cc77 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -35,11 +35,14 @@ struct JORServer; class JOREventListener { public: +#ifdef DEBUG virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; +#endif }; class JORReflexible : public JOREventListener { public: +#ifdef DEBUG JORReflexible(); static JORServer* getJORServer(); @@ -48,6 +51,7 @@ public: virtual void genObjectInfo(const JORGenEvent*); virtual void genMessage(JORMContext*) = 0; virtual void listenNodeEvent(const JORNodeEvent*); +#endif }; #endif /* JORREFLEXIBLE_H */ diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 8298d44481a..321c22646a9 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -212,16 +212,15 @@ namespace JMathInlineVEC { #endif } - inline f32 C_VECSquareMag(const Vec* v) { + inline f32 C_VECSquareMag(register const Vec* v) { register f32 x_y; register f32 z; register f32 res; - register const f32* src = &v->x; #ifdef __MWERKS__ asm { - psq_l x_y, 0(src), 0, 0 + psq_l x_y, 0(v), 0, 0 ps_mul x_y, x_y, x_y - lfs z, 8(src) + lfs z, 8(v) ps_madd res, z, z, x_y ps_sum0 res, res, x_y, x_y } diff --git a/include/JSystem/JStage/JSGActor.h b/include/JSystem/JStage/JSGActor.h index 4deeae1c660..ed3fc82930c 100644 --- a/include/JSystem/JStage/JSGActor.h +++ b/include/JSystem/JStage/JSGActor.h @@ -10,6 +10,16 @@ namespace JStage { * */ struct TActor : public TObject { + enum { + ID_NORMAL = -1, + ID_UNK_1 = 1, + ID_UNK_2 = 2, + ID_UNK_3 = 3, + ID_UNK_4 = 4, + ID_UNK_5 = 5, + ID_UNK_6 = 6, + }; + /* 80280A48 */ virtual ~TActor() = 0; /* 80280AA8 */ virtual s32 JSGFGetType() const; /* 80280AB0 */ virtual void JSGGetTranslation(Vec*) const; diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 182b2bbc436..a9b411a1f1d 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -178,6 +178,8 @@ struct TAdaptor { /* 80286648 */ static void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*, u32, void const*, u32); + const char* adaptor_getID_string() const; + void adaptor_setObject_(const TObject* pObject) { pObject_ = pObject; } diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 19d7f69ba57..45052de6f79 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -157,7 +157,10 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutputObject saoVVOutput_[2]; +#endif static TVVOutput_ANIMATION_FRAME_ saoVVOutput_ANIMATION_FRAME_[3]; /* 0x130 */ u32 field_0x130; @@ -220,7 +223,10 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object JStage::TCamera* get_pJSG_() { return (JStage::TCamera*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVVOutput saoVVOutput_[5]; +#endif /* 0x108 */ int field_0x108; /* 0x10C */ JStage::TObject* field_0x10c; @@ -248,7 +254,10 @@ struct TAdaptor_fog : public JStudio::TAdaptor_fog, public TAdaptor_object_ { JStage::TFog* get_pJSG_() { return (JStage::TFog*)pJSGObject_; } + // TODO: Why doesn't this line compile with MWCC version Wii/1.0? +#if __MWERKS__ && __MWERKS__ < 0x4200 static TVariableValueOutput_object_ saoVVOutput_[3]; +#endif }; struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_ { diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 233469b6529..a1c0cf11d7b 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -50,7 +50,7 @@ public: mFontSizeX = x; mFontSizeY = y; } - void setHeight(u32 height) { + void setHeight(unsigned int height) { mHeight = height; if (mHeight > mMaxLines) { mHeight = mMaxLines; diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index 1c53ecef78d..36720018908 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -35,6 +35,6 @@ private: /* 0x10 */ u8 field_0x10[0xC]; }; -inline void JUTCreateFifo(u32 bufSize) { new JUTGraphFifo(bufSize); } +inline JUTGraphFifo* JUTCreateFifo(u32 bufSize) { return new JUTGraphFifo(bufSize); } #endif /* JUTGRAPHFIFO_H */ diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 958f0dec80b..88dd42600b1 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -126,7 +126,7 @@ struct cXyz : Vec { f32 getMagXZ() const { return cXyz(this->x, 0, this->z).getSquareMag(); } - f32 getDotProduct(const Vec& other) const { return VECDotProduct(this, &other); } + f32 getDotProduct(const Vec& other) const { return PSVECDotProduct(this, &other); } f32 inprod(const Vec& other) const { return getDotProduct(other); } f32 inprodXZ(const Vec& other) const { return x * other.x + z * other.z; } diff --git a/include/Z2AudioLib/Z2Instances.h b/include/Z2AudioLib/Z2Instances.h index 71e2fa7433f..0f1a02cdb17 100644 --- a/include/Z2AudioLib/Z2Instances.h +++ b/include/Z2AudioLib/Z2Instances.h @@ -7,30 +7,30 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #define AUDIO_INSTANCES \ - JASDefaultBankTable* JASGlobalInstance::sInstance; \ - JASAudioThread* JASGlobalInstance::sInstance; \ - Z2SeMgr* JASGlobalInstance::sInstance; \ - Z2SeqMgr* JASGlobalInstance::sInstance; \ - Z2SceneMgr* JASGlobalInstance::sInstance; \ - Z2StatusMgr* JASGlobalInstance::sInstance; \ - Z2DebugSys* JASGlobalInstance::sInstance; \ - JAISoundStarter* JASGlobalInstance::sInstance; \ - Z2SoundStarter* JASGlobalInstance::sInstance; \ - Z2SpeechMgr2* JASGlobalInstance::sInstance; \ - JAISeMgr* JASGlobalInstance::sInstance; \ - JAISeqMgr* JASGlobalInstance::sInstance; \ - JAIStreamMgr* JASGlobalInstance::sInstance; \ - Z2SoundMgr* JASGlobalInstance::sInstance; \ - JAISoundInfo* JASGlobalInstance::sInstance; \ - JAUSoundTable* JASGlobalInstance::sInstance; \ - JAUSoundNameTable* JASGlobalInstance::sInstance; \ - JAUSoundInfo* JASGlobalInstance::sInstance; \ - Z2SoundInfo* JASGlobalInstance::sInstance; \ - Z2SoundObjMgr* JASGlobalInstance::sInstance; \ - Z2Audience* JASGlobalInstance::sInstance; \ - Z2FxLineMgr* JASGlobalInstance::sInstance; \ - Z2EnvSeMgr* JASGlobalInstance::sInstance; \ - Z2SpeechMgr* JASGlobalInstance::sInstance; \ - Z2WolfHowlMgr* JASGlobalInstance::sInstance; + template<> JASDefaultBankTable* JASGlobalInstance::sInstance; \ + template<> JASAudioThread* JASGlobalInstance::sInstance; \ + template<> Z2SeMgr* JASGlobalInstance::sInstance; \ + template<> Z2SeqMgr* JASGlobalInstance::sInstance; \ + template<> Z2SceneMgr* JASGlobalInstance::sInstance; \ + template<> Z2StatusMgr* JASGlobalInstance::sInstance; \ + template<> Z2DebugSys* JASGlobalInstance::sInstance; \ + template<> JAISoundStarter* JASGlobalInstance::sInstance; \ + template<> Z2SoundStarter* JASGlobalInstance::sInstance; \ + template<> Z2SpeechMgr2* JASGlobalInstance::sInstance; \ + template<> JAISeMgr* JASGlobalInstance::sInstance; \ + template<> JAISeqMgr* JASGlobalInstance::sInstance; \ + template<> JAIStreamMgr* JASGlobalInstance::sInstance; \ + template<> Z2SoundMgr* JASGlobalInstance::sInstance; \ + template<> JAISoundInfo* JASGlobalInstance::sInstance; \ + template<> JAUSoundTable* JASGlobalInstance::sInstance; \ + template<> JAUSoundNameTable* JASGlobalInstance::sInstance; \ + template<> JAUSoundInfo* JASGlobalInstance::sInstance; \ + template<> Z2SoundInfo* JASGlobalInstance::sInstance; \ + template<> Z2SoundObjMgr* JASGlobalInstance::sInstance; \ + template<> Z2Audience* JASGlobalInstance::sInstance; \ + template<> Z2FxLineMgr* JASGlobalInstance::sInstance; \ + template<> Z2EnvSeMgr* JASGlobalInstance::sInstance; \ + template<> Z2SpeechMgr* JASGlobalInstance::sInstance; \ + template<> Z2WolfHowlMgr* JASGlobalInstance::sInstance; -#endif \ No newline at end of file +#endif diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h index df17a68936e..668a1164cbd 100644 --- a/include/Z2AudioLib/Z2SoundInfo.h +++ b/include/Z2AudioLib/Z2SoundInfo.h @@ -23,6 +23,8 @@ public: /* 802BBA10 */ const char* getStreamFilePath(JAISoundID); /* 802BBAC8 */ int getSwBit(JAISoundID) const; /* 802BBB48 */ void getSoundInfo_(JAISoundID, JAISound*) const; + + BOOL isValid() const; }; diff --git a/include/d/actor/d_a_andsw.h b/include/d/actor/d_a_andsw.h index 996f1882b5a..1053330a09c 100644 --- a/include/d/actor/d_a_andsw.h +++ b/include/d/actor/d_a_andsw.h @@ -21,7 +21,7 @@ public: return fopAcM_GetParamBit(this,8,8); } - u16 getTimer() { + u8 getTimer() { return fopAcM_GetParamBit(this,16,8); } @@ -39,5 +39,14 @@ public: /* 0x56A */ s16 mTimer; }; +class daAndsw_HIO_c : public mDoHIO_entry_c { +public: + daAndsw_HIO_c(); + + void genMessage(JORMContext*); + + /* 0x06 */ u8 field_0x6; +}; + #endif /* D_A_ANDSW_H */ diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h index e1eee255894..6fcb9509339 100644 --- a/include/d/actor/d_a_b_dr.h +++ b/include/d/actor/d_a_b_dr.h @@ -176,11 +176,13 @@ private: STATIC_ASSERT(sizeof(daB_DR_c) == 0x2860); -class daB_DR_HIO_c { +class daB_DR_HIO_c : public JORReflexible { public: /* 805BAE6C */ daB_DR_HIO_c(); /* 805C6B94 */ virtual ~daB_DR_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 model_size; /* 0x0C */ f32 fall_accel; diff --git a/include/d/actor/d_a_e_pz.h b/include/d/actor/d_a_e_pz.h index 48cbd40db0e..a87afadc091 100644 --- a/include/d/actor/d_a_e_pz.h +++ b/include/d/actor/d_a_e_pz.h @@ -125,11 +125,13 @@ public: STATIC_ASSERT(sizeof(daE_PZ_c) == 0xEF8); -class daE_PZ_HIO_c { +class daE_PZ_HIO_c : public JORReflexible { public: /* 8075856C */ daE_PZ_HIO_c(); /* 80760C60 */ virtual ~daE_PZ_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s8 no; /* 0x08 */ f32 body_model_size; /* 0x0C */ f32 portal_model_size; diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h index ddcca50ec81..4ea9b699d04 100644 --- a/include/d/actor/d_a_myna.h +++ b/include/d/actor/d_a_myna.h @@ -189,6 +189,8 @@ public: // Must be inlined but defined in .cpp for sinit to match inline daMyna_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; // DAT_8094ba40 /* 0x08 */ f32 field_0x08; // DAT_8094ba44 /* 0x0C */ f32 field_0x0C; // DAT_8094ba48 diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h index 9d6ef875385..58dd227d9fe 100644 --- a/include/d/actor/d_a_npc_cd2.h +++ b/include/d/actor/d_a_npc_cd2.h @@ -80,7 +80,7 @@ public: /* 0x850 */ dCcD_Stts mStts; /* 0x88C */ dCcD_Cyl mCyl; /* 0x9C8 */ dNpcLib_lookat_c mLookat; - /* 0xA98 */ int field_0xa98; + /* 0xA98 */ int m_type; /* 0xA9C */ u8 field_0xa9c[0xAA0 - 0xA9C]; /* 0xAA4 */ int field_0xaa0; /* 0xAA4 */ int field_0xaa4; diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h index e8f4c7d4090..63649da81f4 100644 --- a/include/d/actor/d_a_obj_Turara.h +++ b/include/d/actor/d_a_obj_Turara.h @@ -92,6 +92,8 @@ public: /* 80B9CB8C */ daTurara_HIO_c(); /* 80B9E5B4 */ virtual ~daTurara_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 mGravity; /* 0x0c */ f32 mMaxGravity; diff --git a/include/d/actor/d_a_obj_TvCdlst.h b/include/d/actor/d_a_obj_TvCdlst.h index 765c4924e9f..14d8a8ec313 100644 --- a/include/d/actor/d_a_obj_TvCdlst.h +++ b/include/d/actor/d_a_obj_TvCdlst.h @@ -2,7 +2,7 @@ #define D_A_OBJ_TVCDLST_H #include "f_op/f_op_actor_mng.h" -#include "include/d/d_com_inf_game.h" +#include "d/d_com_inf_game.h" /** * @ingroup actors-objects @@ -59,6 +59,8 @@ public: /* 80B9ECCC */ daTvCdlst_HIO_c(); /* 80B9F7B0 */ virtual ~daTvCdlst_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_barDesk.h b/include/d/actor/d_a_obj_barDesk.h index ba7076f4e9b..45ca0ead3e5 100644 --- a/include/d/actor/d_a_obj_barDesk.h +++ b/include/d/actor/d_a_obj_barDesk.h @@ -47,6 +47,8 @@ public: /* 80BA918C */ daBarDesk_HIO_c(); /* 80BA9A90 */ ~daBarDesk_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h index 4b264d78726..8b126341251 100644 --- a/include/d/actor/d_a_obj_bmWindow.h +++ b/include/d/actor/d_a_obj_bmWindow.h @@ -77,6 +77,8 @@ public: /* 80BB820C */ daBmWindow_HIO_c(); /* 80BB964C */ virtual ~daBmWindow_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x08 */ f32 field_0x08; diff --git a/include/d/actor/d_a_obj_bsGate.h b/include/d/actor/d_a_obj_bsGate.h index 7a1b497ae3a..18d423f48e8 100644 --- a/include/d/actor/d_a_obj_bsGate.h +++ b/include/d/actor/d_a_obj_bsGate.h @@ -53,6 +53,8 @@ public: /* 80BC288C */ daBsGate_HIO_c(); /* 80BC30F4 */ ~daBsGate_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mOpenSpeed; /* 0x8 */ f32 mCloseSpeed; /* 0xC */ u8 mShockStrength; diff --git a/include/d/actor/d_a_obj_bubblePilar.h b/include/d/actor/d_a_obj_bubblePilar.h index 5db9043d57e..7243f98fedd 100644 --- a/include/d/actor/d_a_obj_bubblePilar.h +++ b/include/d/actor/d_a_obj_bubblePilar.h @@ -63,6 +63,8 @@ public: /* 80BC33EC */ daBubbPilar_HIO_c(); /* 80BC3F90 */ virtual ~daBubbPilar_HIO_c() {}; + void genMessage(JORMContext*); + u8 field_0x4; u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_drop.h b/include/d/actor/d_a_obj_drop.h index 24a750e36d7..5d4f904ede2 100644 --- a/include/d/actor/d_a_obj_drop.h +++ b/include/d/actor/d_a_obj_drop.h @@ -94,5 +94,10 @@ public: STATIC_ASSERT(sizeof(daObjDrop_c) == 0xa7c); +class daObjDrop_HIO_c { +public: + u8 pad[0x17]; + /* 0x17 */ u8 field_0x17; +}; #endif /* D_A_OBJ_DROP_H */ diff --git a/include/d/actor/d_a_obj_fireWood.h b/include/d/actor/d_a_obj_fireWood.h index 3af0c29a029..1852e6f4955 100644 --- a/include/d/actor/d_a_obj_fireWood.h +++ b/include/d/actor/d_a_obj_fireWood.h @@ -48,6 +48,8 @@ public: /* 80BE762C */ daFireWood_HIO_c(); /* 80BE7F24 */ virtual ~daFireWood_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mFlameOffsetY; /* 0x8 */ f32 mCollisionRadius; /* 0xC */ u8 mWaitTime; diff --git a/include/d/actor/d_a_obj_fireWood2.h b/include/d/actor/d_a_obj_fireWood2.h index cb3d0bf7784..aa3a445c4fa 100644 --- a/include/d/actor/d_a_obj_fireWood2.h +++ b/include/d/actor/d_a_obj_fireWood2.h @@ -51,6 +51,8 @@ public: /* 80BE824C */ daFireWood2_HIO_c(); /* 80BE8E54 */ virtual ~daFireWood2_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 mFlameOffsetY; /* 0x08 */ f32 mCollisionDiameter; /* 0x0C */ f32 mCollisionHeight; diff --git a/include/d/actor/d_a_obj_glowSphere.h b/include/d/actor/d_a_obj_glowSphere.h index e2f3d8f5f82..2b83499a2be 100644 --- a/include/d/actor/d_a_obj_glowSphere.h +++ b/include/d/actor/d_a_obj_glowSphere.h @@ -169,6 +169,8 @@ public: /* 80BF934C */ daGlwSph_HIO_c(); /* 80BFA76C */ virtual ~daGlwSph_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 speed; /* 0x8 */ f32 speed2; }; diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h index b5f4bd3ed2f..dd4ffecc000 100644 --- a/include/d/actor/d_a_obj_groundwater.h +++ b/include/d/actor/d_a_obj_groundwater.h @@ -76,6 +76,8 @@ public: /* 80C134AC */ daGrdWater_HIO_c(); /* 80C148A8 */ virtual ~daGrdWater_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x06 */ u8 field_0x06; diff --git a/include/d/actor/d_a_obj_heavySw.h b/include/d/actor/d_a_obj_heavySw.h index 9818d843cbb..1d590723745 100644 --- a/include/d/actor/d_a_obj_heavySw.h +++ b/include/d/actor/d_a_obj_heavySw.h @@ -63,6 +63,8 @@ public: /* 80C1CAEC */ daHeavySw_HIO_c(); /* 80C1D9D8 */ virtual ~daHeavySw_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 field_0x08; /* 0x0C */ f32 field_0x0c; diff --git a/include/d/actor/d_a_obj_hsTarget.h b/include/d/actor/d_a_obj_hsTarget.h index cae38a24217..86c9df8d285 100644 --- a/include/d/actor/d_a_obj_hsTarget.h +++ b/include/d/actor/d_a_obj_hsTarget.h @@ -31,10 +31,12 @@ private: STATIC_ASSERT(sizeof(daHsTarget_c) == 0x5B0); -class daHsTarget_HIO_c : mDoHIO_entry_c { +class daHsTarget_HIO_c : public mDoHIO_entry_c { public: /* 80C1F42C */ daHsTarget_HIO_c(); /* 80C1F7F4 */ virtual ~daHsTarget_HIO_c() {} + + void genMessage(JORMContext*); }; #endif /* D_A_OBJ_HSTARGET_H */ diff --git a/include/d/actor/d_a_obj_kiPot.h b/include/d/actor/d_a_obj_kiPot.h index dd2bfc43997..2b18f00c262 100644 --- a/include/d/actor/d_a_obj_kiPot.h +++ b/include/d/actor/d_a_obj_kiPot.h @@ -37,8 +37,9 @@ public: /* 80C44D0C */ daKiPot_HIO_c(); /* 80C450E8 */ virtual ~daKiPot_HIO_c() {}; - /* 0x00 */ /* vtable */ + void genMessage(JORMContext*); + /* 0x00 */ /* vtable */ /* 0x06 */ u8 field_0x06; }; diff --git a/include/d/actor/d_a_obj_ktOnFire.h b/include/d/actor/d_a_obj_ktOnFire.h index 2f7bd572de3..3dde8f503b1 100644 --- a/include/d/actor/d_a_obj_ktOnFire.h +++ b/include/d/actor/d_a_obj_ktOnFire.h @@ -40,10 +40,12 @@ public: /* 8058C60C */ daKtOnFire_HIO_c(); /* 8058CEA8 */ ~daKtOnFire_HIO_c() {} - u8 mTimer; - u8 mColor1R; - u8 mColor1G; - u8 mColor1B; + void genMessage(JORMContext*); + + u8 mTimer; + u8 mColor1R; + u8 mColor1G; + u8 mColor1B; }; diff --git a/include/d/actor/d_a_obj_lv1Candle00.h b/include/d/actor/d_a_obj_lv1Candle00.h index cba9ac9a228..681959f6e7d 100644 --- a/include/d/actor/d_a_obj_lv1Candle00.h +++ b/include/d/actor/d_a_obj_lv1Candle00.h @@ -57,6 +57,8 @@ public: /* 80C55D0C */ daLv1Cdl00_HIO_c(); /* 80C56970 */ ~daLv1Cdl00_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_lv1Candle01.h b/include/d/actor/d_a_obj_lv1Candle01.h index ceefc61d09c..dc39d497aaf 100644 --- a/include/d/actor/d_a_obj_lv1Candle01.h +++ b/include/d/actor/d_a_obj_lv1Candle01.h @@ -53,6 +53,8 @@ public: /* 80C56CAC */ daLv1Cdl01_HIO_c(); /* 80C5777C */ ~daLv1Cdl01_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_lv2Candle.h b/include/d/actor/d_a_obj_lv2Candle.h index 80d39e27949..f2b24881f84 100644 --- a/include/d/actor/d_a_obj_lv2Candle.h +++ b/include/d/actor/d_a_obj_lv2Candle.h @@ -71,6 +71,8 @@ public: /* 8058E04C */ daLv2Candle_HIO_c(); /* 8058F050 */ ~daLv2Candle_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mTimer; /* 0x08 */ f32 mPow; /* 0x0C */ f32 mAnmMaxStep; diff --git a/include/d/actor/d_a_obj_lv3Candle.h b/include/d/actor/d_a_obj_lv3Candle.h index b7764219786..8bc4dcbe38a 100644 --- a/include/d/actor/d_a_obj_lv3Candle.h +++ b/include/d/actor/d_a_obj_lv3Candle.h @@ -56,6 +56,8 @@ public: /* 80C57ACC */ daLv3Candle_HIO_c(); /* 80C58484 */ virtual ~daLv3Candle_HIO_c() {} + void genMessage(JORMContext*); + /* 0x00 vtable */ /* 0x04 */ u8 field_0x04; }; diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h index fc73ac290af..34d91349139 100644 --- a/include/d/actor/d_a_obj_lv3Water.h +++ b/include/d/actor/d_a_obj_lv3Water.h @@ -71,8 +71,9 @@ public: /* 80C587CC */ daLv3Water_HIO_c(); /* 80C59C34 */ virtual ~daLv3Water_HIO_c(); - /* 0x00 */ /* vtable */ + void genMessage(JORMContext*); + /* 0x00 */ /* vtable */ /* 0x04 */ u8 field_0x04; }; diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h index aca3e4a9475..595d87a6868 100644 --- a/include/d/actor/d_a_obj_lv3Water2.h +++ b/include/d/actor/d_a_obj_lv3Water2.h @@ -95,9 +95,7 @@ struct daLv3Water2_HIO_c : public mDoHIO_entry_c { /* 80C5A40C */ daLv3Water2_HIO_c(); /* 80C5B14C */ ~daLv3Water2_HIO_c() {} - #ifdef DEBUG void genMessage(JORMContext*); - #endif /* 0x04 */ u8 mLevelControlWaitFrames; }; diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h index 59ab82225b2..ef7a0b1fe7e 100644 --- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h +++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h @@ -58,6 +58,8 @@ public: /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c(); /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c(); + void genMessage(JORMContext*); + /* 0x4 */ s16 mEnemyWaitTime; }; diff --git a/include/d/actor/d_a_obj_lv4CandleTag.h b/include/d/actor/d_a_obj_lv4CandleTag.h index cbd8e2e8d31..f2832796d93 100644 --- a/include/d/actor/d_a_obj_lv4CandleTag.h +++ b/include/d/actor/d_a_obj_lv4CandleTag.h @@ -74,6 +74,8 @@ public: /* 80C5D44C */ dalv4CandleTag_HIO_c(); /* 80C5D9C0 */ ~dalv4CandleTag_HIO_c() {} + void genMessage(JORMContext*); + u8 mTimer; }; diff --git a/include/d/actor/d_a_obj_lv4Gate.h b/include/d/actor/d_a_obj_lv4Gate.h index fdad984ff8e..a8ebdbebc27 100644 --- a/include/d/actor/d_a_obj_lv4Gate.h +++ b/include/d/actor/d_a_obj_lv4Gate.h @@ -51,6 +51,8 @@ public: /* 80C5EB6C */ daLv4Gate_HIO_c(); /* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mMoveSpeed; /* 0x8 */ u8 mShockStrength; }; diff --git a/include/d/actor/d_a_obj_lv4HsTarget.h b/include/d/actor/d_a_obj_lv4HsTarget.h index 20bb3a1e903..45d6814bf46 100644 --- a/include/d/actor/d_a_obj_lv4HsTarget.h +++ b/include/d/actor/d_a_obj_lv4HsTarget.h @@ -34,6 +34,8 @@ class daLv4HsTarget_HIO_c : public mDoHIO_entry_c { public: /* 80C5F62C */ daLv4HsTarget_HIO_c(); /* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {} + + void genMessage(JORMContext*); }; #endif /* D_A_OBJ_LV4HSTARGET_H */ diff --git a/include/d/actor/d_a_obj_lv4PoGate.h b/include/d/actor/d_a_obj_lv4PoGate.h index 7678f39d20f..8f23e002e22 100644 --- a/include/d/actor/d_a_obj_lv4PoGate.h +++ b/include/d/actor/d_a_obj_lv4PoGate.h @@ -70,6 +70,8 @@ public: /* 80C5FBEC */ daLv4PoGate_HIO_c(); /* 80C60758 */ virtual ~daLv4PoGate_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ f32 mOpenSpeed; /* 0x08 */ f32 mCloseStep1Speed; /* 0x0C */ f32 mCloseStep2Speed; diff --git a/include/d/actor/d_a_obj_lv5FloorBoard.h b/include/d/actor/d_a_obj_lv5FloorBoard.h index 660906c6d0e..d35d7cb61ec 100644 --- a/include/d/actor/d_a_obj_lv5FloorBoard.h +++ b/include/d/actor/d_a_obj_lv5FloorBoard.h @@ -56,6 +56,8 @@ public: /* 80C6A60C */ daFlorBoad_HIO_c(); /* 80C6B058 */ virtual ~daFlorBoad_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ cXyz field_0x4; /* 0x10 */ u8 field_0x10; /* 0x11 */ u8 field_0x11; diff --git a/include/d/actor/d_a_obj_lv5IceWall.h b/include/d/actor/d_a_obj_lv5IceWall.h index 278bb330e5d..3efb3bc7cdd 100644 --- a/include/d/actor/d_a_obj_lv5IceWall.h +++ b/include/d/actor/d_a_obj_lv5IceWall.h @@ -65,6 +65,8 @@ public: /* 80C6B42C */ daIceWall_HIO_c(); /* 80C6C550 */ virtual ~daIceWall_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ cXyz xyz; /* 0x10 */ u8 hitcount; /* 0x11 */ u8 hitcount2; diff --git a/include/d/actor/d_a_obj_lv5SwIce.h b/include/d/actor/d_a_obj_lv5SwIce.h index f86e08aacc5..a3b883d31f9 100644 --- a/include/d/actor/d_a_obj_lv5SwIce.h +++ b/include/d/actor/d_a_obj_lv5SwIce.h @@ -57,6 +57,8 @@ public: /* 80C6C94C */ daLv5SwIce_HIO_c(); /* 80C6D418 */ virtual ~daLv5SwIce_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 hitcount; }; diff --git a/include/d/actor/d_a_obj_lv8OptiLift.h b/include/d/actor/d_a_obj_lv8OptiLift.h index cb8944138ae..e57e938a1ff 100644 --- a/include/d/actor/d_a_obj_lv8OptiLift.h +++ b/include/d/actor/d_a_obj_lv8OptiLift.h @@ -94,6 +94,8 @@ public: /* 80C8A30C */ daOptiLift_HIO_c(); /* 80C8B900 */ virtual ~daOptiLift_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mStopDisappearTime; /* 0x05 */ u8 mStartMoveTime; /* 0x06 */ u8 mColorAnmFrame; diff --git a/include/d/actor/d_a_obj_magLift.h b/include/d/actor/d_a_obj_magLift.h index 1b348333623..4ab4ae9d9c7 100644 --- a/include/d/actor/d_a_obj_magLift.h +++ b/include/d/actor/d_a_obj_magLift.h @@ -70,6 +70,8 @@ public: /* 80C8DA2C */ daMagLift_HIO_c(); /* 80C8E5B0 */ virtual ~daMagLift_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 field_0x5; }; diff --git a/include/d/actor/d_a_obj_magLiftRot.h b/include/d/actor/d_a_obj_magLiftRot.h index 109e0548fba..c981f9d089b 100644 --- a/include/d/actor/d_a_obj_magLiftRot.h +++ b/include/d/actor/d_a_obj_magLiftRot.h @@ -66,6 +66,8 @@ public: /* 80C8E94C */ daMagLiftRot_HIO_c(); /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ u8 mWaitTime; /* 0x08 */ f32 mInitSpeed; /* 0x0C */ f32 mAcceleration; diff --git a/include/d/actor/d_a_obj_onsenTaru.h b/include/d/actor/d_a_obj_onsenTaru.h index 2740785f6a5..2bfc2bd9c4d 100644 --- a/include/d/actor/d_a_obj_onsenTaru.h +++ b/include/d/actor/d_a_obj_onsenTaru.h @@ -82,6 +82,8 @@ public: /* 80CA85CC */ daOnsTaru_HIO_c(); /* 80CA9A78 */ virtual ~daOnsTaru_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ s16 mCoolTime; /* 0x06 */ u8 mVibration; /* 0x08 */ f32 mSmokeScale; diff --git a/include/d/actor/d_a_obj_pillar.h b/include/d/actor/d_a_obj_pillar.h index e393353d94d..359d8c16b1d 100644 --- a/include/d/actor/d_a_obj_pillar.h +++ b/include/d/actor/d_a_obj_pillar.h @@ -93,6 +93,8 @@ public: /* 80CAF32C */ daPillar_HIO_c(); /* 80CB0928 */ virtual ~daPillar_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ daPillar_c::sdata_t mShakeData; /* 0x10 */ u8 field_0x10[0x1C - 0x10]; /* 0x1C */ f32 field_0x1c; diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h index f7f47732bf4..0bbdbb2dbad 100644 --- a/include/d/actor/d_a_obj_rfHole.h +++ b/include/d/actor/d_a_obj_rfHole.h @@ -60,6 +60,8 @@ public: /* 80CB8E6C */ daRfHole_HIO_c(); /* 80CB99D8 */ virtual ~daRfHole_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 field_0x08; /* 0x0C */ f32 field_0x0c; diff --git a/include/d/actor/d_a_obj_sWallShutter.h b/include/d/actor/d_a_obj_sWallShutter.h index 3502b30c6b5..488099f3f1d 100644 --- a/include/d/actor/d_a_obj_sWallShutter.h +++ b/include/d/actor/d_a_obj_sWallShutter.h @@ -73,6 +73,8 @@ public: /* 805981EC */ daSwShutter_HIO_c(); /* 80598ECC */ virtual ~daSwShutter_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 mInitSpeed; /* 0x08 */ f32 mMaxSpeed; /* 0x0C */ f32 mAcceleration; diff --git a/include/d/actor/d_a_obj_saidan.h b/include/d/actor/d_a_obj_saidan.h index 156614e19d5..80402e783fe 100644 --- a/include/d/actor/d_a_obj_saidan.h +++ b/include/d/actor/d_a_obj_saidan.h @@ -49,6 +49,8 @@ struct daSaidan_HIO_c : public mDoHIO_entry_c { /* 80CC3DAC */ daSaidan_HIO_c(); /* 80CC4478 */ virtual ~daSaidan_HIO_c() {} + void genMessage(JORMContext*); + /* 0x00 vtable */ /* 0x04 */ f32 mMaxStep; /* 0x08 */ f32 mTargetPosX; diff --git a/include/d/actor/d_a_obj_snowEffTag.h b/include/d/actor/d_a_obj_snowEffTag.h index f568d5da9f8..406434f9b66 100644 --- a/include/d/actor/d_a_obj_snowEffTag.h +++ b/include/d/actor/d_a_obj_snowEffTag.h @@ -39,6 +39,8 @@ public: /* 80CDF0AC */ daSnowEffTag_HIO_c(); /* 80CDF674 */ virtual ~daSnowEffTag_HIO_c(); + void genMessage(JORMContext*); + /* 0x4 */ u8 field_0x4; /* 0x5 */ u8 mDisplayRange; /* 0x6 */ u8 mTop; diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h index 246cc726b36..d22e8dff2c2 100644 --- a/include/d/actor/d_a_obj_syRock.h +++ b/include/d/actor/d_a_obj_syRock.h @@ -111,6 +111,8 @@ public: /* 80D022AC */ daSyRock_HIO_c(); /* 80D03C44 */ ~daSyRock_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ f32 mShakeAmplitude; // "揺れ強さ" "Shake strength" | Slider /* 0x08 */ f32 mShakeXOscillationAngle; // "振幅Ｘ" "Amplitude X" | Slider /* 0x0C */ f32 mShakeZOscillationAngle; // "振幅Ｚ" "Amplitude Z" | Slider diff --git a/include/d/actor/d_a_obj_timeFire.h b/include/d/actor/d_a_obj_timeFire.h index 25c3f4d4912..ae8422ba316 100644 --- a/include/d/actor/d_a_obj_timeFire.h +++ b/include/d/actor/d_a_obj_timeFire.h @@ -51,6 +51,8 @@ public: /* 80D0E8EC */ daTimeFire_HIO_c(); /* 80D0F038 */ virtual ~daTimeFire_HIO_c() {} + void genMessage(JORMContext*); + u8 field_0x4; }; diff --git a/include/d/actor/d_a_obj_treesh.h b/include/d/actor/d_a_obj_treesh.h index 267e0866133..916bb9195fa 100644 --- a/include/d/actor/d_a_obj_treesh.h +++ b/include/d/actor/d_a_obj_treesh.h @@ -41,6 +41,8 @@ public: /* 80D1F0CC */ daTreeSh_HIO_c(); /* 80D1F81C */ virtual ~daTreeSh_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ s16 shake_strength; /* 0x6 */ s16 shake_speed; /* 0x8 */ s16 field_0x8; diff --git a/include/d/actor/d_a_obj_waterGate.h b/include/d/actor/d_a_obj_waterGate.h index d9918e1cf29..b0d9d62422b 100644 --- a/include/d/actor/d_a_obj_waterGate.h +++ b/include/d/actor/d_a_obj_waterGate.h @@ -58,9 +58,7 @@ struct daWtGate_HIO_c : public mDoHIO_entry_c { /* 80D2BB8C */ daWtGate_HIO_c(); /* 80D2C3C0 */ ~daWtGate_HIO_c() {}; - #ifdef DEBUG void genMessage(JORMContext*); - #endif /* 0x4 */ f32 mMaxSpeed; /* 0x8 */ u8 field_0x8; // Modified, but never read; unused? diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h index af54ca5c797..72fa1b9b5dd 100644 --- a/include/d/actor/d_a_obj_waterPillar.h +++ b/include/d/actor/d_a_obj_waterPillar.h @@ -151,6 +151,8 @@ struct daWtPillar_HIO_c : public mDoHIO_entry_c { /* 80D2C6CC */ daWtPillar_HIO_c(); /* 80D2DF34 */ ~daWtPillar_HIO_c() {}; + void genMessage(JORMContext*); + /* 0x04 */ cXyz field_0x04; /* 0x10 */ csXyz field_0x10; /* 0x16 */ s8 mForTesting; // "----------- テスト用 ----------" "----------- For Testing ----------" | Checkbox diff --git a/include/d/actor/d_a_obj_wdStick.h b/include/d/actor/d_a_obj_wdStick.h index 1e9f5315992..6bc492bb9f4 100644 --- a/include/d/actor/d_a_obj_wdStick.h +++ b/include/d/actor/d_a_obj_wdStick.h @@ -92,6 +92,8 @@ public: /* 80D31B4C */ daWdStick_HIO_c(); /* 80D34030 */ virtual ~daWdStick_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x04; /* 0x05 */ u8 field_0x05; /* 0x06 */ s16 field_0x06; diff --git a/include/d/actor/d_a_obj_yobikusa.h b/include/d/actor/d_a_obj_yobikusa.h index 0cffc12b5cf..7a61d4eb584 100644 --- a/include/d/actor/d_a_obj_yobikusa.h +++ b/include/d/actor/d_a_obj_yobikusa.h @@ -29,7 +29,7 @@ public: typedef struct actionFuncEntry { actionFunc initFn; actionFunc execFn; - }; + } actionFuncEntry; typedef struct attributes { /* 0x00 */ f32 field_0x00; @@ -50,7 +50,7 @@ public: /* 0x3A */ s16 field_0x3a; /* 0x3C */ s16 mNewLeafTickSpeed; /* 0x3E */ s16 mPickLeafTickSpeed; - }; + } attributes; /* 8059C9F8 */ void setAction(daObjYobikusa_c::Mode_e); /* 8059CA2C */ void callInit(); diff --git a/include/d/actor/d_a_obj_zrTurara.h b/include/d/actor/d_a_obj_zrTurara.h index e7df96ba3cb..06669698290 100644 --- a/include/d/actor/d_a_obj_zrTurara.h +++ b/include/d/actor/d_a_obj_zrTurara.h @@ -61,6 +61,8 @@ public: /* 80D4056C */ daZrTurara_HIO_c(); /* 80D414BC */ ~daZrTurara_HIO_c() {} + void genMessage(JORMContext*); + /* 0x4 */ f32 mDebrisRange; /* 0x8 */ u8 mDebrisNum; }; diff --git a/include/d/actor/d_a_obj_zrTuraraRock.h b/include/d/actor/d_a_obj_zrTuraraRock.h index 0d178e6f6ab..211ba3581e4 100644 --- a/include/d/actor/d_a_obj_zrTuraraRock.h +++ b/include/d/actor/d_a_obj_zrTuraraRock.h @@ -56,6 +56,8 @@ public: /* 80D4188C */ daZrTuraRc_HIO_c(); /* 80D422D0 */ ~daZrTuraRc_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04; /* 0x08 */ f32 mGravity; /* 0x0C */ f32 mMaxFallSpeed; diff --git a/include/d/actor/d_a_tag_CstaSw.h b/include/d/actor/d_a_tag_CstaSw.h index ecb13d21111..98e30c4c702 100644 --- a/include/d/actor/d_a_tag_CstaSw.h +++ b/include/d/actor/d_a_tag_CstaSw.h @@ -27,6 +27,8 @@ public: /* 805A202C */ daTagCstaSw_HIO_c(); /* 805A2480 */ virtual ~daTagCstaSw_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tag_lv6CstaSw.h b/include/d/actor/d_a_tag_lv6CstaSw.h index 90af63fac48..1fb95f9fff6 100644 --- a/include/d/actor/d_a_tag_lv6CstaSw.h +++ b/include/d/actor/d_a_tag_lv6CstaSw.h @@ -26,6 +26,8 @@ public: /* 80D5B2EC */ daLv6CstaSw_HIO_c(); /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tag_poFire.h b/include/d/actor/d_a_tag_poFire.h index 0b02ee50257..d198e1c8768 100644 --- a/include/d/actor/d_a_tag_poFire.h +++ b/include/d/actor/d_a_tag_poFire.h @@ -22,6 +22,8 @@ public: /* 80D5DACC */ daTagPoFire_HIO_c(); /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c(); + void genMessage(JORMContext*); + u8 unk_0x4; }; diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index 2987743ece8..ce0e14b68f1 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -192,11 +192,13 @@ private: STATIC_ASSERT(sizeof(daTbox_c) == 0xA30); -class daTbox_HIO_c : mDoHIO_entry_c { +class daTbox_HIO_c : public mDoHIO_entry_c { public: /* 80490D2C */ daTbox_HIO_c(); /* 804960B8 */ virtual ~daTbox_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 mItemNo; /* 0x05 */ u8 mUseDebugItemNo; /* 0x06 */ u8 mClearSwitch; diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 93e80820e9e..eb8b5dd706d 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -8,10 +8,12 @@ #include "d/d_com_inf_game.h" #include "d/d_particle.h" -struct daYkgr_HIO_c : mDoHIO_entry_c { +struct daYkgr_HIO_c : public mDoHIO_entry_c { daYkgr_HIO_c(); /* 805A8D98 */ virtual ~daYkgr_HIO_c(); + void genMessage(JORMContext*); + /* 0x04 */ u8 field_0x4; /* 0x08 */ s32 field_0x8; /* 0x0C */ s32 field_0xc; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index bea35dbd265..0c357afd9d0 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -116,6 +116,8 @@ public: /* 80075F94 */ virtual ~dBgS_Acch(); + void DrawWall(dBgS&); + cXyz* GetPos() { return pm_pos; } cXyz* GetOldPos() { return pm_old_pos; } f32 GetGroundH() const { return m_ground_h; } diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 730f9eea3d5..95b57f812f6 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -410,6 +410,8 @@ public: /* 8018295C */ void footHeightOf(fopAc_ac_c*); /* 801829AC */ cSAngle Bank() { return mBank + mShake.field_0x40; } + void debugDraw(); + bool Active() { return field_0x24 == 0; } f32 TrimHeight() { return mTrimHeight; } int Type() { return mCurType; } diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 6bb9ee04ad7..47be9c8d55d 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -85,11 +85,11 @@ public: /* 80038098 */ virtual ~dDemo_actor_c(); /* 800387EC */ virtual void JSGSetData(u32, void const*, u32); /* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const { - JUT_ASSERT(mModel != 0); + JUT_ASSERT(0, mModel != 0); return mModel->getModelData()->getJointName()->getIndex(param_0); } /* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { - JUT_ASSERT(mModel != 0); + JUT_ASSERT(0, mModel != 0); cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1); return true; } @@ -365,14 +365,16 @@ public: static void offStatus(u32 status) { m_status &= ~status; } static void setBranchData(const u8* p_data) { m_branchData = p_data; } static s16 getBranchId() { return m_branchId; } + static s16 getBranchNum() { return m_branchNum; } static jmessage_tControl* getMesgControl() { return m_mesgControl; } static dDemo_camera_c* getCamera() { - JUT_ASSERT(m_object != 0); + JUT_ASSERT(0, m_object != 0); return m_object->getActiveCamera(); } static s16 m_branchId; + static s16 m_branchNum; static dDemo_system_c* m_system; static JStudio::TControl* m_control; static JStudio_JStage::TCreateObject* m_stage; diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index c0fc5671076..74d5497d91b 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -492,6 +492,15 @@ inline dScnKy_env_light_c* dKy_getEnvlight() { return &g_env_light; } +class dKankyo_HIO_c { +public: + u8 pad[0xB4]; + /* 0xB4 */ u8 field_0xB4; + /* 0xB8 */ f32 field_0xB8; +}; + +extern dKankyo_HIO_c g_kankyoHIO; + enum dKy_dice_wether_mode { DICE_MODE_SUNNY_e, DICE_MODE_CLOUDY_e, diff --git a/include/d/d_map_path_dmap.h b/include/d/d_map_path_dmap.h index 556ae024ca5..d7fc6edf930 100644 --- a/include/d/d_map_path_dmap.h +++ b/include/d/d_map_path_dmap.h @@ -67,7 +67,7 @@ public: /* 8003F754 */ static void remove(); static s8 getNowStayFloorNo() { - JUT_ASSERT(mNowStayFloorNoDecisionFlg); + JUT_ASSERT(0, mNowStayFloorNoDecisionFlg); s8 floor_no = 0; if (mNowStayFloorNoDecisionFlg) { diff --git a/include/d/d_menu_letter.h b/include/d/d_menu_letter.h index d376babc7ff..6a517e22a71 100644 --- a/include/d/d_menu_letter.h +++ b/include/d/d_menu_letter.h @@ -68,7 +68,7 @@ private: /* 0x014 */ mDoDvdThd_mountArchive_c* mpMount; /* 0x018 */ J2DScreen* mpMenuScreen; /* 0x01C */ J2DScreen* mpMenuDMYScreen; - /* 0x020 */ J2DScreen* mpMenuBaseScreen; + /* 0x020 */ J2DScreen* mpBaseScreen; /* 0x024 */ J2DScreen* mpSdwScreen; /* 0x028 */ J2DScreen* mpLetterScreen[2]; /* 0x030 */ J2DScreen* mpIconScreen; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 0b5f4168199..bce624e396f 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -42,7 +42,7 @@ public: return --mCount; } - static const int NAME_MAX = 8; + static const int NAME_MAX = 9; private: /* 0x00 */ char mArchiveName[11]; diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index c01f7a3fc52..816ca182d10 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -28,6 +28,8 @@ public: class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c { public: /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c() {} + + void genMessage(JORMContext*); }; class dScnPly_env_otherHIO_c { diff --git a/include/d/d_save.h b/include/d/d_save.h index 6419052425f..3ca0ce46425 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -18,7 +18,6 @@ #define MAX_INSECT_NUM 24 #define MAX_VISIBLE_HEARTPIECES 4 #define MAX_POH_NUM 100 -#define BOMB_BAG_MAX 3 #define BOTTLE_MAX 4 #define TBOX_MAX 64 #define DSV_MEMBIT_ENUM_MAX 8 @@ -320,6 +319,8 @@ public: void setRodTypeLevelUp(); void setBaitItem(u8 i_itemNo); + static const int BOMB_BAG_MAX = 3; + private: /* 0x00 */ u8 mItems[24]; /* 0x18 */ u8 mItemSlots[24]; diff --git a/include/dolphin/gx/GXGeometry.h b/include/dolphin/gx/GXGeometry.h index 188fa7a5905..c12a6f1b467 100644 --- a/include/dolphin/gx/GXGeometry.h +++ b/include/dolphin/gx/GXGeometry.h @@ -28,7 +28,7 @@ void GXBegin(GXPrimitive type, GXVtxFmt vtxfmt, u16 nverts); static inline void GXEnd(void) { #if DEBUG extern GXBool __GXinBegin; - extern void OSPanic(char* file, int line, char* msg, ...); + extern void OSPanic(const char* file, int line, const char* msg, ...); if (!__GXinBegin) { OSPanic(__FILE__, 118, "GXEnd: called without a GXBegin"); } diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 75094d31191..c38031b3246 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -209,7 +209,7 @@ __declspec(weak) void OSVReport(const char* format, va_list list); #define OS_REPORT(...) OSReport(__VA_ARGS__) #define OS_WARNING(...) OSReport_Warning(__VA_ARGS__) #define OS_REPORT_ERROR(...) OSReport_Error(__VA_ARGS__) -#define OS_PANIC(msg) OSPanic(__FILE__, __LINE__, msg) +#define OS_PANIC(line, msg) OSPanic(__FILE__, line, msg) #else #define OS_REPORT(...) #define OS_WARNING(...) diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 55e37df0217..9d061526b5f 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -29,6 +29,8 @@ typedef char *Ptr; typedef int BOOL; +typedef unsigned int uint; + #define FALSE 0 #define TRUE 1 diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 3cfdce5ff1d..e9ae3e1a4dd 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -64,6 +64,9 @@ enum fopAc_Cull_e { fopAc_CULLBOX_11_e, fopAc_CULLBOX_12_e, fopAc_CULLBOX_13_e, +#ifdef DEBUG + fopAc_CULLBOX_14_e, +#endif fopAc_CULLBOX_CUSTOM_e, fopAc_CULLSPHERE_0_e, fopAc_CULLSPHERE_1_e, @@ -79,6 +82,9 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_11_e, fopAc_CULLSPHERE_12_e, fopAc_CULLSPHERE_13_e, +#ifdef DEBUG + fopAc_CULLSPHERE_14_e, +#endif fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b36ed828a88..ea0694e0d8b 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -29,7 +29,7 @@ "Delete -> " actor_name_str "(id=%d)\n" #define fopAcM_RegisterCreateID(actor_class, i_this, actor_name_str) \ - static_cast(i_this); \ + actor_class* a_this = static_cast(i_this); \ const fpc_ProcID procID = fopAcM_GetID(i_this); \ "Create -> " actor_name_str "(id=%d)\n" @@ -376,7 +376,7 @@ inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) { } inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) { - return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14; + return (i_culltype >= 0 && i_culltype < fopAc_CULLBOX_CUSTOM_e) || i_culltype == fopAc_CULLBOX_CUSTOM_e; } inline const cXyz& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) { @@ -757,12 +757,14 @@ inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_ } #ifdef DEBUG -#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg, ...) \ - fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg, __VA_ARGS__) +#define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ + fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) #else #define fopAcM_setWarningMessage(...) #endif +void fopAcM_getNameString(fopAc_ac_c*, char*); + class fopAcM_lc_c { public: fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 71b2d935eec..e87c2fbebcb 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -119,11 +119,11 @@ inline void mDoMtx_quatRotAxisRad(Quaternion* q, const Vec* axis, f32 rad) { } inline void mDoMtx_identity(Mtx m) { - MTXIdentity(m); + PSMTXIdentity(m); } inline void mDoMtx_concat(const Mtx a, const Mtx b, Mtx c) { - MTXConcat(a, b, c); + PSMTXConcat(a, b, c); } inline void mDoMtx_inverse(const Mtx a, Mtx b) { diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp index c60dd7ba844..4cddb568a7f 100644 --- a/src/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp @@ -631,12 +631,12 @@ bool J2DPictureEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor pa } /* 803068F8-80306958 301238 0060+00 1/0 0/0 0/0 .text getBlack__12J2DPictureExCFv */ -void J2DPictureEx::getBlack() const { +JUtility::TColor J2DPictureEx::getBlack() const { // NONMATCHING } /* 80306958-803069B8 301298 0060+00 1/0 0/0 0/0 .text getWhite__12J2DPictureExCFv */ -void J2DPictureEx::getWhite() const { +JUtility::TColor J2DPictureEx::getWhite() const { // NONMATCHING } @@ -657,7 +657,7 @@ void J2DPictureEx::rewriteAlpha() { /* 80306A24-80306AC4 301364 00A0+00 1/0 0/0 0/0 .text isUsed__12J2DPictureExFPC7ResTIMG */ -void J2DPictureEx::isUsed(ResTIMG const* param_0) { +bool J2DPictureEx::isUsed(ResTIMG const* param_0) { // NONMATCHING } @@ -699,7 +699,7 @@ void J2DPictureEx::setAnimation(J2DAnmVtxColor* param_0) { /* 80306C70-80306DC8 3015B0 0158+00 1/0 0/0 0/0 .text * animationPane__12J2DPictureExFPC15J2DAnmTransform */ -void J2DPictureEx::animationPane(J2DAnmTransform const* param_0) { +const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* param_0) { // NONMATCHING } @@ -779,7 +779,7 @@ void J2DPictureEx::setCullBack(bool param_0) { /* 803071A4-803071C4 301AE4 0020+00 1/0 0/0 0/0 .text isUsed__12J2DPictureExFPC7ResFONT */ -void J2DPictureEx::isUsed(ResFONT const* param_0) { +bool J2DPictureEx::isUsed(ResFONT const* param_0) { // NONMATCHING } diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp index dbca675e9bb..32d5ac3118c 100644 --- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp @@ -7,6 +7,7 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JMath/JMATrigonometric.h" +#include "JSystem/JUtility/JUTAssert.h" #include "dolphin/base/PPCArch.h" #include "dolphin/os.h" @@ -275,4 +276,4 @@ void J3DDeformer::normalizeWeight(int i_keyNum, f32* i_weights) { for (u16 i = 0; i < i_keyNum; i++) { i_weights[i] *= scale; } -} \ No newline at end of file +} diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/src/JSystem/JAudio2/JAIStreamMgr.cpp index f80b3f6a155..ea4d9013448 100644 --- a/src/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/src/JSystem/JAudio2/JAIStreamMgr.cpp @@ -28,7 +28,7 @@ bool JAIStreamMgr::startSound(JAISoundID param_1, JAISoundHandle* param_2, } s32 streamFileEntry = streamDataMgr_->getStreamFileEntry(param_1); if (streamFileEntry < 0) { - JUT_WARN("Cannot find the stream file entry for ID:%08x\n", param_1) + JUT_WARN(46, "Cannot find the stream file entry for ID:%08x\n", param_1.mId.mFullId) return false; } JAIStream* stream = newStream_(); diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index 6b049bbfbaa..56cbd26beff 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "string.h" +#include "cstring.h" #include "dolphin/os.h" /* 80451290-80451298 000790 0004+04 1/1 0/0 0/0 .sbss sAramHeap__16JASWaveArcLoader */ diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index a7a599bcb03..7d8cd4e5254 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -32,6 +32,7 @@ JKRExpHeap* JFWSystem::systemHeap; /* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ void JFWSystem::firstInit() { + JUT_ASSERT(80, rootHeap == 0); OSInit(); DVDInit(); rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false); @@ -51,15 +52,15 @@ u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000; /* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam */ -u32 JFWSystem::CSetUpParam::streamPriority = 8; +s32 JFWSystem::CSetUpParam::streamPriority = 8; /* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam */ -u32 JFWSystem::CSetUpParam::decompPriority = 7; +s32 JFWSystem::CSetUpParam::decompPriority = 7; /* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam */ -u32 JFWSystem::CSetUpParam::aPiecePriority = 6; +s32 JFWSystem::CSetUpParam::aPiecePriority = 6; /* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */ ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12; @@ -92,6 +93,8 @@ static u8 sInitCalled; /* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text init__9JFWSystemFv */ // NONMATCHING - regalloc, equivalent void JFWSystem::init() { + JUT_ASSERT(101, sInitCalled == false); + if (rootHeap == NULL) { firstInit(); } diff --git a/src/JSystem/JHostIO/JHIhioASync.cpp b/src/JSystem/JHostIO/JHIhioASync.cpp index ea469905799..6d1630b35e7 100644 --- a/src/JSystem/JHostIO/JHIhioASync.cpp +++ b/src/JSystem/JHostIO/JHIhioASync.cpp @@ -1,6 +1,7 @@ #include "JSystem/JHostIO/JHIMccBuf.h" #include "JSystem/JHostIO/JHIRMcc.h" #include +#include "global.h" u32 gsEnableHostio; u32 gsEnableInterface; diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index 75935dc2ae2..59d57f646a4 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -441,16 +441,16 @@ void JORServer::hostinfo_localTime_(JSUMemoryInputStream& stream, JORHostInfo_Ca >> milliseconds; OSCalendarTime* pTime = pCalendarTime->getCalendarTime(); - pTime->seconds = seconds; - pTime->minutes = minutes; - pTime->hours = hours; - pTime->day_of_month = monthday; - pTime->month = month - 1; + pTime->sec = seconds; + pTime->min = minutes; + pTime->hour = hours; + pTime->mday = monthday; + pTime->mon = month - 1; pTime->year = year; - pTime->week_day = weekday; - pTime->milliseconds = milliseconds; - pTime->microseconds = 0; - pTime->year_day = monthday + JORGetYearDays(year, month - 1); + pTime->wday = weekday; + pTime->msec = milliseconds; + pTime->usec = 0; + pTime->yday = monthday + JORGetYearDays(year, month - 1); } void JORServer::sendReset() { diff --git a/src/JSystem/JParticle/JPAMath.cpp b/src/JSystem/JParticle/JPAMath.cpp index a2325f63a27..c86860382e2 100644 --- a/src/JSystem/JParticle/JPAMath.cpp +++ b/src/JSystem/JParticle/JPAMath.cpp @@ -43,14 +43,10 @@ static f32 floatDummyFunc() { /* 80280588-802806C0 27AEC8 0138+00 0/0 1/1 0/0 .text JPAGetDirMtx__FRCQ29JGeometry8TVec3PA4_f */ void JPAGetDirMtx(JGeometry::TVec3 const& param_0, f32 (*param_1)[4]) { - JGeometry::TVec3 local_78; - f32 minusx = -param_0.x; - local_78.x = param_0.y; - local_78.y = minusx; - local_78.z = 0.0f; + JGeometry::TVec3 local_78(param_0.y, -param_0.x, 0.0f); f32 len = local_78.length(); - if (len <= 32.0f * FLT_EPSILON) { + if (len <= JGeometry::TUtil::epsilon()) { local_78.zero(); } else { local_78.scale(1.0f / len); @@ -183,4 +179,4 @@ f32 JPACalcKeyAnmValue(f32 param_0, u16 param_1, f32 const* param_2) { return JMAHermiteInterpolation(param_0, param_2[0], param_2[1], param_2[3], param_2[4], param_2[5], param_2[6]); -} \ No newline at end of file +} diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp index 03434f045cf..29730463968 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp @@ -92,7 +92,7 @@ void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_1, void const* param_3, u32 param_4) { int uVar3; if (param_2 == 0) { - uVar3 = -1; + uVar3 = JStage::TActor::ID_NORMAL; } else { uVar3 = *(int*)param_1; } @@ -139,4 +139,4 @@ JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperat } break; } -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h index c8497d85589..348880dd385 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h @@ -4,13 +4,8 @@ #include "string.h" namespace std { -inline size_t strlen(const char* str) { - return ::strlen(str); -} +using ::strlen; +using ::strcpy; +}; // namespace std -inline char* strcpy(char* dest, const char* src) { - return ::strcpy(dest, src); -} -} // namespace std - -#endif \ No newline at end of file +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index 1b38e203173..4b0c0b22f5b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -73,8 +73,13 @@ inline int __fpclassifyd(double __value) { #define FLT_MAX_EXP 128 #define FLT_MAX_10_EXP 38 +#ifdef DEBUG +#define FLT_MAX 3.4028235e38f +#define FLT_EPSILON 1.1920929e-7f +#else #define FLT_MAX (*(float*) __float_max) #define FLT_EPSILON (*(float*) __float_epsilon) +#endif #define DBL_MANT_DIG 53 #define DBL_DIG 15 @@ -83,4 +88,4 @@ inline int __fpclassifyd(double __value) { #define DBL_MAX_EXP 1024 #define DBL_MAX_10_EXP 308 -#endif /* _MSL_COMMON_FLOAT_H */ \ No newline at end of file +#endif /* _MSL_COMMON_FLOAT_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h index 843576dbc2d..11453c10ca8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h @@ -23,7 +23,7 @@ char* strcpy(char* dst, const char* src); size_t strlen(const char* str); #ifdef __cplusplus -} +}; #endif -#endif /* _MSL_COMMON_STRING_H */ \ No newline at end of file +#endif /* _MSL_COMMON_STRING_H */ diff --git a/src/Z2AudioLib/Z2SpeechMgr2.cpp b/src/Z2AudioLib/Z2SpeechMgr2.cpp index 14647ae15c0..eeee84aabce 100644 --- a/src/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/src/Z2AudioLib/Z2SpeechMgr2.cpp @@ -489,7 +489,7 @@ void Z2SpeechMgr2::setString(u16 const* i_text, s16 i_textNum, u8 i_speaker, u16 if (i_textNum > 500) { mTextNum = 500; - JUT_WARN(387, "TOO MANY TEXT : now(%d) > max(%d)", param_2, 500); + JUT_WARN(387, "TOO MANY TEXT : now(%d) > max(%d)", i_textNum, 500); } else { mTextNum = i_textNum; } diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 51d8883d5e0..3bd81ae6785 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -6,13 +6,31 @@ #include "d/actor/d_a_andsw.h" #include "d/d_procname.h" +#ifdef DEBUG +daAndsw_HIO_c l_HIO; + +daAndsw_HIO_c::daAndsw_HIO_c() { + field_0x6 = 0; +} + +void daAndsw_HIO_c::genMessage(JORMContext* ctx) { + ctx->genLabel("ＳＷ監視", 0, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); + ctx->genCheckBox("ＳＷ状態出力", &field_0x6, 0x01, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); +} +#endif + /* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text Create__9daAndsw_cFv */ int daAndsw_c::Create() { mSwNo = getSwNo(); mSwNo2 = getSwNo2(); - u16 timer = getTimer(); - timer != 0xFF ? mTimer = getTimer() * 15 : mTimer = 0; + if (getTimer() != 0xFF) { + mTimer = getTimer() * 15; + } else { + mTimer = 0; + } + + OS_REPORT("ANDSW PARAM 0x%x\n", fopAcM_GetParam(this)); return 1; } @@ -23,6 +41,11 @@ int daAndsw_c::create() { if (!Create()) { return cPhs_ERROR_e; } + +#ifdef DEBUG + l_HIO.entryHIO("ＳＷ監視"); +#endif + return cPhs_COMPLEATE_e; } @@ -35,18 +58,35 @@ int daAndsw_c::execute() { if (mTimer == 0) { fopAcM_offSwitch(this,mSwNo); + +#ifdef DEBUG + if (l_HIO.field_0x6 != 0) { + OS_REPORT("-- ＳＷ監視状態出力 --\n"); + OS_REPORT("sw<%d>ＯＦＦしました\n", mSwNo); + } +#endif if (getType() == 1) { fopAcM_delete(this); + OS_REPORT("ＳＷ監視：ＳＷＯＦＦしたので処理終わりますSW<%d>\n", mSwNo); } } } +#ifdef DEBUG + else if (l_HIO.field_0x6 != 0) { + OS_REPORT("sw2<%d>を待っています\n", mSwNo2); + l_HIO.field_0x6 = 0; + } +#endif return 1; } /* 80457ABC-80457AC4 0001BC 0008+00 1/1 0/0 0/0 .text _delete__9daAndsw_cFv */ int daAndsw_c::_delete() { +#ifdef DEBUG + l_HIO.removeHIO(); +#endif return 1; } @@ -57,12 +97,14 @@ static int daAndsw_Execute(daAndsw_c* i_this) { /* 80457AE4-80457B04 0001E4 0020+00 1/0 0/0 0/0 .text daAndsw_Delete__FP9daAndsw_c */ static int daAndsw_Delete(daAndsw_c* i_this) { + fopAcM_RegisterDeleteID(i_this, "Andsw"); return i_this->_delete(); } /* 80457B04-80457B24 000204 0020+00 1/0 0/0 0/0 .text daAndsw_Create__FP10fopAc_ac_c */ static int daAndsw_Create(fopAc_ac_c* i_this) { - return static_cast(i_this)->create(); + fopAcM_RegisterCreateID(daAndsw_c, i_this, "Andsw"); + return a_this->create(); } /* ############################################################################################## */ @@ -70,7 +112,9 @@ static int daAndsw_Create(fopAc_ac_c* i_this) { static actor_method_class l_daAndsw_Method = { (process_method_func)daAndsw_Create, (process_method_func)daAndsw_Delete, - (process_method_func)daAndsw_Execute + (process_method_func)daAndsw_Execute, + (process_method_func)NULL, + (process_method_func)NULL, }; /* 80457B4C-80457B7C -00001 0030+00 0/0 0/0 1/0 .data g_profile_ANDSW */ diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index fcc1b55dae0..c6208b94bbd 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -2284,14 +2284,14 @@ static int daB_BQ_Execute(b_bq_class* i_this) { sp50 = a_this->eyePos; i_this->mCcCoreSph.SetC(sp50 + sp68); - MTXCopy(model->getAnmMtx(YREG_S(2) + JNT_CORE_3), *calc_mtx); + MTXCopy(model->getAnmMtx(YREG_S(2) + (int)JNT_CORE_3), *calc_mtx); sp44.set(YREG_F(3) + -250.0f, YREG_F(4), YREG_F(5)); MtxPosition(&sp44, &sp50); i_this->mCcSph.SetC(sp50 + sp68); i_this->mCcSph.SetR(YREG_F(14) + 350.0f); } else { - MTXCopy(model->getAnmMtx(YREG_S(1) + JNT_CORE_3), *calc_mtx); + MTXCopy(model->getAnmMtx(YREG_S(1) + (int)JNT_CORE_3), *calc_mtx); sp44.set((XREG_F(3) + 300.0f) - 70.0f, XREG_F(4) + 50.0f, XREG_F(5)); MtxPosition(&sp44, &a_this->eyePos); a_this->attention_info.position = a_this->eyePos; @@ -2480,7 +2480,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", 0x1A); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpEyeballModel == NULL) { @@ -2523,7 +2523,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { dComIfGs_offSwitch((fopAcM_GetParam(i_this) >> 0x10) & 0xFF, fopAcM_GetRoomNo(i_this)); - OS_REPORT("B_BQ PARAM %x\n" fopAcM_GetParam(i_this)); + OS_REPORT("B_BQ PARAM %x\n", fopAcM_GetParam(i_this)); OS_REPORT("B_BQ//////////////B_BQ SET 1 !!\n"); if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x6FA0)) { diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 47d43ed0882..46772094e82 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -403,7 +403,7 @@ int daB_DR_c::draw() { dDbVw_drawLineXlu(home.pos, sp24, color, TRUE, 12); } - dComIfG_Bgsp().DrawWall(&mAcch); + mAcch.DrawWall(dComIfG_Bgsp()); #endif J3DModel* model_p = mpModelMorf->getModel(); diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index ce3d755a717..029f7f0e065 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -5554,7 +5554,7 @@ int daB_DS_c::CreateHeap() { anm_res = ANM_HEAD_FWAIT; } - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", anm_res)), @@ -5572,7 +5572,7 @@ int daB_DS_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpSwordMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 63)), 0, @@ -5594,7 +5594,7 @@ int daB_DS_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpZantMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 66)), 2, @@ -5604,7 +5604,7 @@ int daB_DS_c::CreateHeap() { } modelData = static_cast(dComIfG_getObjectRes("B_DS", 73)); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mpOpPatternModel == NULL) { @@ -5636,7 +5636,7 @@ int daB_DS_c::CreateHeap() { } modelData = static_cast(dComIfG_getObjectRes("B_DS", 72)); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mpPatternModel == NULL) { diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 1b21fc4e951..72c06849340 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3815,7 +3815,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", 0x21); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpSuiModel == NULL) { diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index ada17bd9b82..d2ed24f9d5a 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -5570,7 +5570,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) { /* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text CreateHeap__10daB_ZANT_cFv */ int daB_ZANT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x48); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x12), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; @@ -5637,14 +5637,14 @@ int daB_ZANT_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4A); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordLModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4B); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordRModel == NULL) { return 0; diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 2dd10d89ab3..b94734e368b 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -421,7 +421,7 @@ static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) { /* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text CreateHeap__11daB_ZANTZ_cFv */ int daB_ZANTZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4C); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084); if (mpMorf == NULL) { diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index a2ebeb076ed..b60b9ea4087 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -338,7 +338,7 @@ J3DModelData* daMBdoorL1_c::getDoorModelData() { int daMBdoorL1_c::CreateHeap() { int level = getNowLevel(this); J3DModelData* modelData = getDoorModelData(); - JUT_ASSERT(579. modelData != 0); + JUT_ASSERT(579, modelData != 0); if (getDoorType() == DOOR_TYPE_2) { for (int i = 0; i < 2; i++) { mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 9e2795cf14d..1002a62f415 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -949,7 +949,7 @@ int daDoor20_c::demoProc() { if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, true)) { - JUT_PANIC(0); + JUT_PANIC(1799, 0); } field_0x67c = 0; openInit2(); @@ -961,7 +961,7 @@ int daDoor20_c::demoProc() { if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, true)) { - JUT_PANIC(0); + JUT_PANIC(1812, 0); } field_0x67c = 0; openInit2(); diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index a7cc8626d11..f0de66acd4e 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -780,7 +780,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->mResName, res_id); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 3ab7abf13ca..2b54eb9d668 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -86,7 +86,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (a_this->field_0x5b4 != 1) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BI", 15); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index be16bd8f0b0..2915273c2a6 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -164,7 +164,7 @@ void daE_PH_c::setCcSph() { int daE_PH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT), diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index b0a9498356f..3b6afd80dd5 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3820,7 +3820,7 @@ static int daE_VA_Delete(daE_VA_c* i_this) { // NONMATCHING weird data issue / reg alloc (probably related) int daE_VA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 15), 0, 1.0f, 0, @@ -3843,7 +3843,7 @@ int daE_VA_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x30); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpWeaponModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpWeaponModel == NULL) { @@ -3863,7 +3863,7 @@ int daE_VA_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x37); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpEndEfMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 7), 0, 1.0f, @@ -3934,7 +3934,7 @@ int daE_VA_c::CreateHeap() { break; } - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpCardModels[i] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); } diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index f381e417eef..4fbb91c0178 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -27,10 +27,10 @@ int daItemBase_c::__CreateHeap() { /* 8014475C-80144B94 13F09C 0438+00 0/0 3/3 0/0 .text CreateItemHeap__12daItemBase_cFPCcsssssss */ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btkName, s16 i_bpkName, s16 i_bckName, s16 i_bxaName, s16 i_brkName, s16 i_btpName) { - JUT_ASSERT(0 <= m_itemNo && m_itemNo <= 255); + JUT_ASSERT(0, 0 <= m_itemNo && m_itemNo <= 255); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_arcName, i_bmdName); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); u32 flags = 0x11000084; u32 modelflags = 0x80000; @@ -60,7 +60,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk if (i_btkName > 0) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_btkName); - JUT_ASSERT(pbtk != 0); + JUT_ASSERT(0, pbtk != 0); mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -71,7 +71,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBpkAnm = NULL; if (i_bpkName > 0) { J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(i_arcName, i_bpkName); - JUT_ASSERT(pbpk != 0); + JUT_ASSERT(0, pbpk != 0); mpBpkAnm = new mDoExt_bpkAnm(); if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -82,7 +82,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBckAnm = NULL; if (i_bckName > 0) { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_bckName); - JUT_ASSERT(pbck != 0); + JUT_ASSERT(0, pbck != 0); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { @@ -93,7 +93,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBrkAnm = NULL; if (i_brkName > 0) { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_brkName); - JUT_ASSERT(pbrk != 0); + JUT_ASSERT(0, pbrk != 0); s8 tevFrm = getTevFrm(); int anmPlay = TRUE; @@ -110,7 +110,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBtpAnm = NULL; if (i_btpName > 0) { J3DAnmTexPattern* pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_btpName); - JUT_ASSERT(pbtp != 0); + JUT_ASSERT(0, pbtp != 0); mpBtpAnm = new mDoExt_btpAnm(); if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 3443f61b6aa..69065b77809 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -223,7 +223,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { kytag08_class* a_this = (kytag08_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag08", 3); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index da42db665da..34d5d66b784 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -204,7 +204,7 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) { } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - JUT_ASSERT(kankyo != 0); + JUT_ASSERT(0, kankyo != 0); GXColor color = {0}; color.r = kankyo->bg_amb_col[0].r; @@ -310,7 +310,7 @@ void dMirror_packet_c::mainDraw() { temp_f1 = (temp_f22 - sp19C[temp_r29].z) / temp_f1; sp11C *= temp_f1; - JUT_ASSERT(0 <= prjPosNum && prjPosNum < (4 + 1)); + JUT_ASSERT(0, 0 <= prjPosNum && prjPosNum < (4 + 1)); sp19C[4] = sp19C[temp_r29] + sp11C; @@ -595,7 +595,7 @@ int daMirror_c::execute() { } daPy_py_c* player = daPy_getLinkPlayerActorClass(); - JUT_ASSERT(player != 0); + JUT_ASSERT(0, player != 0); if (mPacket.getViewScale().y > 0.0f && player->getKandelaarFlamePos() && fopAcM_searchActorDistance2(this, player) < 40000.0f) diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 5ac606d44c2..a0c5139b167 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3550,7 +3550,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { if (!daMP_THPPlayerOpen(moviePath, 0)) { OSReport("Fail to open the thp file\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); return 0; } @@ -3569,7 +3569,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { daMP_buffer = mDoExt_getArchiveHeap()->alloc(daMP_THPPlayerCalcNeedMemory(), 0x20); if (daMP_buffer == NULL) { OSReport("Can't allocate the memory"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); return 0; } @@ -3577,7 +3577,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { if (!daMP_THPPlayerPrepare(0, 0, daMP_audioInfo.field_0xc != 1 ? OSGetTick() % daMP_audioInfo.field_0xc : 0)) { OSReport("Fail to prepare\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); return 0; } diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index b876abb4902..d89e9d4e2f2 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -140,7 +140,7 @@ int daNbomb_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcNameList[mType], bmdIdx[mType]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -149,13 +149,13 @@ int daNbomb_c::createHeap() { J3DAnmTransform* trans = NULL; if (mType == TYPE_INSECT_ENEMY) { trans = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcNameBombE, 6); - JUT_ASSERT(trans); + JUT_ASSERT(0, trans); } else if (mType == TYPE_WATER_ENEMY) { trans = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcNameBombEW, 5); - JUT_ASSERT(trans); + JUT_ASSERT(0, trans); } else if (mType == TYPE_INSECT_PLAYER) { trans = (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x15); - JUT_ASSERT(trans); + JUT_ASSERT(0, trans); } if (trans != NULL) { diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index b8b2f9419cf..bda39213ec5 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -31,7 +31,7 @@ static bool isLoadRoom(int i_roomNo) { if (dComIfGp_roomControl_checkStatusFlag(load_room_index, 9) == (u32)TRUE) { room_of_scene_class* roomScene = (room_of_scene_class*)fopScnM_SearchByID( dStage_roomControl_c::getStatusProcID(load_room_index)); - JUT_ASSERT(roomScene != 0); + JUT_ASSERT(0, roomScene != 0); if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->base)) { // "Room <%d> objects loading!\n" @@ -105,10 +105,10 @@ int daNocrm_c::getRoomNo(int param_0) { mDoMtx_multVec(mMtx, &offset, &check_pos); bool groundHit = fopAcM_gc_c::gndCheck(&check_pos); - JUT_ASSERT(groundHit); + JUT_ASSERT(0, groundHit); int roomNo = fopAcM_gc_c::getRoomId(); - JUT_ASSERT(0 <= roomNo && roomNo < 64); + JUT_ASSERT(0, 0 <= roomNo && roomNo < 64); mRoomNo[param_0] = roomNo; } diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 5c5804418bc..b3b68b9b713 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -17,6 +17,8 @@ struct daNpcCd2_HIO_Jnt_c /* 8015A6E8 */ virtual ~daNpcCd2_HIO_Jnt_c() {} /* 8015A788 */ daNpcCd2_HIO_Jnt_c(); + void genMessage(JORMContext*); + /* 0x04 */ f32 field_0x04[3]; /* 0x10 */ s16 field_0x10[3]; }; @@ -42,6 +44,8 @@ struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c { /* 8015A4D8 */ daNpcCd2_HIO_c(); /* 8015A860 */ virtual ~daNpcCd2_HIO_c() {} + void genMessage(JORMContext*); + /* 0x0004 */ daNpcCd2_HIO_MChild_c field_0x0004[16]; /* 0x20C4 */ daNpcCd2_HIO_WChild_c field_0x20c4[14]; }; @@ -206,13 +210,13 @@ static char* const l_resWANb2[6] = { "WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW", }; -struct tbl_entry { +struct anmTblPrm { char* name; int index; }; /* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTbl */ -SECTION_RODATA static tbl_entry const l_objTbl[13] = { +SECTION_RODATA static anmTblPrm const l_objTbl[13] = { {"object", 9}, {"object", 9}, {"object", 8}, {"object", 3}, {"object", 13}, {"object", 14}, {"object", 12}, {"object", 6}, {"object", 7}, {"object", 10}, {"object", 11}, {"object", 15}, {"object", 16}, @@ -220,14 +224,14 @@ SECTION_RODATA static tbl_entry const l_objTbl[13] = { COMPILER_STRIP_GATE(0x80393520, &l_objTbl); /* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata l_objTWTbl */ -static tbl_entry const l_objTWTbl[13] = { +static anmTblPrm const l_objTWTbl[13] = { {"objectTW", 9}, {"objectTW", 9}, {"objectTW", 8}, {"objectTW", 3}, {"objectTW", 13}, {"objectTW", 14}, {"objectTW", 12}, {"objectTW", 6}, {"objectTW", 7}, {"objectTW", 10}, {"objectTW", 11}, {"objectTW", -1}, {"objectTW", -1}, }; /* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_M */ -static tbl_entry const l_bckTbl_M[54] = { +static anmTblPrm const l_bckTbl_M[54] = { {"Mgeneral", 26}, {"Mgeneral", 27}, {"Mgeneral", 29}, {"Mgeneral", 30}, {"Mgeneral", 8}, {"Mgeneral", 9}, {"Mgeneral", 20}, {"Mgeneral", 21}, {"Mgeneral", 23}, {"Mgeneral", 5}, {"Mgeneral", 6}, {"Mgeneral", 28}, {"Mgeneral", 24}, {"Mgeneral", 22}, {"Mgeneral", 17}, @@ -242,7 +246,7 @@ static tbl_entry const l_bckTbl_M[54] = { }; /* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata l_bckTbl_W */ -SECTION_RODATA static tbl_entry const l_bckTbl_W[54] = { +SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = { {"Wgeneral", 31}, {"Wgeneral", 32}, {"Wgeneral", 34}, {"Wgeneral", 35}, {"Wgeneral", 13}, {"Wgeneral", 14}, {"Wgeneral", 25}, {"Wgeneral", 26}, {"Wgeneral", 28}, {"Wgeneral", 10}, {"Wgeneral", 11}, {"Wgeneral", 33}, {"Wgeneral", 29}, {"Wgeneral", 27}, {"Wgeneral", 22}, @@ -363,7 +367,7 @@ J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) { /* 801580A8-801580F0 1529E8 0048+00 4/4 0/0 5/5 .text isM___10daNpcCd2_cFv */ bool daNpcCd2_c::isM_() { if (mpMorf == NULL) { - return field_0xa98 < 16; + return m_type < 16; } u16 a_jntNum = mpMorf->getModel()->getModelData()->getJointNum(); JUT_ASSERT(738, (a_jntNum == JntM_NUM_e) || (a_jntNum == JntW_NUM_e)); @@ -385,7 +389,7 @@ static char* const* l_resNameTbl[30] = { }; /* 803B6244-803B6334 013364 00F0+00 1/2 0/0 0/0 .data l_bmdTbl */ -static tbl_entry const l_bmdTbl[30] = { +static anmTblPrm const l_bmdTbl[30] = { l_resMANa[0], 3, l_resMADa[0], 3, l_resMCNa[0], 4, l_resMONa[0], 4, l_resMANb[0], 3, l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4, l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4, @@ -395,7 +399,7 @@ static tbl_entry const l_bmdTbl[30] = { }; /* 803B6334-803B6424 013454 00F0+00 1/2 0/0 0/0 .data l_bmdTWTbl */ -static tbl_entry const l_bmdTWTbl[30] = { +static anmTblPrm const l_bmdTWTbl[30] = { l_resMANa[1], 3, l_resMADa[1], 3, l_resMCNa[1], 4, l_resMONa[1], 4, l_resMANb[1], 3, l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3, l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4, @@ -405,7 +409,7 @@ static tbl_entry const l_bmdTWTbl[30] = { }; /* 803B6424-803B6514 013544 00F0+00 1/2 0/0 0/0 .data l_btpTbl */ -static tbl_entry const l_btpTbl[30] = { +static anmTblPrm const l_btpTbl[30] = { l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1, l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7, l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7, @@ -415,7 +419,7 @@ static tbl_entry const l_btpTbl[30] = { }; /* 803B6514-803B6604 013634 00F0+00 1/2 0/0 0/0 .data l_btpTWTbl */ -static tbl_entry const l_btpTWTbl[30] = { +static anmTblPrm const l_btpTWTbl[30] = { l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1, l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1, l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7, @@ -1547,7 +1551,7 @@ void* daNpcCd2_c::getAnmP(int param_1, int param_2) { case 0x2b: case 0x2c: case 0x2e: - //JUT_ASSERT(939, m_type == MdlMANa_e || m_type == MdlMADa_e); + JUT_ASSERT(939, m_type == MdlMANa_e || m_type == MdlMADa_e); break; default: return 0; @@ -1560,7 +1564,7 @@ void* daNpcCd2_c::getAnmP(int param_1, int param_2) { name = l_bckTbl_M[a_anmNum].name; index = l_bckTbl_M[a_anmNum].index; } else { - JUT_ASSERT(948, 0 <= a_anmNum && a_anmNum < (sizeof(l_bckTbl_W)/sizeof(anmTblPrm))); + JUT_ASSERT(953, 0 <= a_anmNum && a_anmNum < (sizeof(l_bckTbl_W)/sizeof(anmTblPrm))); name = l_bckTbl_W[a_anmNum].name; index = l_bckTbl_W[a_anmNum].index; } @@ -1844,10 +1848,10 @@ static inline s16 Cd2_HIO_jntRX(int param_1, int param_2) { */ int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) { int jntNo = param_1->getJntNo(); - cXyz cStack_3c(Cd2_HIO_jntTX(field_0xa98, jntNo), Cd2_HIO_jntTY(field_0xa98, jntNo), Cd2_HIO_jntTZ(field_0xa98, jntNo)); - s16 rz = Cd2_HIO_jntRZ(field_0xa98, jntNo); - s16 ry = Cd2_HIO_jntRY(field_0xa98, jntNo); - s16 rx = Cd2_HIO_jntRX(field_0xa98, jntNo); + cXyz cStack_3c(Cd2_HIO_jntTX(m_type, jntNo), Cd2_HIO_jntTY(m_type, jntNo), Cd2_HIO_jntTZ(m_type, jntNo)); + s16 rz = Cd2_HIO_jntRZ(m_type, jntNo); + s16 ry = Cd2_HIO_jntRY(m_type, jntNo); + s16 rx = Cd2_HIO_jntRX(m_type, jntNo); csXyz cStack_44(rx, ry, rz); mDoMtx_stack_c::copy(param_2->getAnmMtx(jntNo)); mDoMtx_stack_c::ZXYrotM(cStack_44); @@ -1948,7 +1952,7 @@ bool daNpcCd2_c::checkFearSituation() { /* 801598E8-8015994C 154228 0064+00 1/1 0/0 0/0 .text getNpcMdlDataP__10daNpcCd2_cFi */ J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) { - const tbl_entry* def; + const anmTblPrm* def; if (field_0xac6) { def = &l_bmdTWTbl[param_1]; } else { @@ -1960,7 +1964,7 @@ J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) { /* 8015994C-801599C4 15428C 0078+00 1/1 0/0 0/0 .text getObjMdlDataP__10daNpcCd2_cFi */ J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) { J3DModelData* model_data = NULL; - const tbl_entry* def; + const anmTblPrm* def; if (field_0xac6) { def = &l_objTWTbl[param_1]; } else { @@ -1974,7 +1978,7 @@ J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) { /* 801599C4-80159A38 154304 0074+00 1/1 0/0 0/0 .text getTexAnmP__10daNpcCd2_cFi */ J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) { - const tbl_entry* def; + const anmTblPrm* def; if (field_0xac6) { def = &l_btpTWTbl[param_1]; } else { diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index aeb53d4baa1..87409546bb7 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -773,8 +773,9 @@ int daNpc_Hanjo_c::create() { int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList); if (rv == cPhs_COMPLEATE_e) { OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType, - field_0xa7c, getPathID(), fopAcM_GetParam(this)); + mFlowNodeNo, getPathID(), fopAcM_GetParam(this)); if (isDelete()) { + OS_REPORT("===>isDelete:TRUE\n"); return cPhs_ERROR_e; } OS_REPORT("\n"); diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 4e433a6e5c7..5e13d97bde2 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -15,7 +15,7 @@ static char* l_arcName = "Lv5_KEY"; int daObjLv5Key_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 48a2906d48f..f47dcb84f06 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1587,12 +1587,12 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) { static const int obj_brg_bmd[] = {5, 6, 7}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", obj_brg_bmd[sp30]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); J3DModelData* modelData2; if (a_this->mType == 8) { modelData2 = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", 8); - JUT_ASSERT(modelData2 != 0); + JUT_ASSERT(0, modelData2 != 0); } br_s* part = a_this->mBr; diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index d3081d98949..b1513b30b8d 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -101,10 +101,9 @@ int daObjCRVSTEEL_c::create() { if (rv == cPhs_COMPLEATE_e) { gravity = -9.0f; int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "U_CrvSteelGate.dzb"); - JUT_ASSERT() if (dzb_id == -1) { OS_REPORT("dzbデータが見つかりませんでした!<%s>\n\n", l_arcName); - JUT_PANIC(443, dzb_id != -1); + JUT_ASSERT(443, dzb_id != -1); } rv = MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); if (rv == cPhs_ERROR_e) { diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index acfcca3998f..921b3a40900 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -16,6 +16,10 @@ #include "d/actor/d_a_e_ym.h" #include "d/actor/d_a_e_ymb.h" +#ifdef DEBUG +daObjDrop_HIO_c l_HIO; +#endif + /* 80BDFCD8-80BDFD8C 000078 00B4+00 2/2 0/0 0/0 .text searchParentSub__FPvPv */ static void* searchParentSub(void* pproc, void* pdata) { daObjDrop_c* pdrop = (daObjDrop_c*)pdata; diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index d2f1de48d2e..5d0d5e523ba 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_firepillar.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" +#include "d/d_debug_viewer.h" #include "f_op/f_op_actor_mng.h" /* 80BE9118-80BE9138 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daObjFPillar_cFv */ @@ -210,7 +211,7 @@ static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) { #if DEBUG mDoMtx_stack_c::transS(pos->x, pos->y, pos->z); mDoMtx_stack_c::ZXYrotM(angle->x, angle->y, angle->z); - mDoMtx_stack_c::scaleM(scale.x * 50.0f, scale.y * 50.0f, scale.x * 50.0f); + mDoMtx_stack_c::scaleM(scale->x * 50.0f, scale->y * 50.0f, scale->x * 50.0f); mDoMtx_stack_c::transM(0.0f, 1.0f, 0.0f); mDoMtx_stack_c::XrotM(0x4000); Mtx mtx; diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 4c8ce4405b4..7541843d98d 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -339,7 +339,7 @@ int daObjIceBlk_c::CreateHeap() { if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpIceModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpIceModel == NULL) { @@ -360,10 +360,10 @@ int daObjIceBlk_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[1]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); - JUT_ASSERT(shareModelData != 0); + JUT_ASSERT(0, shareModelData != 0); mDoExt_setupShareTexture(modelData, shareModelData); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index be533830c7d..f9a3982b215 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -294,7 +294,7 @@ int daItem_c::_daItem_create() { { // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n" OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); return cPhs_ERROR_e; } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 || m_itemNo == fpcNm_ITEM_BOMB_30) @@ -526,7 +526,7 @@ void daItem_c::procInitGetDemoEvent() { m_item_id = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, -1, fopAcM_GetRoomNo(this), NULL, NULL); - JUT_ASSERT(m_item_id != fpcM_ERROR_PROCESS_ID_e); + JUT_ASSERT(0, m_item_id != fpcM_ERROR_PROCESS_ID_e); setStatus(STATUS_WAIT_GET_DEMO_EVENT_e); } @@ -1181,7 +1181,7 @@ void daItem_c::initFlag() { default: // "Item: Set Type<%d>\n" OS_REPORT("アイテム：セットタイプ<%d>\n", type); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); case TYPE_LAUNCH_e: case TYPE_LAUNCH_SMALL_e: case TYPE_LAUNCH_FROM_PLAYER_e: @@ -1232,7 +1232,7 @@ void daItem_c::initScale() { scale.setall(0.0f); break; default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); case TYPE_FIXED_PLACE_e: case TYPE_WAIT_e: case TYPE_SIMPLE_GET_e: diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 2f677d4fbbc..887b4258b37 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -115,7 +115,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_lv3WaterB_class* a_this = static_cast(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L3_bwater", 5); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpBWaterModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpBWaterModel == NULL) { @@ -145,7 +145,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes("S_octhibi", 4); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); a_this->mpOctHibiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpOctHibiModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 5f39823ef3f..965ebe1b10d 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -47,7 +47,7 @@ void daFlorBoad_c::setBaseMtx() { /* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text CreateHeap__12daFlorBoad_cFv */ int daFlorBoad_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5haYuka", 4); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 37f6d21b088..e59d82b9e50 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -49,7 +49,7 @@ void daIceWall_c::setBaseMtx() { /* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */ int daIceWall_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel[0] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel[0] == NULL) { @@ -57,7 +57,7 @@ int daIceWall_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 5); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel[1] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel[1] == NULL) { diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index 8a9fa4dcfe1..b5acef7067d 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -42,7 +42,7 @@ void daLv5SwIce_c::setBaseMtx() { /* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv5SwIce_cFv */ int daLv5SwIce_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5SwIce", 4); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index d08ccac3991..38fa292e2dc 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -95,7 +95,7 @@ void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) { /* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text CreateHeap__14daObjYchndlr_cFv */ int daObjYchndlr_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]); - JUT_ASSERT(model_data != 0); + JUT_ASSERT(0, model_data != 0); mpChandlierModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpChandlierModel == NULL) { @@ -103,7 +103,7 @@ int daObjYchndlr_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]); - JUT_ASSERT(model_data != 0); + JUT_ASSERT(0, model_data != 0); for (int i = 0; i < 4; i++) { mpShaftModels[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 1d91ec145fc..1fd2442be36 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -66,7 +66,7 @@ void daObjYIblltray_c::setMtx() { /* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text CreateHeap__16daObjYIblltray_cFv */ int daObjYIblltray_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(model_data != 0); + JUT_ASSERT(0, model_data != 0); mpTrayModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpTrayModel == NULL) { @@ -74,7 +74,7 @@ int daObjYIblltray_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(model_data != 0); + JUT_ASSERT(0, model_data != 0); mpHandleModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpHandleModel == NULL) { @@ -267,7 +267,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) { if (!getNoSameRoom() && mTrayID == fpcM_ERROR_PROCESS_ID_e) { daObjYIblltray_c* ptray = (daObjYIblltray_c*)fopAcM_Search((fopAcIt_JudgeFunc)searchObjYIblltray, this); - JUT_ASSERT(ptray != 0); + JUT_ASSERT(0, ptray != 0); mTrayID = fopAcM_GetID(ptray); } diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 54b6b35b8bc..b06ad4e8321 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -35,7 +35,7 @@ static char* l_arcName = "MR-6Pole"; /* 80C96580-80C965B0 000054 0030+00 3/4 0/0 0/0 .data ActionTable__18daObjMirror6Pole_c */ -static actionFunc daObjMirror6Pole_c::ActionTable[][2] = { +actionFunc daObjMirror6Pole_c::ActionTable[][2] = { {&daObjMirror6Pole_c::initWait, &daObjMirror6Pole_c::executeWait}, {&daObjMirror6Pole_c::initDemo, &daObjMirror6Pole_c::executeDemo}, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 26a4b1cb622..764f4621cbb 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -553,7 +553,7 @@ int daObjMovebox::Act_c::CreateHeap() { if (i_attr().field_0x58 >= 0) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr().field_0x58); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); var_r29 = mpModel != NULL; @@ -1128,7 +1128,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) { cXyz sp48(current.pos); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(kibako_bmd != 0); + JUT_ASSERT(0, kibako_bmd != 0); JPABaseEmitter* emitter = dComIfGp_particle_set( 0x82AF, &sp48, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), @@ -1265,7 +1265,7 @@ int daObjMovebox::Act_c::Mthd_Create() { phase_state = MoveBGCreate(M_arcname[mType], i_attr().field_0x5c, dBgS_MoveBGProc_Trans, heap_size, NULL); - JUT_ASSERT((phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); + JUT_ASSERT(0, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); } return phase_state; diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index b306e164e86..af7bf6e873b 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -69,7 +69,7 @@ const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = { /* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Oiltubo_cFv */ int daObj_Oiltubo_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName); - JUT_ASSERT(mdlData_p != 0); + JUT_ASSERT(0, mdlData_p != 0); mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -77,7 +77,7 @@ int daObj_Oiltubo_c::CreateHeap() { } J3DModelData* mdlBData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bbmdFileName); - JUT_ASSERT(mdlBData_p != 0); + JUT_ASSERT(0, mdlBData_p != 0); mpBModel = mDoExt_J3DModel__create(mdlBData_p, 0x80000, 0x19000284); if (mpBModel == NULL) { diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index 236e8a2a8bb..764fdec1234 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -75,7 +75,7 @@ int daObjPDoor_c::Create() { mDoorDirection = 1; shape_angle.y = home.angle.y + 0x1555; } else if (!isSw2) { - OS_REPORT("城下町押引扉：SW1,SW2共にＯＮになっています！\n") + OS_REPORT("城下町押引扉：SW1,SW2共にＯＮになっています！\n"); JUT_PANIC(235, "0"); } else { mDoorDirection = -1; diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 5256261dec3..1c67cb02ca2 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -177,7 +177,7 @@ int daPillar_c::Create() { /* 80CAF7A8-80CAF8A4 000568 00FC+00 1/0 0/0 0/0 .text CreateHeap__10daPillar_cFv */ int daPillar_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_bmd[mMdlType]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -185,7 +185,7 @@ int daPillar_c::CreateHeap() { if (checkShadow() == 0xFF) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_shadowBmd[mMdlType]); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpShadowModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpShadowModel == NULL) { return 0; @@ -448,7 +448,7 @@ int daPillar_c::Execute(Mtx** param_0) { } break; default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); } if (shape_angle.x != 0) { diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 2bb452ee567..e299e1119e1 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -120,10 +120,10 @@ int daItemShield_c::create() { return cPhs_ERROR_e; } if (getSwBit2() == 0xff) { - OS_REPORT(1Bh,"[43;30m木の盾：スイッチビット２指定がありません！\n\x1b[m"); + OS_REPORT("[43;30m木の盾：スイッチビット２指定がありません！\n\x1b[m"); } if (getSwBit() == 0xff) { - OS_REPORT(1Bh,"[43;30m木の盾：スイッチビット指定がありません！\n\x1b[m"); + OS_REPORT("[43;30m木の盾：スイッチビット指定がありません！\n\x1b[m"); } int rv = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo)); if (rv == cPhs_COMPLEATE_e) { diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 7c58f68db9d..3fe0057d3c7 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -92,7 +92,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_udoor_class* a_this = static_cast(i_this); J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Obj_udoor", bmdd[a_this->field_0x570]); - JUT_ASSERT(model_data != 0); + JUT_ASSERT(301, model_data != 0); a_this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index da7598471ea..53568332c3e 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -160,7 +160,7 @@ cPhs__Step daWtPillar_c::create() { mMaxHeight += mRelativeWaterHeight; // "== Underwater (%f) (%f) type: %d ==\n" - OS_REPORT("== 水中にある (%f) (%f) type:%d ==\n", mMaxHeight, mRelativeWaterHeight, mRisesAndFalls); + OS_REPORT("== 水中にある (%f) (%f) type:%d ==\n", mMaxHeight, mRelativeWaterHeight, mType); } mEffectOscillationAngleStep = mPillarIsPreparingToRise = mStartedRisingOrDoesNotRiseAndFall = field_0xB44 = 0; diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index af4f48f902b..539ee5814ae 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -206,7 +206,7 @@ static int daObj_Wflag_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////OBJ_WFLAG SET NON !!\n"); return cPhs_ERROR_e; } else { - OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n") + OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n"); ((obj_wflag_class*)i_this)->field_0x836 = cM_rndF(65536.0f); daObj_Wflag_Execute(((obj_wflag_class*)i_this)); } diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index 6642d5dbb9b..4aead60cc19 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -576,7 +576,7 @@ void daPasserMng_c::create_init() { } } #ifdef DEBUG - OS_REPORT("初期ばらまき位置 Path=%d ", getPathID()) + OS_REPORT("初期ばらまき位置 Path=%d ", getPathID()); for (int i = 0; i < max; i++) { OS_REPORT("%d, ", arr[i]); } diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 70c2db1f253..20d4edd4950 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_shop_item.h" +#include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 51d1e0bfbb2..a2c5ef5da0b 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -98,7 +98,7 @@ void daStartAndGoal_c::init() { mPath.initialize(); mPath.setPathInfo(fopAcM_GetParam(this) >> 8, fopAcM_GetRoomNo(this), 0); - JUT_ASSERT(0 != mPath.getPathInfo()); + JUT_ASSERT(0, 0 != mPath.getPathInfo()); if (dComIfG_getTimerPtr() == NULL) { dTimer_createTimer(l_timerType[mType].mode, 9999000, l_timerType[mType].type, 0, 210.0f, diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 62a85db5938..4b9f7b355a0 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -123,7 +123,7 @@ int daTag_Msg_c::execute() { if (set_event && rangeCheck() && otherCheck()) { if (field_0x5dd) { mOrderEvtNum = 1; - JUT_ASSERT(0 != l_evtNameTBL[mOrderEvtNum]); + JUT_ASSERT(0, 0 != l_evtNameTBL[mOrderEvtNum]); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evtNameTBL[mOrderEvtNum], 0xFF); diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 06f5aa405d9..cbe89103321 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -128,7 +128,7 @@ int daTbox2_c::Create() { int daTbox2_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no); - JUT_ASSERT(modelData != 0); + JUT_ASSERT(0, modelData != 0); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return false; @@ -136,7 +136,7 @@ int daTbox2_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no); - JUT_ASSERT(pbck != 0); + JUT_ASSERT(0, pbck != 0); mpBck = new mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return false; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 9ad904efb91..d51ec5760bd 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -11,78 +11,12 @@ #include "SSystem/SComponent/c_math.h" #include "dol2asm.h" - -// -// Forward References: -// - -extern "C" static void texScrollCheck__FRf(); -extern "C" static void daVrbox2_Draw__FP12vrbox2_class(); -extern "C" static void daVrbox2_color_set__FP12vrbox2_class(); -extern "C" static void daVrbox2_Execute__FP12vrbox2_class(); -extern "C" static bool daVrbox2_IsDelete__FP12vrbox2_class(); -extern "C" static bool daVrbox2_Delete__FP12vrbox2_class(); -extern "C" static void daVrbox2_solidHeapCB__FP10fopAc_ac_c(); -extern "C" static void daVrbox2_Create__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" extern char const* const d_a_vrbox2__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); -extern "C" void dComIfG_getStageRes__FPCc(); -extern "C" void dKyw_get_wind_vec__Fv(); -extern "C" void dKyw_get_wind_pow__Fv(); -extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); -extern "C" void dKy_get_parcent__Ffff(); -extern "C" void dKy_GxFog_set__Fv(); -extern "C" void cM_rndF__Ff(); -extern "C" void cM3d_VectorProduct2d__Fffffff(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_targetAngleY__FPC3VecPC3Vec(); -extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(); -extern "C" void _savegpr_17(); -extern "C" void _savegpr_25(); -extern "C" void _restgpr_17(); -extern "C" void _restgpr_25(); -extern "C" u8 now__14mDoMtx_stack_c[48]; - // // Declarations: // static int daVrbox2_color_set(vrbox2_class* param_0); -/* ############################################################################################## */ -/* 80499A6C-80499A70 000000 0004+00 4/4 0/0 0/0 .rodata @3627 */ -SECTION_RODATA static f32 const lit_3627 = 1.0f; -COMPILER_STRIP_GATE(0x80499A6C, &lit_3627); - -/* 80499A70-80499A74 000004 0004+00 1/3 0/0 0/0 .rodata @3628 */ -SECTION_RODATA static u8 const lit_3628[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80499A70, &lit_3628); - /* 80498A78-80498ACC 000078 0054+00 1/1 0/0 0/0 .text texScrollCheck__FRf */ static void texScrollCheck(f32& param_0) { while (param_0 < 0.0f) @@ -92,105 +26,9 @@ static void texScrollCheck(f32& param_0) { param_0 -= 1.0f; } - -/* ############################################################################################## */ -/* 80499A74-80499A78 000008 0004+00 0/1 0/0 0/0 .rodata @3835 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3835 = 9.0f / 100.0f; -COMPILER_STRIP_GATE(0x80499A74, &lit_3835); -#pragma pop - -/* 80499A78-80499A7C 00000C 0004+00 0/1 0/0 0/0 .rodata @3836 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3836 = 8000.0f; -COMPILER_STRIP_GATE(0x80499A78, &lit_3836); -#pragma pop - -/* 80499A7C-80499A80 000010 0004+00 1/3 0/0 0/0 .rodata @3837 */ -SECTION_RODATA static f32 const lit_3837 = 255.0f; -COMPILER_STRIP_GATE(0x80499A7C, &lit_3837); - -/* 80499A80-80499A84 000014 0004+00 0/1 0/0 0/0 .rodata @3838 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3838 = 2.0f / 5.0f; -COMPILER_STRIP_GATE(0x80499A80, &lit_3838); -#pragma pop - -/* 80499A84-80499A88 000018 0004+00 0/1 0/0 0/0 .rodata @3839 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3839 = 270.0f; -COMPILER_STRIP_GATE(0x80499A84, &lit_3839); -#pragma pop - -/* 80499A88-80499A8C 00001C 0004+00 0/1 0/0 0/0 .rodata @3840 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3840 = 240.0f; -COMPILER_STRIP_GATE(0x80499A88, &lit_3840); -#pragma pop - -/* 80499A8C-80499A90 000020 0004+00 0/2 0/0 0/0 .rodata @3841 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3841 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80499A8C, &lit_3841); -#pragma pop - -/* 80499A90-80499A94 000024 0004+00 0/1 0/0 0/0 .rodata @3842 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3842 = 300.0f; -COMPILER_STRIP_GATE(0x80499A90, &lit_3842); -#pragma pop - -/* 80499A94-80499A98 000028 0004+00 0/1 0/0 0/0 .rodata @3843 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3843 = 17.0f / 20.0f; -COMPILER_STRIP_GATE(0x80499A94, &lit_3843); -#pragma pop - -/* 80499A98-80499A9C 00002C 0004+00 0/1 0/0 0/0 .rodata @3844 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3844 = 3.0f / 20.0f; -COMPILER_STRIP_GATE(0x80499A98, &lit_3844); -#pragma pop - -/* 80499A9C-80499AA0 000030 0004+00 0/1 0/0 0/0 .rodata @3845 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3845 = 483.0f; -COMPILER_STRIP_GATE(0x80499A9C, &lit_3845); -#pragma pop - -/* 80499AA0-80499AA4 000034 0004+00 0/1 0/0 0/0 .rodata @3846 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3846 = 100.0f; -COMPILER_STRIP_GATE(0x80499AA0, &lit_3846); -#pragma pop - -/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80499AC4 = "F_SP102"; -SECTION_DEAD static char const* const stringBase_80499ACC = "F_SP127"; -#pragma pop - -/* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss mangZ$3688 */ -static s16 mangZ; - /* 80498ACC-804990DC 0000CC 0610+00 1/0 0/0 0/0 .text daVrbox2_Draw__FP12vrbox2_class */ // NONMATCHING - reg alloc static int daVrbox2_Draw(vrbox2_class* i_this) { - cXyz sp14; - cXyz sp8; - camera_class* camera_p = dComIfGp_getCamera(0); dKankyo_sunlenz_Packet* lenz_p = g_env_light.mpSunLenzPacket; J3DModel* kumo_model_p = i_this->mpKumoModel; @@ -204,8 +42,11 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { dKy_GxFog_set(); // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? - for (int i = ((J3DModelData*)kumo_model_p)->getMaterialNum() - 1; i >= 0; i--) { - J3DMaterial* material_p = ((J3DModelData*)kumo_model_p)->getMaterialNodePointer(i); + J3DModelData* sp38 = (J3DModelData*)kumo_model_p; + J3DModelData* sp34 = (J3DModelData*)sun_model_p; + J3DModelData* sp30 = (J3DModelData*)kasumim_model_p; + for (int i = sp38->getMaterialNum() - 1; i >= 0; i--) { + J3DMaterial* material_p = sp38->getMaterialNodePointer(i); J3DFogInfo* fogInfo_p; if (material_p != NULL) { @@ -215,9 +56,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { fogInfo_p->mType = 2; } - // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? - for (int i = ((J3DModelData*)sun_model_p)->getMaterialNum() - 1; i >= 0; i--) { - J3DMaterial* material_p = ((J3DModelData*)sun_model_p)->getMaterialNodePointer(i); + for (int i = sp34->getMaterialNum() - 1; i >= 0; i--) { + J3DMaterial* material_p = sp34->getMaterialNodePointer(i); J3DFogInfo* fogInfo_p; if (material_p != NULL) { @@ -227,9 +67,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { fogInfo_p->mType = 2; } - // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData? - for (int i = ((J3DModelData*)kasumim_model_p)->getMaterialNum() - 1; i >= 0; i--) { - J3DMaterial* material_p = ((J3DModelData*)kasumim_model_p)->getMaterialNodePointer(i); + for (int i = sp30->getMaterialNum() - 1; i >= 0; i--) { + J3DMaterial* material_p = sp30->getMaterialNodePointer(i); J3DFogInfo* fogInfo_p; if (material_p != NULL) { @@ -251,27 +90,35 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { daVrbox2_color_set(i_this); if (dComIfGp_roomControl_getStayNo() >= 0) { - s32 stayNo = dComIfGp_roomControl_getStayNo(); - filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo(); + filelist_p = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); } if (filelist_p != NULL) { var_f31 = dStage_FileList_dt_SeaLevel(filelist_p); } - if (dComIfGd_getView() != NULL) { - var_f31 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f; +#ifdef DEBUG + if (g_kankyoHIO.field_0xB4 != 0) { + var_f31 = g_kankyoHIO.field_0xB8; } else { - var_f31 = 0.0f; + g_kankyoHIO.field_0xB8 = var_f31; + } +#endif + + f32 f29; + if (dComIfGd_getView() != NULL) { + f29 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f; + } else { + f29 = 0.0f; } dComIfGd_setListSky(); - mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31, + mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - f29, dComIfGd_getInvViewMtx()[2][3]); kasumim_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(kasumim_model_p); - mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31, + mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - f29, dComIfGd_getInvViewMtx()[2][3]); kumo_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(kumo_model_p); @@ -279,20 +126,24 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { if (dStage_stagInfo_GetArg0(dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL && sun_p != NULL && sun_p->mSunAlpha > 0.0f) { + cXyz sp14; sp14 = sun_p->mPos[0]; +#ifndef DEBUG + cXyz sp8; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8); sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x); sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y); sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z); } +#endif s16 temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); s16 temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); - mDoMtx_stack_c::XrotM(0x7FFF - temp_r19); + mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); f32 scale; if (g_env_light.daytime < 255.0f) { @@ -317,15 +168,19 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { sun_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mDoExt_modelUpdateDL(sun_model_p); - if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { - sp14 = sun_p->mPos[0]; - sp14.y = 300.0f - (sp14.y * 0.85f); - s16 temp_r19_2 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); - s16 temp_r18_2 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); + if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { + /* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss mangZ$3688 */ + static s16 mangZ; + + sp14 = sun_p->mPos[0]; + sp14.y = 300.0f + -(sp14.y * 0.85f); + + temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); + temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); - mDoMtx_stack_c::YrotM((s16)temp_r18_2); - mDoMtx_stack_c::XrotM(0x7FFF - temp_r19_2); + mDoMtx_stack_c::YrotM((s16)temp_r18); + mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); mDoMtx_stack_c::ZrotM(mangZ); mDoMtx_stack_c::scaleM(scale, scale + 0.15f, scale); @@ -345,72 +200,10 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { return 1; } -/* ############################################################################################## */ -/* 80499AA4-80499AA8 000038 0004+00 0/1 0/0 0/0 .rodata @4069 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4069 = 0x3A03126F; -COMPILER_STRIP_GATE(0x80499AA4, &lit_4069); -#pragma pop - -/* 80499AA8-80499AAC 00003C 0004+00 0/1 0/0 0/0 .rodata @4070 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4070 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80499AA8, &lit_4070); -#pragma pop - -/* 80499AAC-80499AB0 000040 0004+00 0/1 0/0 0/0 .rodata @4071 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4071 = 1.75f; -COMPILER_STRIP_GATE(0x80499AAC, &lit_4071); -#pragma pop - -/* 80499AB0-80499AB4 000044 0004+00 0/1 0/0 0/0 .rodata @4072 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4072 = 22.0f / 5.0f; -COMPILER_STRIP_GATE(0x80499AB0, &lit_4072); -#pragma pop - -/* 80499AB4-80499AB8 000048 0004+00 0/1 0/0 0/0 .rodata @4073 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4073 = 11.0f / 5.0f; -COMPILER_STRIP_GATE(0x80499AB4, &lit_4073); -#pragma pop - -/* 80499AB8-80499ABC 00004C 0004+00 0/1 0/0 0/0 .rodata @4074 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4074 = 97.5f; -COMPILER_STRIP_GATE(0x80499AB8, &lit_4074); -#pragma pop - -/* 80499ABC-80499AC0 000050 0004+00 0/1 0/0 0/0 .rodata @4075 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4075 = 1.0f / 10.0f; -COMPILER_STRIP_GATE(0x80499ABC, &lit_4075); -#pragma pop - -/* 80499AC0-80499AC4 000054 0004+00 0/1 0/0 0/0 .rodata @4076 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u32 const lit_4076 = 0x38D1B717; -COMPILER_STRIP_GATE(0x80499AC0, &lit_4076); -#pragma pop - -/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30"; -#pragma pop - /* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */ -// NONMATCHING - some regalloc at the end static int daVrbox2_color_set(vrbox2_class* i_this) { + fopAc_ac_c* actor = i_this; + dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket; if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g + @@ -433,7 +226,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { wind_vec = *windVec_p; - dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); + u32 sp10 = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); cam_eye = camera_p->lookat.eye; cam_center = camera_p->lookat.center; @@ -442,13 +235,12 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { dKyr_get_vectle_calc(&cam_eye, &cam_center, &camFwdXZ); f32 temp_f30 = - cM3d_VectorProduct2d(0.0f, 0.0f, -wind_vec.x, -wind_vec.z, camFwdXZ.x, camFwdXZ.z) * - 0.0005f; - f32 var_f29 = temp_f30 * wind_pow; + cM3d_VectorProduct2d(0.0f, 0.0f, -wind_vec.x, -wind_vec.z, camFwdXZ.x, camFwdXZ.z); + f32 var_f29 = temp_f30 * 0.0005f * wind_pow; if (strcmp(dComIfGp_getStartStageName(), "R_SP30") == 0) { - dKyw_get_wind_vec(); - var_f29 = temp_f30 * (wind_pow + 0.3f); + cXyz* sp0C = dKyw_get_wind_vec(); + var_f29 = temp_f30 * 0.0005f * (wind_pow + 0.3f); } J3DModelData* modelData = i_this->mpKumoModel->getModelData(); @@ -485,8 +277,8 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { } modelData = i_this->mpKumoModel->getModelData(); - J3DGXColor k_color; - J3DGXColorS10 color; + GXColor k_color; + GXColorS10 color; J3DMaterial* kumo_material0 = modelData->getMaterialNodePointer(0); if (kumo_material0 != NULL) { @@ -497,13 +289,13 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { k_color.g = g_env_light.vrbox_kumo_bottom_col.g; k_color.b = g_env_light.vrbox_kumo_bottom_col.b; k_color.a = g_env_light.vrbox_kumo_top_col.a; - kumo_material0->setTevKColor(0, &k_color); + kumo_material0->setTevKColor(0, (J3DGXColor*)&k_color); color.r = g_env_light.vrbox_kumo_shadow_col.r; color.g = g_env_light.vrbox_kumo_shadow_col.g; color.b = g_env_light.vrbox_kumo_shadow_col.b; color.a = (u8)g_env_light.vrbox_kumo_top_col.a; - kumo_material0->setTevColor(0, &color); + kumo_material0->setTevColor(0, (J3DGXColorS10*)&color); } J3DMaterial* kumo_material1 = modelData->getMaterialNodePointer(1); @@ -515,13 +307,13 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { k_color.g = g_env_light.vrbox_kumo_bottom_col.g; k_color.b = g_env_light.vrbox_kumo_bottom_col.b; k_color.a = g_env_light.vrbox_kumo_top_col.a; - kumo_material1->setTevKColor(0, &k_color); + kumo_material1->setTevKColor(0, (J3DGXColor*)&k_color); color.r = g_env_light.vrbox_kumo_shadow_col.r; color.g = g_env_light.vrbox_kumo_shadow_col.g; color.b = g_env_light.vrbox_kumo_shadow_col.b; color.a = g_env_light.vrbox_kumo_top_col.a; - kumo_material1->setTevColor(0, &color); + kumo_material1->setTevColor(0, (J3DGXColorS10*)&color); } modelData = i_this->mpKasumimModel->getModelData(); @@ -534,7 +326,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { color.g = g_env_light.vrbox_kasumi_outer_col.g; color.b = g_env_light.vrbox_kasumi_outer_col.b; color.a = g_env_light.vrbox_kasumi_outer_col.a; - kasumim_material0->setTevColor(0, &color); + kasumim_material0->setTevColor(0, (J3DGXColorS10*)&color); } if (sun_p != NULL) { @@ -550,10 +342,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { color.g = sun_p->mColor.g; color.b = sun_p->mColor.b; - k_color.r = sun_p->field_0x74.r; - k_color.g = sun_p->field_0x74.g; - k_color.b = sun_p->field_0x74.b; - k_color.a = sun_p->field_0x74.a; + k_color = sun_p->field_0x74; if (i == 1) { if (g_env_light.daytime > 255.0f || g_env_light.daytime < 97.5f) { @@ -562,21 +351,18 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { cLib_addCalc(&sun_p->field_0x64, 0.0f, 0.2f, 0.1f, 0.0001f); } - int alpha = sun_p->field_0x64 * 255.0f * sun_p->mSunAlpha; - color.a = alpha; - k_color.a = alpha; + color.a = sun_p->field_0x64 * 255.0f * sun_p->mSunAlpha; + k_color.a = color.a; } else if (i == 2) { - int alpha = sun_p->mSunAlpha * 255.0f * (1.0f - sun_p->field_0x64); - color.a = alpha; - k_color.a = alpha; + color.a = sun_p->mSunAlpha * 255.0f * (1.0f - sun_p->field_0x64); + k_color.a = color.a; } else { - int alpha = sun_p->mSunAlpha * 255.0f; - color.a = alpha; - k_color.a = alpha; + color.a = sun_p->mSunAlpha * 255.0f; + k_color.a = color.a; } - material_p->setTevColor(0, &color); - material_p->setTevKColor(0, &k_color); + material_p->setTevColor(0, (J3DGXColorS10*)&color); + material_p->setTevKColor(0, (J3DGXColor*)&k_color); } } } @@ -587,7 +373,9 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { /* 804997E8-8049982C 000DE8 0044+00 1/0 0/0 0/0 .text daVrbox2_Execute__FP12vrbox2_class */ static int daVrbox2_Execute(vrbox2_class* i_this) { - if (g_env_light.daytime > FLOAT_LABEL(lit_3837)) { + i_this = i_this; // ?? fakematch? only needed for debug + + if (g_env_light.daytime > 255.0f) { i_this->mSunBtk.play(); } @@ -603,6 +391,7 @@ static int daVrbox2_IsDelete(vrbox2_class* i_this) { /* 80499834-8049983C 000E34 0008+00 1/0 0/0 0/0 .text daVrbox2_Delete__FP12vrbox2_class */ static int daVrbox2_Delete(vrbox2_class* i_this) { + fopAcM_RegisterDeleteID(i_this, "Vrbox2"); return 1; } @@ -610,21 +399,28 @@ static int daVrbox2_Delete(vrbox2_class* i_this) { static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) { vrbox2_class* a_this = (vrbox2_class*)i_this; - a_this->mpKumoModel = mDoExt_J3DModel__create( - (J3DModelData*)dComIfG_getStageRes("vrbox_kumo.bmd"), 0x80000, 0x11020202); + J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kumo.bmd"); + JUT_ASSERT(785, modelData != 0); - J3DModelData* sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd"); + a_this->mpKumoModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); + + J3DModelData* kasumi_modelData; + J3DModelData* sun_modelData; + sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd"); if (sun_modelData != NULL) { a_this->model2 = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202); + JUT_ASSERT(809, a_this->model2 != 0); a_this->model2_und = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202); + JUT_ASSERT(820, a_this->model2_und != 0); J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes("vrbox_sun.btk"); - if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, FLOAT_LABEL(lit_3627), 0, -1)) { + JUT_ASSERT(825, pbtk != 0); + if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } } - J3DModelData* kasumi_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kasumiM.bmd"); + kasumi_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kasumiM.bmd"); if (kasumi_modelData != NULL) { a_this->mpKasumimModel = mDoExt_J3DModel__create(kasumi_modelData, 0x80000, 0x11020202); } @@ -635,10 +431,9 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) { /* 80499978-80499A1C 000F78 00A4+00 1/0 0/0 0/0 .text daVrbox2_Create__FP10fopAc_ac_c */ static int daVrbox2_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, vrbox2_class); - vrbox2_class* a_this = (vrbox2_class*)i_this; int phase = cPhs_COMPLEATE_e; - if (!fopAcM_entrySolidHeap(a_this, daVrbox2_solidHeapCB, 0x80004340)) { + if (!fopAcM_entrySolidHeap(i_this, daVrbox2_solidHeapCB, 0x80004340)) { phase = cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 85d5c5b97ab..932f9882d50 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -4,6 +4,7 @@ */ #include "d/actor/d_a_warp_bug.h" +#include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 123d1184f21..510d6ab5fb8 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -119,12 +119,12 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_ void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream_spd, f32 param_3, f32 param_4, cXyz const* param_5, f32 friction, f32 no_grade_cos, cXyz const* param_8) { - JUT_ASSERT(stream_spd != 0); + JUT_ASSERT(0, stream_spd != 0); cXyz spAC; posMoveF_resist_acc(&spAC, i_actor, stream_spd, param_3, param_4); - JUT_ASSERT((friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) && + JUT_ASSERT(0, (friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) && (no_grade_cos <= 1.0f)); cXyz spB8; diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index 1a94a7f894d..db495710a8e 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -1237,9 +1237,9 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) { cx1 -= sp50.x; cy1 -= sp50.z; - JUT_ASSERT(pwi->GetPos()->x == + JUT_ASSERT(0, pwi->GetPos()->x == pwi->GetWallCirP(cir_index)->GetCx()); - JUT_ASSERT(pwi->GetPos()->z == + JUT_ASSERT(0, pwi->GetPos()->z == pwi->GetWallCirP(cir_index)->GetCy()); f32 spE0 = @@ -1250,12 +1250,12 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) { f32 onx = -tri->m_plane.GetNP()->x; f32 ony = -tri->m_plane.GetNP()->z; - JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony))); + JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony))); if (spE0 < spE4) { if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) { - JUT_ASSERT(!(fpclassify(cx0) == 1)); - JUT_ASSERT(!(fpclassify(cy0) == 1)); + JUT_ASSERT(0, !(fpclassify(cx0) == 1)); + JUT_ASSERT(0, !(fpclassify(cy0) == 1)); f32 spF0, spF4; cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0, @@ -1263,8 +1263,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) { pwi->GetPos()->x += cx0 - spF0; pwi->GetPos()->z += cy0 - spF4; - JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1)); - JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1)); pwi->CalcMovePosWork(); pwi->SetWallCirHit(cir_index); @@ -1276,8 +1276,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) { pwi->SetWallHit(); } } else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) { - JUT_ASSERT(!(fpclassify(cx1) == 1)); - JUT_ASSERT(!(fpclassify(cy1) == 1)); + JUT_ASSERT(0, !(fpclassify(cx1) == 1)); + JUT_ASSERT(0, !(fpclassify(cy1) == 1)); f32 spF8, spFC; cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1, @@ -1285,8 +1285,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) { pwi->GetPos()->x += cx1 - spF8; pwi->GetPos()->z += cy1 - spFC; - JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1)); - JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1)); pwi->CalcMovePosWork(); pwi->SetWallCirHit(cir_index); @@ -1674,9 +1674,9 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) { cx1 -= sp50.x; cy1 -= sp50.z; - JUT_ASSERT(pwi->GetPos()->x == + JUT_ASSERT(0, pwi->GetPos()->x == pwi->GetWallCirP(cir_index)->GetCx()); - JUT_ASSERT(pwi->GetPos()->z == + JUT_ASSERT(0, pwi->GetPos()->z == pwi->GetWallCirP(cir_index)->GetCy()); f32 spE0 = @@ -1687,12 +1687,12 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) { f32 onx = -tri->m_plane.GetNP()->x; f32 ony = -tri->m_plane.GetNP()->z; - JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony))); + JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony))); if (spE0 < spE4) { if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) { - JUT_ASSERT(!(fpclassify(cx0) == 1)); - JUT_ASSERT(!(fpclassify(cy0) == 1)); + JUT_ASSERT(0, !(fpclassify(cx0) == 1)); + JUT_ASSERT(0, !(fpclassify(cy0) == 1)); f32 spF0, spF4; cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0, @@ -1700,8 +1700,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) { pwi->GetPos()->x += cx0 - spF0; pwi->GetPos()->z += cy0 - spF4; - JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1)); - JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1)); pwi->CalcMovePosWork(); pwi->SetWallCirHit(cir_index); @@ -1713,8 +1713,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) { pwi->SetWallHit(); } } else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) { - JUT_ASSERT(!(fpclassify(cx1) == 1)); - JUT_ASSERT(!(fpclassify(cy1) == 1)); + JUT_ASSERT(0, !(fpclassify(cx1) == 1)); + JUT_ASSERT(0, !(fpclassify(cy1) == 1)); f32 spF8, spFC; cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1, onx, @@ -1722,8 +1722,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) { pwi->GetPos()->x += cx1 - spF8; pwi->GetPos()->z += cy1 - spFC; - JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1)); - JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1)); + JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1)); pwi->CalcMovePosWork(); pwi->SetWallCirHit(cir_index); @@ -2313,4 +2313,4 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) { /* 80450F8A 0001+00 data_80450F8A None */ /* 80450F8B 0005+00 data_80450F8B None */ extern u8 struct_80450F88[8]; -u8 struct_80450F88[8]; \ No newline at end of file +u8 struct_80450F88[8]; diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index fd758d016f6..0b74c294f53 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -44,7 +44,7 @@ static procFunc brightChackProc[] = { dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; mBrightCheck.mMsgString = new dMsgString_c(); - JUT_ASSERT(mBrightCheck.mMsgString != 0); + JUT_ASSERT(0, mBrightCheck.mMsgString != 0); screenSet(); mCompleteCheck = false; @@ -77,7 +77,7 @@ void dBrightCheck_c::screenSet() { }; mBrightCheck.Scr = new J2DScreen(); - JUT_ASSERT(mBrightCheck.Scr != 0); + JUT_ASSERT(0, mBrightCheck.Scr != 0); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); mBrightCheck.Scr->search('g_abtn_n')->hide(); diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 095d087b8b4..3693018b2cc 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -3,6 +3,7 @@ #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_movie_player.h" #include "JSystem/JGadget/pointer.h" +#include "JSystem/JGadget/define.h" namespace { /* 80037DE4-80037E44 032724 0060+00 1/0 0/0 0/0 .text @@ -29,8 +30,9 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData msg << iType; msg << "\n demo-object : "; msg << id_string; -#endif +#else break; +#endif } } @@ -128,27 +130,27 @@ f32 dDemo_actor_c::getPrm_Morf() { dDemo_prm_data* prm = mPrm.mData; switch (mPrm.field_0x0) { - case 1: + case ID_UNK_1: if (field_0x54 < 4) { return 0.0f; } return prm->field_0x4; - case 2: + case ID_UNK_2: if (field_0x54 < 7) { return 0.0f; } return prm->field_0x7; - case 4: + case ID_UNK_4: if (field_0x54 < 6) { return 0.0f; } return prm->field_0x6; - case 5: + case ID_UNK_5: if (field_0x54 < 0xB) { return 0.0f; } return prm->field_0xb; - case 6: + case ID_UNK_6: if (field_0x54 < 0xF) { return 0.0f; } @@ -349,10 +351,12 @@ static void branchFile(char const* resName) { /* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata m_branchId__7dDemo_c */ s16 dDemo_c::m_branchId = -1; +s16 dDemo_c::m_branchNum = 0; + /* 800387EC-80038920 03312C 0134+00 1/0 0/0 0/0 .text JSGSetData__13dDemo_actor_cFUlPCvUl */ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) { - if (id == 1) { + if (id == ID_UNK_1) { JStudio::stb::TParseData_fixed<50, TValueIterator_misaligned > data(pdata); if (!data.isEnd() && data.isValid()) { JGadget::binary::TValueIterator_misaligned value(data.begin()); @@ -360,7 +364,7 @@ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) { dDemo_c::setBranchType(*value); OS_REPORT("JSGSetData: 分岐条件<%d>\n", *value); } - } else if (id == 2) { + } else if (id == ID_UNK_2) { JUT_ASSERT(728, dDemo_c::getBranchId() >= 0); JStudio::stb::TParseData_string string_data(pdata); @@ -383,7 +387,7 @@ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) { if (strcmp(str, "-") != 0) { branchFile(str); } - } else if (id == 3) { + } else if (id == ID_UNK_3) { JStudio::stb::TParseData_string data(pdata); u32 num = data.size(); @@ -414,7 +418,8 @@ void dDemo_actor_c::JSGSetTranslation(Vec const& i_trans) { onEnable(ENABLE_TRANS_e); } else { // "\n\n!!JSGSetTranslation outside of range. x[%f]y[%f]z[%f]\n" - JUT_ASSERT(789, "\n\n!!JSGSetTranslationで範囲外の指定がされました。x[%f]y[%f]z[%f]\n", i_trans.x, i_trans.y, i_trans.z); + OS_REPORT("\n\n!!JSGSetTranslationで範囲外の指定がされました。x[%f]y[%f]z[%f]\n", i_trans.x, i_trans.y, i_trans.z); + JUT_ASSERT(789, 0); } } @@ -740,7 +745,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) { demoActor = new dDemo_actor_c(); if (demoActor == NULL) { // "Failed to get Demo Actor!!\n" - OS_REPORT("デモアクター確保失敗！！\n") + OS_REPORT("デモアクター確保失敗！！\n"); return NULL; } @@ -924,32 +929,32 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ void dDemo_c::create() { m_system = new dDemo_system_c(); - JUT_ASSERT(m_system != 0); + JUT_ASSERT(0, m_system != 0); m_control = new JStudio::TControl(); - JUT_ASSERT(m_control != 0); + JUT_ASSERT(0, m_control != 0); m_mesgControl = new jmessage_tControl(); - JUT_ASSERT(m_mesgControl != 0); + JUT_ASSERT(0, m_mesgControl != 0); m_stage = new JStudio_JStage::TCreateObject(m_system); - JUT_ASSERT(m_stage != 0); + JUT_ASSERT(0, m_stage != 0); m_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system); - JUT_ASSERT(m_audio != 0); + JUT_ASSERT(0, m_audio != 0); m_audio->mPermit_onExit_notEnd = true; m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system); - JUT_ASSERT(m_particle != 0); + JUT_ASSERT(0, m_particle != 0); m_message = new jstudio_tCreateObject_message(); - JUT_ASSERT(m_message != 0); + JUT_ASSERT(0, m_message != 0); m_factory = new JStudio::TFactory(); - JUT_ASSERT(m_factory != 0); + JUT_ASSERT(0, m_factory != 0); m_object = new dDemo_object_c(); - JUT_ASSERT(m_object != 0); + JUT_ASSERT(0, m_object != 0); m_control->setSecondPerFrame(1.0f / 30.0f); m_control->setFactory(m_factory); @@ -1022,7 +1027,7 @@ jmessage_tControl::~jmessage_tControl() {} /* 80039B6C-80039CF8 0344AC 018C+00 1/1 1/1 0/0 .text start__7dDemo_cFPCUcP4cXyzf */ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) { - JUT_ASSERT(m_system != 0); + JUT_ASSERT(0, m_system != 0); m_control->reset(); JStudio::TParse parser(m_control); @@ -1060,7 +1065,7 @@ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) { /* 80039CF8-80039D4C 034638 0054+00 1/1 2/2 0/0 .text end__7dDemo_cFv */ void dDemo_c::end() { - JUT_ASSERT(m_system != 0); + JUT_ASSERT(0, m_system != 0); m_control->destroyObject_all(); m_object->remove(); @@ -1070,19 +1075,19 @@ void dDemo_c::end() { /* 80039D4C-80039DA4 03468C 0058+00 1/1 0/0 0/0 .text branch__7dDemo_cFv */ void dDemo_c::branch() { - JUT_ASSERT(m_system != 0); + JUT_ASSERT(0, m_system != 0); m_control->destroyObject_all(); const u8* branchData = m_branchData; m_branchData = NULL; int rt = start(branchData, m_translation, m_rotationY); - JUT_ASSERT(rt); + JUT_ASSERT(0, rt); } /* 80039DA4-80039EDC 0346E4 0138+00 0/0 1/1 0/0 .text update__7dDemo_cFv */ int dDemo_c::update() { - JUT_ASSERT(m_system != 0); + JUT_ASSERT(0, m_system != 0); if (m_data == NULL) { if (m_branchData == NULL) { diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index 3f317f00759..1f3452ee8d6 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -75,7 +75,7 @@ u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) { /* 8003A218-8003A224 034B58 000C+00 0/0 0/0 2/2 .text getMsgNo__13door_param2_cFP10fopAc_ac_c */ u16 door_param2_c::getMsgNo(fopAc_ac_c* i_actor) { - return i_actor->home.angle.x; + return i_actor->home.angle.x & 0xFFFF; } /* 8003A224-8003A230 034B64 000C+00 0/0 0/0 6/6 .text getExitNo__13door_param2_cFP10fopAc_ac_c */ @@ -86,23 +86,23 @@ u8 door_param2_c::getExitNo(fopAc_ac_c* i_actor) { /* 8003A230-8003A23C 034B70 000C+00 0/0 0/0 1/1 .text getFLightInf__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getFLightInf(fopAc_ac_c* i_actor) { - return fopAcM_GetParamBit(i_actor, 25, 3); + return fopAcM_GetParamBit(i_actor, 25, 3) & 0xFF; } /* 8003A23C-8003A248 034B7C 000C+00 0/0 0/0 1/1 .text getBLightInf__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getBLightInf(fopAc_ac_c* i_actor) { - return fopAcM_GetParamBit(i_actor, 28, 3); + return fopAcM_GetParamBit(i_actor, 28, 3) & 0xFF; } /* 8003A248-8003A254 034B88 000C+00 0/0 0/0 1/1 .text getMFLightInf__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getMFLightInf(fopAc_ac_c* i_actor) { - return fopAcM_GetParamBit(i_actor, 19, 3); + return fopAcM_GetParamBit(i_actor, 19, 3) & 0xFF; } /* 8003A254-8003A260 034B94 000C+00 0/0 0/0 1/1 .text getMBLightInf__13door_param2_cFP10fopAc_ac_c */ u32 door_param2_c::getMBLightInf(fopAc_ac_c* i_actor) { - return fopAcM_GetParamBit(i_actor, 22, 3); -} \ No newline at end of file + return fopAcM_GetParamBit(i_actor, 22, 3) & 0xFF; +} diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 251dc07b2ea..ec0a7e3e463 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -4,6 +4,7 @@ // #include "d/d_ev_camera.h" +#include "d/d_debug_viewer.h" #include "dol2asm.h" #include "d/d_demo.h" #include "m_Do/m_Do_controller_pad.h" @@ -1046,7 +1047,7 @@ int dCamera_c::talktoEvCamera() { #if DEBUG if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) { - u32 id = mCamParam.Id(); + u32 id = mCamParam.Id(style); OS_REPORT("camera: event: %16s = %d (%c%c%c%c)\n", "style", style, (u8)(id >> 0x18), (u8)(id >> 0x10), (u8)(id >> 0x8), (u8)(id)); } #endif diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 1302298d456..366896199cf 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -54,7 +54,7 @@ dFile_info_c::~dFile_info_c() { /* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text screenSet__12dFile_info_cFv */ void dFile_info_c::screenSet() { mFileInfo.Scr = new J2DScreen(); - JUT_ASSERT(mFileInfo.Scr != 0); + JUT_ASSERT(0, mFileInfo.Scr != 0); mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive); mFileInfo.mFont = mDoExt_getMesgFont(); diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index ed5559c4ac4..4d5541c1d85 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -111,10 +111,10 @@ void dFile_warning_c::screenSet() { }; mFileWarn.Scr = new J2DScreen(); - JUT_ASSERT(mFileWarn.Scr != 0); + JUT_ASSERT(0, mFileWarn.Scr != 0); mFileWarn.mMsgString = new dMsgString_c(); - JUT_ASSERT(mFileWarn.mMsgString != 0); + JUT_ASSERT(0, mFileWarn.mMsgString != 0); mFileWarn.Scr->setPriority(blo_name[field_0x3e], 0x100000, mpArchive); @@ -126,7 +126,7 @@ void dFile_warning_c::screenSet() { mFileWarn.mFont = mDoExt_getMesgFont(); mpRootPane = new CPaneMgr(mFileWarn.Scr, 'Nm_02', 0, NULL); - JUT_ASSERT(mpRootPane != 0); + JUT_ASSERT(0, mpRootPane != 0); field_0x34 = mpRootPane->getTranslateY(); mFileWarn.Scr->search('w_msg_jp')->hide(); diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 268eec6a5be..6c5c91c4468 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -21,6 +21,8 @@ public: /* 8019AFE0 */ dGov_HIO_c(); /* 8019C06C */ virtual ~dGov_HIO_c() {} + void genMessage(JORMContext*); + /* 0x04 */ u8 unk_0x4; /* 0x08 */ f32 mScale; /* 0x0C */ f32 mAlpha; @@ -147,7 +149,7 @@ int dGameover_c::_create() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo("Gover"); - JUT_ASSERT(resInfo != 0); + JUT_ASSERT(0, resInfo != 0); mpHeap = (JKRHeap*)dComIfGp_getExpHeap2D(); dComIfGp_setHeapLockFlag(6); @@ -156,7 +158,7 @@ int dGameover_c::_create() { dgo_screen_c = new dDlst_GameOverScrnDraw_c(resInfo->getArchive()); dMs_c = new dMenu_save_c(); - JUT_ASSERT(dMs_c != 0); + JUT_ASSERT(0, dMs_c != 0); if (dMeter2Info_getGameOverType() == 1) { if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) { @@ -175,7 +177,7 @@ int dGameover_c::_create() { dMs_c->_create(); dgo_capture_c = new dDlst_Gameover_CAPTURE_c(); - JUT_ASSERT(dgo_capture_c != 0); + JUT_ASSERT(0, dgo_capture_c != 0); OS_REPORT("game over create size ===> %d\n", temp - mpHeap->getTotalFreeSize()); diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index df08c35711d..a54129de518 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -98,7 +98,7 @@ int renderingAmap_c::getDispType() const { disp_type = 5; break; default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; } @@ -336,7 +336,7 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) { *color = borderColor1; break; default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; } } else { @@ -357,7 +357,7 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) { const GXColor* color; if (isDrawOutSideTrim() && field_0x38 != 2) { - JUT_ASSERT(m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0]))); + JUT_ASSERT(0, m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0]))); color = &colorTable[m_outSideBlackLineCnt]; } else { color = getLineColor(param_0, param_1); @@ -427,7 +427,7 @@ int renderingAmap_c::getStayType() const { * isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2, int param_3) const { - JUT_ASSERT(i_data != 0); + JUT_ASSERT(0, i_data != 0); bool var_r31 = false; int disp_type = getDispType(); @@ -443,7 +443,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para switch (group_no) { case 0: if (stay_type == 1) { - JUT_ASSERT(i_data->mNo != 255); + JUT_ASSERT(0, i_data->mNo != 255); if (var_r23 && i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo) && param_1) { var_r31 = true; @@ -492,7 +492,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } if (temp_r23_2) { - JUT_ASSERT(i_data->mNo != 255); + JUT_ASSERT(0, i_data->mNo != 255); bool temp_r23_3 = false; if (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo)) { temp_r23_3 = true; @@ -592,7 +592,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } break; default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; } @@ -621,7 +621,7 @@ bool dMap_c::isSpecialOutline() { /* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text copyPalette__6dMap_cFv */ void dMap_c::copyPalette() { - JUT_ASSERT(m_res != 0); + JUT_ASSERT(0, m_res != 0); cLib_memCpy(m_res, m_res_src, sizeof(dMap_HIO_prm_res_dst_s::m_res->palette_data)); if (getStayType() == 0) { @@ -680,7 +680,7 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { field_0x90 = 0; m_res = new (0x20) dMap_prm_res_s; - JUT_ASSERT(m_res != 0); + JUT_ASSERT(0, m_res != 0); dMap_HIO_prm_res_dst_s::m_res = m_res; @@ -696,12 +696,12 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { int buffer_size = GXGetTexBufferSize(param_2, param_3, 9, GX_FALSE, 0); mImage_p = new (0x20) u8[buffer_size]; - JUT_ASSERT(mImage_p != 0); + JUT_ASSERT(0, mImage_p != 0); renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY); mResTIMG = new (0x20) ResTIMG; - JUT_ASSERT(mResTIMG != 0); + JUT_ASSERT(0, mResTIMG != 0); makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33); } @@ -732,7 +732,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param f32 var_f2 = 0.0f; f32 var_f3 = 0.0f; - JUT_ASSERT(i_roomNo >= 0); + JUT_ASSERT(0, i_roomNo >= 0); if (i_roomNo >= 0) { f32 temp_f31 = dMpath_c::getMinX(); @@ -746,7 +746,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param f32 sp8 = 0.0f; dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo); - JUT_ASSERT(fileList2_p != 0); + JUT_ASSERT(0, fileList2_p != 0); if (fileList2_p != NULL) { dMapInfo_n::getRoomMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8); @@ -754,7 +754,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param switch (getDispType()) { default: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); case 4: case 0: var_f0 = temp_f31; @@ -841,7 +841,7 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) { f32 var_f31 = 0.0f; f32 var_f30 = 0.0f; - JUT_ASSERT(i_roomNo >= 0); + JUT_ASSERT(0, i_roomNo >= 0); if (i_roomNo >= 0) { f32 sp14 = 0.0f; @@ -865,11 +865,11 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) { /* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text calcMapCmPerTexel__6dMap_cFiPf */ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { - JUT_ASSERT(i_roomNo >= 0); - JUT_ASSERT(ip_cmPerTexel != 0); + JUT_ASSERT(0, i_roomNo >= 0); + JUT_ASSERT(0, ip_cmPerTexel != 0); f32 cmPerTexel = 0.0f; - JUT_ASSERT(mTexSizeY != 0); + JUT_ASSERT(0, mTexSizeY != 0); if (i_roomNo >= 0) { if (getStayType() == 0) { @@ -893,7 +893,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { f32 var_f31 = 0.0f; stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); - JUT_ASSERT(pstag != 0); + JUT_ASSERT(0, pstag != 0); if (pstag != NULL) { var_f31 = pstag->field_0x20; @@ -907,7 +907,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { } } - JUT_ASSERT(cmPerTexel != 0.0f); + JUT_ASSERT(0, cmPerTexel != 0.0f); if (ip_cmPerTexel != NULL) { *ip_cmPerTexel = cmPerTexel; @@ -942,7 +942,7 @@ inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u /* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) { - JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER); + JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER); int pixel; u8 scaled_a = 0; @@ -970,8 +970,8 @@ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) { /* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text copyPalette__6dMap_cFiif */ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) { - JUT_ASSERT(i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER); - JUT_ASSERT(i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER); + JUT_ASSERT(0, i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER); + JUT_ASSERT(0, i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER); int pixel; u8 scaled_a = 0; @@ -999,7 +999,7 @@ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) { /* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */ void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) { - JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER); + JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER); int pixel; if (i_scaledA >= 0xE0) { @@ -1102,7 +1102,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) { switch (getDispType()) { default: case 0: - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case 5: field_0x8e = 2; @@ -1301,4 +1301,4 @@ dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0) // TODO: this is supposed to be auto-generated, but its not getting put in the right order void dDlst_base_c::draw() { /* empty function */ -} \ No newline at end of file +} diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 6f524c9f6ab..15a7c0f21b1 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -791,7 +791,7 @@ void dMenu_DmapBg_c::setFloorMessage() { local_d8[7]->setFont(mDoExt_getSubFont()); local_f8[7]->setFont(mDoExt_getSubFont()); - OS_REPORT("floor ===> %d\n", dMenu_Dmap_c::myclass->getFloorAll()) + OS_REPORT("floor ===> %d\n", dMenu_Dmap_c::myclass->getFloorAll()); for (int i = 0; i < 8; i++) { int bottomFloor = dMenu_Dmap_c::myclass->getBottomFloor(); u32 floorAll = dMenu_Dmap_c::myclass->getFloorAll(); diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index b1697b8a9c3..58ca2564463 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -243,8 +243,8 @@ dMenu_Letter_c::~dMenu_Letter_c() { delete mpMenuDMYScreen; mpMenuDMYScreen = NULL; - delete mpMenuBaseScreen; - mpMenuBaseScreen = NULL; + delete mpBaseScreen; + mpBaseScreen = NULL; delete mpSdwScreen; mpSdwScreen = NULL; @@ -358,7 +358,7 @@ void dMenu_Letter_c::_draw() { mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(), mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false, false); mpBlackTex->setAlpha(prevAlpha); - mpMenuBaseScreen->draw(0.0f, 0.0f, grafContext); + mpBaseScreen->draw(0.0f, 0.0f, grafContext); u32 left, top, width, height; GXGetScissor(&left, &top, &width, &height); CPaneMgr afStack_138; @@ -579,8 +579,8 @@ void dMenu_Letter_c::wait_move() { } if (mProcess == 1 || mProcess == 2) { - J2DTextBox* textBox = (J2DTextBox*)mpMenuBaseScreen->search('f_t_00'); - mpMenuBaseScreen->search('t_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('f_t_00'); + mpBaseScreen->search('t_t00')->hide(); dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100); mpString->getString(0x4d6, textBox, NULL, NULL, NULL, 0); } @@ -1052,29 +1052,29 @@ static const u64 tag_pii[9] = { /* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text screenSetBase__14dMenu_Letter_cFv */ void dMenu_Letter_c::screenSetBase() { - mpMenuBaseScreen = new J2DScreen(); + mpBaseScreen = new J2DScreen(); JUT_ASSERT(1357, mpBaseScreen != 0); - bool fg = mpMenuBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive); + bool fg = mpBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive); JUT_ASSERT(1361, fg != false); - dPaneClass_showNullPane(mpMenuBaseScreen); - mpMenuBaseScreen->search('wi_btn_n')->hide(); - mpParent[1] = new CPaneMgr(mpMenuBaseScreen, 'n_all', 2, NULL); + dPaneClass_showNullPane(mpBaseScreen); + mpBaseScreen->search('wi_btn_n')->hide(); + mpParent[1] = new CPaneMgr(mpBaseScreen, 'n_all', 2, NULL); JUT_ASSERT(1372, mpParent[1] != 0); mpParent[1]->setAlphaRate(0.0f); - J2DTextBox* piVar9 = (J2DTextBox*)mpMenuBaseScreen->search('f_t_00'); - mpMenuBaseScreen->search('t_t00')->hide(); + J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('f_t_00'); + mpBaseScreen->search('t_t00')->hide(); piVar9->setString(0x40, ""); piVar9->setFont(mDoExt_getSubFont()); dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100); mpString->getString(0x4d6, piVar9, NULL, NULL, NULL, 0); - J2DTextBox* text1 = (J2DTextBox*)mpMenuBaseScreen->search('fwpstex1'); - J2DTextBox* text2 = (J2DTextBox*)mpMenuBaseScreen->search('fwp_tex1'); - J2DTextBox* text3 = (J2DTextBox*)mpMenuBaseScreen->search('fgps_tx1'); - J2DTextBox* text4 = (J2DTextBox*)mpMenuBaseScreen->search('fgp_tex1'); - mpMenuBaseScreen->search('wps_text')->hide(); - mpMenuBaseScreen->search('w_p_text')->hide(); - mpMenuBaseScreen->search('g_ps_txt')->hide(); - mpMenuBaseScreen->search('g_p_text')->hide(); + J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('fwpstex1'); + J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('fwp_tex1'); + J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('fgps_tx1'); + J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('fgp_tex1'); + mpBaseScreen->search('wps_text')->hide(); + mpBaseScreen->search('w_p_text')->hide(); + mpBaseScreen->search('g_ps_txt')->hide(); + mpBaseScreen->search('g_p_text')->hide(); text1->setString(0x40, ""); text2->setString(0x40, ""); text3->setString(0x40, ""); @@ -1087,33 +1087,33 @@ void dMenu_Letter_c::screenSetBase() { dMeter2Info_getStringKanji(0x4d7, text2->getStringPtr(), 0); dMeter2Info_getStringKanji(0x4d7, text3->getStringPtr(), 0); dMeter2Info_getStringKanji(0x4d7, text4->getStringPtr(), 0); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont()); - field_0x1ec = (J2DTextBox*)mpMenuBaseScreen->search('let_area'); + ((J2DTextBox*)mpBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont()); + field_0x1ec = (J2DTextBox*)mpBaseScreen->search('let_area'); for (int i = 0; i < 9; i++) { - field_0x1f0[i] = (J2DTextBox*)mpMenuBaseScreen->search(tag_pip[i]); + field_0x1f0[i] = (J2DTextBox*)mpBaseScreen->search(tag_pip[i]); if (field_0x374 > 1 && i < field_0x374) { field_0x1f0[i]->show(); } else { field_0x1f0[i]->hide(); } - mpPageLight[i] = (J2DPicture*)mpMenuBaseScreen->search(tag_pil[i]); + mpPageLight[i] = (J2DPicture*)mpBaseScreen->search(tag_pil[i]); if (i == field_0x36f) { mpPageLight[i]->show(); } else { mpPageLight[i]->hide(); } - field_0x238[i] = (J2DTextBox*)mpMenuBaseScreen->search(tag_pii[i]); + field_0x238[i] = (J2DTextBox*)mpBaseScreen->search(tag_pii[i]); } if (field_0x374 > 1) { - J2DPane* pJVar6 = mpMenuBaseScreen->search('pi_n'); + J2DPane* pJVar6 = mpBaseScreen->search('pi_n'); f32 dVar18 = field_0x1f0[1]->getBounds().i.x - field_0x1f0[0]->getBounds().i.x; f32 dVar17 = dVar18 * (field_0x374 - 1); f32 dVar16 = (pJVar6->getWidth() / 2) - (dVar17 / 2); diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index cb1c344151d..1fe6589461e 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -18,6 +18,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" +#include "cstring.h" /* 8020FAB4-802102F8 20A3F4 0844+00 0/0 1/1 0/0 .text __ct__13dMeter2Draw_cFP10JKRExpHeap */ @@ -44,9 +45,9 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { mDoExt_setCurrentHeap(heap); mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpScreen->search('ju_ring5')->hide(); @@ -54,24 +55,24 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { for (int i = 0; i < 2; i++) { mpKanteraMeter[i] = new dKantera_icon_c(); - JUT_ASSERT(mpKanteraMeter[i] != 0); + JUT_ASSERT(0, mpKanteraMeter[i] != 0); } mpKanteraScreen = new J2DScreen(); - JUT_ASSERT(mpKanteraScreen != 0); + JUT_ASSERT(0, mpKanteraScreen != 0); fg = mpKanteraScreen->setPriority("zelda_game_image_kantera.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpKanteraScreen); mpPikariScreen = new J2DScreen(); - JUT_ASSERT(mpPikariScreen != 0); + JUT_ASSERT(0, mpPikariScreen != 0); fg = mpPikariScreen->setPriority("zelda_icon_pikari.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpPikariScreen); mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL); - JUT_ASSERT(mpPikariParent != 0); + JUT_ASSERT(0, mpPikariParent != 0); mPikariBlack = static_cast(mpPikariScreen->search('pika00'))->getBlack(); mPikariWhite = static_cast(mpPikariScreen->search('pika00'))->getWhite(); @@ -86,7 +87,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { playPikariBpkAnimation(1.0f); mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'}; static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; @@ -96,29 +97,29 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { for (int i = 0; i < 5; i++) { mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL); - JUT_ASSERT(mpAText[i] != 0); + JUT_ASSERT(0, mpAText[i] != 0); static_cast(mpAText[i]->getPanePtr())->setString(64, ""); static_cast(mpAText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); static_cast(mpAText[i]->getPanePtr()) ->setCharSpace(g_drawHIO.mButtonATextSpacing); mpBText[i] = new CPaneMgr(mpScreen, b_tag[i], 0, NULL); - JUT_ASSERT(mpBText[i] != 0); + JUT_ASSERT(0, mpBText[i] != 0); static_cast(mpBText[i]->getPanePtr())->setString(64, ""); static_cast(mpBText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][2] = new CPaneMgr(mpScreen, z_tag[i], 0, NULL); - JUT_ASSERT(mpXYText[i][2] != 0); + JUT_ASSERT(0, mpXYText[i][2] != 0); static_cast(mpXYText[i][2]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][2]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][0] = new CPaneMgr(mpScreen, x_tag[i], 0, NULL); - JUT_ASSERT(mpXYText[i][0] != 0); + JUT_ASSERT(0, mpXYText[i][0] != 0); static_cast(mpXYText[i][0]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][0]->getPanePtr())->setFont(mDoExt_getMesgFont()); mpXYText[i][1] = new CPaneMgr(mpScreen, y_tag[i], 0, NULL); - JUT_ASSERT(mpXYText[i][1] != 0); + JUT_ASSERT(0, mpXYText[i][1] != 0); static_cast(mpXYText[i][1]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont()); } @@ -753,27 +754,27 @@ void dMeter2Draw_c::initLife() { }; mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL); - JUT_ASSERT(mpLifeParent != 0); + JUT_ASSERT(0, mpLifeParent != 0); for (int i = 0; i < 20; i++) { mpLifeParts[i] = new CPaneMgr(mpScreen, life_tag[i], 0, NULL); - JUT_ASSERT(mpLifeParts[i] != 0); + JUT_ASSERT(0, mpLifeParts[i] != 0); mpHeartMark[i] = new CPaneMgr(mpScreen, mark_tag[i], 2, NULL); - JUT_ASSERT(mpHeartMark[i] != 0); + JUT_ASSERT(0, mpHeartMark[i] != 0); mpHeartBase[i] = new CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL); - JUT_ASSERT(mpHeartBase[i] != 0); + JUT_ASSERT(0, mpHeartBase[i] != 0); mpLifeTexture[i][0] = new CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL); - JUT_ASSERT(mpLifeTexture[i][0] != 0); + JUT_ASSERT(0, mpLifeTexture[i][0] != 0); mpLifeTexture[i][1] = new CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL); - JUT_ASSERT(mpLifeTexture[i][1] != 0); + JUT_ASSERT(0, mpLifeTexture[i][1] != 0); } mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL); - JUT_ASSERT(mpBigHeart != 0); + JUT_ASSERT(0, mpBigHeart != 0); mpLifeParent->setAlphaRate(0.0f); @@ -795,20 +796,20 @@ void dMeter2Draw_c::initMagic() { field_0x554 = 0.0f; mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL); - JUT_ASSERT(mpMagicParent != 0); + JUT_ASSERT(0, mpMagicParent != 0); mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL); - JUT_ASSERT(mpMagicBase != 0); + JUT_ASSERT(0, mpMagicBase != 0); mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL); - JUT_ASSERT(mpMagicFrameL != 0); + JUT_ASSERT(0, mpMagicFrameL != 0); mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); - JUT_ASSERT(mpMagicFrameR != 0); + JUT_ASSERT(0, mpMagicFrameR != 0); mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); - JUT_ASSERT(mpMagicMeter != 0); + JUT_ASSERT(0, mpMagicMeter != 0); OSInitFastCast(); @@ -856,7 +857,7 @@ void dMeter2Draw_c::initMagic() { /* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */ void dMeter2Draw_c::initLightDrop() { mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL); - JUT_ASSERT(mpLightDropParent != 0); + JUT_ASSERT(0, mpLightDropParent != 0); static u64 const tuta_0[] = { 's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07', @@ -875,20 +876,20 @@ void dMeter2Draw_c::initLightDrop() { for (int i = 0; i < 16; i++) { mpSIParts[i][0] = new CPaneMgr(mpScreen, tuta_0[i], 0, NULL); - JUT_ASSERT(mpSIParts[i][0] != 0); + JUT_ASSERT(0, mpSIParts[i][0] != 0); mpSIParts[i][1] = new CPaneMgr(mpScreen, tuta_1[i], 0, NULL); - JUT_ASSERT(mpSIParts[i][1] != 0); + JUT_ASSERT(0, mpSIParts[i][1] != 0); mpSIParts[i][2] = new CPaneMgr(mpScreen, tuta_2[i], 0, NULL); - JUT_ASSERT(mpSIParts[i][2] != 0); + JUT_ASSERT(0, mpSIParts[i][2] != 0); } mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL); - JUT_ASSERT(mpSIParent[0] != 0); + JUT_ASSERT(0, mpSIParent[0] != 0); mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL); - JUT_ASSERT(mpSIParent[1] != 0); + JUT_ASSERT(0, mpSIParent[1] != 0); mpLightDropParent->setAlphaRate(0.0f); field_0x6fc = 0.0f; @@ -913,7 +914,7 @@ void dMeter2Draw_c::initLightDrop() { /* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */ void dMeter2Draw_c::initRupeeKey() { mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL); - JUT_ASSERT(mpRupeeKeyParent != 0); + JUT_ASSERT(0, mpRupeeKeyParent != 0); field_0x718 = 1.0f; static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'}; @@ -921,22 +922,22 @@ void dMeter2Draw_c::initRupeeKey() { for (int i = 0; i < 4; i++) { mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); - JUT_ASSERT(mpRupeeTexture[i][0] != 0); + JUT_ASSERT(0, mpRupeeTexture[i][0] != 0); mpRupeeTexture[i][0]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpRupeeTexture[i][1] = new CPaneMgr(mpScreen, rupeet2_tag[i], 0, NULL); - JUT_ASSERT(mpRupeeTexture[i][1] != 0); + JUT_ASSERT(0, mpRupeeTexture[i][1] != 0); mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4); } mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL); - JUT_ASSERT(mpRupeeParent[0] != 0); + JUT_ASSERT(0, mpRupeeParent[0] != 0); mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL); - JUT_ASSERT(mpRupeeParent[1] != 0); + JUT_ASSERT(0, mpRupeeParent[1] != 0); mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL); - JUT_ASSERT(mpRupeeParent[2] != 0); + JUT_ASSERT(0, mpRupeeParent[2] != 0); mpRupeeParent[0]->setAlphaRate(0.0f); mpRupeeParent[1]->setAlphaRate(0.0f); @@ -946,13 +947,13 @@ void dMeter2Draw_c::initRupeeKey() { for (int i = 0; i < 5; i++) { mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL); - JUT_ASSERT(mpKeyTexture[i] != 0); + JUT_ASSERT(0, mpKeyTexture[i] != 0); mpKeyTexture[i]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpKeyTexture[i]->hide(); } mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL); - JUT_ASSERT(mpKeyParent != 0); + JUT_ASSERT(0, mpKeyParent != 0); mpKeyParent->setAlphaRate(0.0f); drawRupee(dComIfGs_getRupee()); @@ -978,7 +979,7 @@ void dMeter2Draw_c::initButton() { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { mpItemBTex[i][j] = (ResTIMG*)heap->alloc(0xC00, 0x20); - JUT_ASSERT(mpItemBTex[i][j] != 0); + JUT_ASSERT(0, mpItemBTex[i][j] != 0); } } @@ -989,13 +990,13 @@ void dMeter2Draw_c::initButton() { for (int j = 0; j < 2; j++) { for (int k = 0; k < 2; k++) { mpItemXYTex[i][j][k] = (ResTIMG*)heap->alloc(0xC00, 0x20); - JUT_ASSERT(mpItemXYTex[i][j][k] != 0); + JUT_ASSERT(0, mpItemXYTex[i][j][k] != 0); } } } mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL); - JUT_ASSERT(mpItemB != 0); + JUT_ASSERT(0, mpItemB != 0); mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4); mpItemB->show(); @@ -1012,17 +1013,17 @@ void dMeter2Draw_c::initButton() { 'b_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()), static_cast(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(mpItemBPane != 0); + JUT_ASSERT(0, mpItemBPane != 0); mpItemBPane->setBasePosition(J2DBasePosition_4); mpItemB->getPanePtr()->appendChild(mpItemBPane); mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL); - JUT_ASSERT(mpItemXY[0] != 0); + JUT_ASSERT(0, mpItemXY[0] != 0); mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]); mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL); - JUT_ASSERT(mpItemXY[1] != 0); + JUT_ASSERT(0, mpItemXY[1] != 0); mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]); @@ -1033,7 +1034,7 @@ void dMeter2Draw_c::initButton() { 'x_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()), static_cast(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(mpItemXYPane[0] != 0); + JUT_ASSERT(0, mpItemXYPane[0] != 0); mpItemXYPane[0]->setBasePosition(J2DBasePosition_4); mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]); @@ -1041,12 +1042,12 @@ void dMeter2Draw_c::initButton() { 'y_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()), static_cast(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(mpItemXYPane[1] != 0); + JUT_ASSERT(0, mpItemXYPane[1] != 0); mpItemXYPane[1]->setBasePosition(J2DBasePosition_4); mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]); mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL); - JUT_ASSERT(mpItemR != 0); + JUT_ASSERT(0, mpItemR != 0); mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(2, mpItemR); @@ -1054,65 +1055,65 @@ void dMeter2Draw_c::initButton() { 'r_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()), static_cast(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(mpItemXYPane[2] != 0); + JUT_ASSERT(0, mpItemXYPane[2] != 0); mpItemXYPane[2]->setBasePosition(J2DBasePosition_4); mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]); mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL); - JUT_ASSERT(mpLightB != 0); + JUT_ASSERT(0, mpLightB != 0); mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4); field_0x72c = 1.0f; mpLightB->hide(); mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL); - JUT_ASSERT(mpLightXY[0] != 0); + JUT_ASSERT(0, mpLightXY[0] != 0); mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[0]->hide(); mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL); - JUT_ASSERT(mpLightXY[1] != 0); + JUT_ASSERT(0, mpLightXY[1] != 0); mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[1]->hide(); mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL); - JUT_ASSERT(mpLightXY[2] != 0); + JUT_ASSERT(0, mpLightXY[2] != 0); mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[2]->hide(); mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL); - JUT_ASSERT(mpBTextA != 0); + JUT_ASSERT(0, mpBTextA != 0); mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL); - JUT_ASSERT(mpBTextB != 0); + JUT_ASSERT(0, mpBTextB != 0); mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL); - JUT_ASSERT(mpBTextXY[0] != 0); + JUT_ASSERT(0, mpBTextXY[0] != 0); mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL); - JUT_ASSERT(mpBTextXY[1] != 0); + JUT_ASSERT(0, mpBTextXY[1] != 0); mpBTextXY[2] = NULL; mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL); - JUT_ASSERT(mpTextA != 0); + JUT_ASSERT(0, mpTextA != 0); mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL); - JUT_ASSERT(mpTextB != 0); + JUT_ASSERT(0, mpTextB != 0); mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL); - JUT_ASSERT(mpTextXY[2] != 0); + JUT_ASSERT(0, mpTextXY[2] != 0); mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL); - JUT_ASSERT(mpTextXY[0] != 0); + JUT_ASSERT(0, mpTextXY[0] != 0); mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL); - JUT_ASSERT(mpTextXY[1] != 0); + JUT_ASSERT(0, mpTextXY[1] != 0); mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL); - JUT_ASSERT(mpTextI != 0); + JUT_ASSERT(0, mpTextI != 0); mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL); - JUT_ASSERT(mpTextM != 0); + JUT_ASSERT(0, mpTextM != 0); static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'}; static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0}; @@ -1120,14 +1121,14 @@ void dMeter2Draw_c::initButton() { for (int i = 0; i < 5; i++) { if (juji_i_tag[i] != 0) { mpJujiI[i] = new CPaneMgr(mpScreen, juji_i_tag[i], 0, NULL); - JUT_ASSERT(mpJujiI[i] != 0); + JUT_ASSERT(0, mpJujiI[i] != 0); } else { mpJujiI[i] = NULL; } if (juji_m_tag[i] != 0) { mpJujiM[i] = new CPaneMgr(mpScreen, juji_m_tag[i], 0, NULL); - JUT_ASSERT(mpJujiM[i] != 0); + JUT_ASSERT(0, mpJujiM[i] != 0); } else { mpJujiM[i] = NULL; } @@ -1137,40 +1138,40 @@ void dMeter2Draw_c::initButton() { mpTextXY[1]->hide(); mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL); - JUT_ASSERT(mpButtonParent != 0); + JUT_ASSERT(0, mpButtonParent != 0); mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL); - JUT_ASSERT(mpButtonA != 0); + JUT_ASSERT(0, mpButtonA != 0); mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL); - JUT_ASSERT(mpButtonB != 0); + JUT_ASSERT(0, mpButtonB != 0); field_0x730 = 1.0f; mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL); - JUT_ASSERT(mpButtonMidona != 0); + JUT_ASSERT(0, mpButtonMidona != 0); mButtonZAlpha = 0.0f; field_0x724 = 0.0f; field_0x738 = 0.0f; field_0x740 = 0; mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL); - JUT_ASSERT(mpButtonXY[0] != 0); + JUT_ASSERT(0, mpButtonXY[0] != 0); mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL); - JUT_ASSERT(mpButtonXY[1] != 0); + JUT_ASSERT(0, mpButtonXY[1] != 0); mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL); - JUT_ASSERT(mpButtonXY[2] != 0); + JUT_ASSERT(0, mpButtonXY[2] != 0); mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL); - JUT_ASSERT(mpUzu != 0); + JUT_ASSERT(0, mpUzu != 0); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( 'TIMG', dMeter2Info_getNumberTextureName(0)); for (int i = 0; i < 2; i++) { for (int j = 0; j < 3; j++) { mpItemNumTex[i][j] = new J2DPicture(timg); - JUT_ASSERT(mpItemNumTex[i][j] != 0); + JUT_ASSERT(0, mpItemNumTex[i][j] != 0); } } @@ -1217,7 +1218,7 @@ void dMeter2Draw_c::initButton() { */ void dMeter2Draw_c::initButtonCross() { mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL); - JUT_ASSERT(mpButtonCrossParent != 0); + JUT_ASSERT(0, mpButtonCrossParent != 0); static_cast(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont()); static_cast(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont()); @@ -2281,7 +2282,7 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP mpTextA->hide(); } - JUT_ASSERT(std::strlen(mp_string) < (64)); + JUT_ASSERT(0, std::strlen (mp_string) < (64)); if (daPy_getPlayerActorClass()->getSumouMode()) { mpTextA->show(); @@ -2349,7 +2350,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } } - JUT_ASSERT(std::strlen(mp_string) < (64)); + JUT_ASSERT(0, std::strlen (mp_string) < (64)); for (int i = 0; i < 5; i++) { strcpy(static_cast(mpBText[i]->getPanePtr())->getStringPtr(), mp_string); @@ -2435,7 +2436,7 @@ void dMeter2Draw_c::drawButtonZ(u8 i_action) { mpButtonMidona->show(); } - JUT_ASSERT(std::strlen(mp_string) < (64)); + JUT_ASSERT(0, std::strlen (mp_string) < (64)); for (int i = 0; i < 5; i++) { strcpy(static_cast(mpXYText[i][2]->getPanePtr())->getStringPtr(), mp_string); @@ -2499,7 +2500,7 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) { /* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) { - JUT_ASSERT(i_no < SELECT_MAX_e); + JUT_ASSERT(0, i_no < SELECT_MAX_e); static u64 const tag[] = {'item_x_n', 'item_y_n'}; @@ -2540,7 +2541,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_ mpTextXY[i_no]->hide(); } - JUT_ASSERT(std::strlen(mp_string) < (64)); + JUT_ASSERT(0, std::strlen (mp_string) < (64)); for (int i = 0; i < 5; i++) { strcpy(static_cast(mpXYText[i][i_no]->getPanePtr())->getStringPtr(), @@ -3225,7 +3226,7 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) { /* 80219E98-8021A29C 2147D8 0404+00 0/0 1/1 0/0 .text setButtonIconAlpha__13dMeter2Draw_cFiUcUlb */ void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) { - JUT_ASSERT(i_no < SELECT_MAX_e); + JUT_ASSERT(0, i_no < SELECT_MAX_e); if (mpItemXY[i_no]->isVisible() || mpLightXY[i_no]->isVisible() || mpButtonXY[i_no]->isVisible()) @@ -3420,7 +3421,7 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { /* 8021A71C-8021A9C8 21505C 02AC+00 1/1 0/0 0/0 .text changeTextureItemXY__13dMeter2Draw_cFiUc */ void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { - JUT_ASSERT(i_no < SELECT_MAX_e); + JUT_ASSERT(0, i_no < SELECT_MAX_e); if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) { i_itemNo = fpcNm_ITEM_BOW; @@ -3519,7 +3520,7 @@ void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) { /* 8021AB84-8021AEC8 2154C4 0344+00 0/0 6/6 0/0 .text setItemNum__13dMeter2Draw_cFUcUcUc */ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) { - JUT_ASSERT(i_button < SELECT_MAX_e); + JUT_ASSERT(0, i_button < SELECT_MAX_e); if (i_num > i_max) { i_num = i_max; @@ -3574,7 +3575,7 @@ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) { /* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text drawItemNum__13dMeter2Draw_cFUcf */ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) { - JUT_ASSERT(i_button < SELECT_MAX_e); + JUT_ASSERT(0, i_button < SELECT_MAX_e); if (i_alpha == 1.0f) { i_alpha = mpItemXY[i_button]->getAlphaRate(); @@ -3587,7 +3588,7 @@ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) { /* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) { - JUT_ASSERT(i_button < SELECT_MAX_e); + JUT_ASSERT(0, i_button < SELECT_MAX_e); CPaneMgr* pane = mpItemXY[i_button]; f32 sp10[2] = {0.0f}; diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp index 86e0a269884..eb2d37cd987 100644 --- a/src/d/d_meter_haihai.cpp +++ b/src/d/d_meter_haihai.cpp @@ -24,15 +24,15 @@ dMeterHaihai_c::~dMeterHaihai_c() { /* 8020AF6C-8020B0F4 2058AC 0188+00 1/0 0/0 0/0 .text _create__14dMeterHaihai_cFv */ int dMeterHaihai_c::_create() { mpHaihaiScreen = new J2DScreen(); - JUT_ASSERT(mpHaihaiScreen != 0); + JUT_ASSERT(0, mpHaihaiScreen != 0); bool fg = mpHaihaiScreen->setPriority("zelda_hihi_cursor.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHaihaiScreen); mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); OSInitFastCast(); mpCursorBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load( @@ -370,4 +370,4 @@ void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) { mpHaihaiScreen->search('npc_l1')->setAnimation(i_bpk); mpHaihaiScreen->search('yaji_l')->setAnimation(i_bpk); } -} \ No newline at end of file +} diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index e8ab450c295..c99522fece0 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -31,25 +31,25 @@ int dMeterHakusha_c::_create() { for (int i = 0; i < 6; i++) { mpHakushaPos[i] = new CPaneMgr(field_0x004, haku_tag[i], 0, NULL); - JUT_ASSERT(mpHakushaPos[i] != 0); + JUT_ASSERT(0, mpHakushaPos[i] != 0); } mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL); - JUT_ASSERT(mpHakushaParent != 0); + JUT_ASSERT(0, mpHakushaParent != 0); mpHakushaScreen = new J2DScreen(); - JUT_ASSERT(mpHakushaScreen != 0); + JUT_ASSERT(0, mpHakushaScreen != 0); bool fg = mpHakushaScreen->setPriority("zelda_game_image_hakusha_parts.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHakushaScreen); mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL); - JUT_ASSERT(mpHakushaOn != 0); + JUT_ASSERT(0, mpHakushaOn != 0); mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL); - JUT_ASSERT(mpHakushaOff != 0); + JUT_ASSERT(0, mpHakushaOff != 0); mpHakushaOn->setAlphaRate(0.0f); mpHakushaOff->setAlphaRate(0.0f); @@ -67,15 +67,15 @@ int dMeterHakusha_c::_create() { mHakushaNum = dMeter2Info_getHorseLifeCount(); mpButtonScreen = new J2DScreen(); - JUT_ASSERT(mpButtonScreen != 0); + JUT_ASSERT(0, mpButtonScreen != 0); fg = mpButtonScreen->setPriority("zelda_game_image_hakusha_a_btn.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpButtonScreen); mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL); - JUT_ASSERT(mpButtonA != 0); + JUT_ASSERT(0, mpButtonA != 0); mpButtonA->show(); mpButtonA->setAlphaRate(0.0f); @@ -353,4 +353,4 @@ int dMeterHakusha_c::getHakushaNum() { } return hakusha_num; -} \ No newline at end of file +} diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index ebfde58fab8..29593123bc2 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -48,10 +48,10 @@ int dMeterString_c::_create() { } mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -59,13 +59,13 @@ int dMeterString_c::_create() { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive)); mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(mpParentPane != 0); + JUT_ASSERT(0, mpParentPane != 0); mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL); - JUT_ASSERT(mpRootPane != 0); + JUT_ASSERT(0, mpRootPane != 0); mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL); - JUT_ASSERT(mpTextPane != 0); + JUT_ASSERT(0, mpTextPane != 0); static_cast(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); @@ -263,4 +263,4 @@ void dMeterString_c::drawPikari() { /* 8020FA88-8020FAB4 20A3C8 002C+00 1/1 0/0 0/0 .text isLeadByte__14dMeterString_cFi */ bool dMeterString_c::isLeadByte(int c) { return (c >= 0x81 && c <= 0x9F) || (c >= 0xE0 && c <= 0xFC); -} \ No newline at end of file +} diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 5ce6e2690ae..6c29328a200 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -716,7 +716,7 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) { } if (i >= msgIndexCount) { - JUT_WARN(1937, "Message Index Not Exist!! %d", param_0) + JUT_WARN(1937, "Message Index Not Exist!! %d", param_1) rv = 612; } return rv; @@ -1364,7 +1364,7 @@ void dMsgObject_c::talkStartInit() { mpTalkHeap->getTotalFreeSize(); bool local_98 = false; if (mpOutFont == NULL) { - OS_REPORT("free size (0x%x)=====> %d\n", :mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); + OS_REPORT("free size (0x%x)=====> %d\n", mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); mpOutFont = new COutFont_c(0); JUT_ASSERT(3035, mpOutFont != 0); mpOutFont->createPane(); diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index d9dc0793fb7..9b398d28aad 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -47,10 +47,10 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { static u32 unkdata[9] = {0}; mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0)); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -72,11 +72,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mBtkFrame = 0.0f; mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(mpSelectCursor != 0); + JUT_ASSERT(0, mpSelectCursor != 0); mpSelectCursor->setAlphaRate(0.0f); mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); for (int i = 0; i < 3; i++) { mCursorPos[i].x = 0.0f; @@ -84,46 +84,46 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mCursorPos[i].z = 0.0f; mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); - JUT_ASSERT(mpSel_c[i] != 0); + JUT_ASSERT(0, mpSel_c[i] != 0); mpSel_c[i]->hide(); mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); - JUT_ASSERT(mpSelCld_c[i] != 0); + JUT_ASSERT(0, mpSelCld_c[i] != 0); mpSelCld_c[i]->getPanePtr()->setAnimation(mpAnmBtk); mpSelCldr_c[i] = new CPaneMgr(mpScreen, tag_name[i][2], 0, NULL); - JUT_ASSERT(mpSelCldr_c[i] != 0); + JUT_ASSERT(0, mpSelCldr_c[i] != 0); mpSelCldr_c[i]->getPanePtr()->setAnimation(mpAnmBtk); mpSelCldm_c[i] = new CPaneMgr(mpScreen, tag_name[i][3], 0, NULL); - JUT_ASSERT(mpSelCldm_c[i] != 0); + JUT_ASSERT(0, mpSelCldm_c[i] != 0); mpSelCldm_c[i]->getPanePtr()->setAnimation(mpAnmBpk); for (int j = 0; j < 5; j++) { mpSelCldw_c[j][i] = new CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL); - JUT_ASSERT(mpSelCldw_c[j][i] != 0); + JUT_ASSERT(0, mpSelCldw_c[j][i] != 0); } mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); - JUT_ASSERT(mpSelPo_c[i] != 0); + JUT_ASSERT(0, mpSelPo_c[i] != 0); mpSelPo_c[i]->hide(); mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); - JUT_ASSERT(mpKahen_c[i] != 0); + JUT_ASSERT(0, mpKahen_c[i] != 0); mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); - JUT_ASSERT(mpCursor_c[i] != 0); + JUT_ASSERT(0, mpCursor_c[i] != 0); mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0); } mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[0] != 0); + JUT_ASSERT(0, mpTmSel_c[0] != 0); mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[1] != 0); + JUT_ASSERT(0, mpTmSel_c[1] != 0); mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL); - JUT_ASSERT(mpTmSel_c[2] != 0); + JUT_ASSERT(0, mpTmSel_c[2] != 0); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); @@ -229,17 +229,17 @@ bool dMsgScrn3Select_c::isSelect() { /* 80239C78-80239D08 2345B8 0090+00 0/0 5/5 0/0 .text setString__17dMsgScrn3Select_cFPcPcPc */ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { if (mpTmSel_c[0] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText0)); } if (mpTmSel_c[1] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText1)); } if (mpTmSel_c[2] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() > std::strlen(mpText2)); } @@ -259,17 +259,17 @@ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) { /* 80239D08-80239D98 234648 0090+00 0/0 5/5 0/0 .text setRubyString__17dMsgScrn3Select_cFPcPcPc */ void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) { if (mpTmrSel_c[0] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() > std::strlen(pText0)); } if (mpTmrSel_c[1] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() > std::strlen(pText1)); } if (mpTmrSel_c[2] != NULL) { - JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() > + JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() > std::strlen(pText2)); } diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index c7e953709ca..89a7e37e8cb 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -7,10 +7,10 @@ /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -25,10 +25,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != 0); mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL); - JUT_ASSERT(mpArw_c != 0); + JUT_ASSERT(0, mpArw_c != 0); mpArw_c->hide(); mpArw_c->mPane->setAnimation(mpBck); @@ -36,7 +36,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen->search('yajinexl')->setAnimation(mpBpk); mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL); - JUT_ASSERT(mpDot_c != 0); + JUT_ASSERT(0, mpDot_c != 0); mpDot_c->hide(); mpScreen->search('yaj_end')->setAnimation(mpBpk); @@ -140,4 +140,4 @@ void dMsgScrnArrow_c::dotAnimeMove() { mpBpk->setFrame(mBpkFrame); mpScreen->animation(); -} \ No newline at end of file +} diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 5c0e7f24e74..8e4f4a0d392 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -25,32 +25,32 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { init(); mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000, dComIfGp_getMsgCommonArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpLight_c = new dMsgScrnLight_c(0, param_0); - JUT_ASSERT(mpLight_c != 0); + JUT_ASSERT(0, mpLight_c != 0); void* mpBuf = heap->alloc(0x106A, 0x20); - JUT_ASSERT(mpBuf != 0); + JUT_ASSERT(0, mpBuf != 0); memset(mpBuf, 0, 0x106A); mCharInfoPtr = (CharInfo_c*)mpBuf; mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL); - JUT_ASSERT(mpPmP_c != 0); + JUT_ASSERT(0, mpPmP_c != 0); mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5]; mpPmP_c->paneTrans(0.0f, field_0xcc); mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(mpTm_c[0] != 0); + JUT_ASSERT(0, mpTm_c[0] != 0); mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); - JUT_ASSERT(mpTm_c[1] != 0); + JUT_ASSERT(0, mpTm_c[1] != 0); mpScreen->search('n_3line')->hide(); mpScreen->search('n_3fline')->hide(); @@ -176,4 +176,4 @@ void dMsgScrnJimaku_c::fukiScale(f32 i_scale) {} void dMsgScrnJimaku_c::fukiTrans(f32 i_posX, f32 i_posY) {} /* 80244E34-80244E38 23F774 0004+00 1/0 0/0 0/0 .text fontAlpha__16dMsgScrnJimaku_cFf */ -void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {} \ No newline at end of file +void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {} diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index 106a698a6b5..d841385af45 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -129,10 +129,10 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { g_MsgScrnLight_HIO_c.updateColor(i_colorType); mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000, dComIfGp_getMain2DArchive()); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); OSInitFastCast(); @@ -146,7 +146,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL); - JUT_ASSERT(mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != 0); mpParent_c->getPanePtr()->setAnimation(mpBck); mpParent_c->getPanePtr()->setAnimation(mpBpk); @@ -283,4 +283,4 @@ void dMsgScrnLight_c::drawCommon(f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_sca } mAlpha = i_alpha; -} \ No newline at end of file +} diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index c7ddadcc213..97d45d91a06 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -1159,7 +1159,7 @@ SECTION_DATA extern void* __vt__7dName_c[3 + 3 /* padding */] = { /* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text screenSet__7dName_cFv */ void dName_c::screenSet() { nameIn.NameInScr = new J2DScreen(); - JUT_ASSERT(nameIn.NameInScr != 0); + JUT_ASSERT(0, nameIn.NameInScr != 0); archive = dComIfGp_getNameResArchive(); nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive); @@ -1167,12 +1167,12 @@ void dName_c::screenSet() { nameIn.field_0x10 = nameIn.NameInScr->search('name_n'); void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive); - JUT_ASSERT(bpk != 0); + JUT_ASSERT(0, bpk != 0); mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk); mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr); void* btk = JKRGetNameResource("zelda_player_name.btk", archive); - JUT_ASSERT(btk != 0); + JUT_ASSERT(0, btk != 0); mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr); @@ -1246,7 +1246,7 @@ void dName_c::screenSet() { mCharRow = 0; mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(mSelIcon != 0); + JUT_ASSERT(0, mSelIcon != 0); mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f); Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 970d59dc212..e1244fd6055 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -24,7 +24,7 @@ static int dOvlpFd_Draw(overlap1_class* i_this) { /* 80252184-802521F4 24CAC4 0070+00 1/1 0/0 0/0 .text dOvlpFd_startFadeIn__Fi */ static void dOvlpFd_startFadeIn(int param_0) { JUTFader* fader = JFWDisplay::getManager()->getFader(); - JUT_ASSERT(fader != 0); + JUT_ASSERT(0, fader != 0); fader->setStatus(JUTFader::UNKSTATUS_0, 0); fader->setStatus(JUTFader::UNKSTATUS_0, -1); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 338fee8cebf..7ceb29eeec4 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -356,7 +356,7 @@ int dRes_info_c::loadResource() { strncpy(arcName, name_p, resNameLen); arcName[resNameLen] = '\0'; - JKRHeap* parentHeap = JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); + JKRExpHeap* parentHeap = (JKRExpHeap*)JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); JUT_ASSERT(0x308, parentHeap != 0 && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap())); #ifdef DEBUG char* heapName; @@ -369,7 +369,7 @@ int dRes_info_c::loadResource() { // ">>>>>>>>>>>>>>>>>> Pack Archive<%s> <%s>\n" OSReport(">>>>>>>>>>>>>>>>>> パックアーカイブ<%s> <%s>\n", arcName, heapName); #endif - if (parentHeap == (JKRHeap*)mDoExt_getGameHeap()) { + if (parentHeap == (JKRExpHeap*)mDoExt_getGameHeap()) { parentHeap = NULL; } @@ -507,12 +507,12 @@ void dRes_info_c::deleteArchiveRes() { JKRArchive::SDIFileEntry* fileEntry = mArchive->findIdxResource(fileIndex); u32 nameOffset = fileEntry->getNameOffset(); char* fileName = mArchive->mStringTable + nameOffset; - size_t nameLen = strlen(fileName) - 4; + size_t resNameLen = strlen(fileName) - 4; JUT_ASSERT(0x46C, resNameLen <= NAME_MAX); char nameBuffer[12]; - strncpy(nameBuffer, fileName, nameLen); - nameBuffer[nameLen] = '\0'; + strncpy(nameBuffer, fileName, resNameLen); + nameBuffer[resNameLen] = '\0'; int rt = dComIfG_deleteObjectResMain(nameBuffer); JUT_ASSERT(0x470, rt); diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 3c14b8696cb..3f5c8a21264 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -659,7 +659,7 @@ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) { u8 bombBags = 0; - for (int i = 0; i < BOMB_BAG_MAX; i++) { + for (int i = 0; i < dSv_player_item_c::BOMB_BAG_MAX; i++) { if (i_itemNo == mItems[i + SLOT_15]) { bombBags++; } diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 9dbe09c1462..0c842211ad8 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -48,7 +48,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { dShopSystem_item_count < dShopSystem_sellItemMax) { u8 i_posID = (fopAcM_GetParam(i_actor) >> 0x18) & 0xF; - JUT_ASSERT(i_posID <= dShopSystem_c::ITEM_MAX_e); + JUT_ASSERT(0, i_posID <= dShopSystem_c::ITEM_MAX_e); if (dShopSystem_itemActor[0] != i_actor && dShopSystem_itemActor[1] != i_actor && dShopSystem_itemActor[2] != i_actor && dShopSystem_itemActor[3] != i_actor && diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1182b2c3175..abe62d594fc 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -34,7 +34,7 @@ int dTimer_c::_create() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer"); - JUT_ASSERT(resInfo != 0); + JUT_ASSERT(0, resInfo != 0); dComIfGp_setAllMapArchive(resInfo->getArchive()); mp_heap = fopMsgM_createExpHeap(0x11000, NULL); @@ -43,7 +43,7 @@ int dTimer_c::_create() { mp_heap->getTotalFreeSize(); mp_tm_scrn = new dDlst_TimerScrnDraw_c(); - JUT_ASSERT(mp_tm_scrn != 0); + JUT_ASSERT(0, mp_tm_scrn != 0); if (appen->timer_mode == 10) { mp_tm_scrn->setScreen(dComIfG_getTimerMode(), resInfo->getArchive()); @@ -612,10 +612,10 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { setShowType(3); mpGetInScreen = new J2DScreen(); - JUT_ASSERT(mpGetInScreen != 0); + JUT_ASSERT(0, mpGetInScreen != 0); bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpGetInScreen); OSInitFastCast(); @@ -623,13 +623,13 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(mpGetInParent != 0); + JUT_ASSERT(0, mpGetInParent != 0); mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL); - JUT_ASSERT(mpGetInRoot != 0); + JUT_ASSERT(0, mpGetInRoot != 0); mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL); - JUT_ASSERT(mpGetInText != 0); + JUT_ASSERT(0, mpGetInText != 0); static_cast(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); @@ -652,24 +652,24 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenBase() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL); - JUT_ASSERT(mpTimeParent != 0); + JUT_ASSERT(0, mpTimeParent != 0); mpTimeParent->setAlphaRate(0.0f); mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('c_n_2'); @@ -700,23 +700,23 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { */ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_zora_kawakudari.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = new CPaneMgr(mpScreen, 'ta_co_n', 2, NULL); - JUT_ASSERT(mpParent != 0); + JUT_ASSERT(0, mpParent != 0); mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); mpScreen->search('w_target')->hide(); @@ -743,22 +743,22 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenRider() { mpScreen = new J2DScreen(); - JUT_ASSERT(mpScreen != 0); + JUT_ASSERT(0, mpScreen != 0); bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive); - JUT_ASSERT(fg != false); + JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != 0); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL); - JUT_ASSERT(mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != 0); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('n_n_2'); @@ -1684,4 +1684,4 @@ extern msg_process_profile_definition g_profile_TIMER = { &g_fopMsg_Method, 768, &l_dTimer_Method, -}; \ No newline at end of file +}; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 6107406c104..515bd3e4e6e 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -30,7 +30,7 @@ fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, vo /* 800198C4-80019934 014204 0070+00 1/1 5/5 18/18 .text fopAcM_setStageLayer__FPv */ void fopAcM_setStageLayer(void* i_proc) { scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(stageProc != 0); + JUT_ASSERT(0, stageProc != 0); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(stageProc)); } @@ -39,7 +39,7 @@ void fopAcM_setStageLayer(void* i_proc) { void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) { if (i_roomNo >= 0) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(i_roomNo)); - JUT_ASSERT(roomProc != 0); + JUT_ASSERT(0, roomProc != 0); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(roomProc)); } @@ -258,8 +258,8 @@ fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u } BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) { - JUT_ASSERT(i_this); - JUT_ASSERT(i_this->heap == 0); + JUT_ASSERT(0, i_this); + JUT_ASSERT(0, i_this->heap == 0); // "Creating Actor Heap" fopAcM_Log(i_this, "アクターのヒープの生成"); @@ -270,7 +270,7 @@ BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) { if (i_this->heap == 0) { // "fopAcM_createHeap allocation failure\n" OSReport_Error("fopAcM_createHeap 確保失敗\n"); - JUT_CONFIRM(i_this->heap != 0); + JUT_CONFIRM(0, i_this->heap != 0); return FALSE; } @@ -412,7 +412,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback } OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" - JUT_ASSERT(0); + JUT_ASSERT(0, 0); OSReport_Error("緊急回避措置\n"); // "Emergency action\n" fopAcM::HeapAdjustEntry = false; } @@ -692,6 +692,12 @@ static cull_box l_cullSizeBox[] = { {-60.0f, -20.0f, -60.0f}, {60.0f, 160.0f, 60.0f}, }, +#ifdef DEBUG + { + {-200.0f, 0.0f, -200.0f}, + {200.0f, 400.0f, 200.0f}, + }, +#endif }; /* 803A3740-803A37C0 000860 0080+00 1/1 0/0 0/0 .data l_cullSizeSphere */ @@ -728,6 +734,12 @@ static cull_sphere l_cullSizeSphere[] = { {0.0f, 0.0f, 0.0f}, 400.0f, }, +#ifdef DEBUG + { + {0.0f, 0.0f, 0.0f}, + 400.0f, + }, +#endif }; /* 8001ACEC-8001B058 01562C 036C+00 0/0 1/1 1/1 .text fopAcM_cullingCheck__FPC10fopAc_ac_c */ @@ -1240,30 +1252,30 @@ fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_i /* 8001BF64-8001C078 0168A4 0114+00 1/1 0/0 11/11 .text * fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb */ -fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_tableNo, int i_itemBitNo, +fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz const* i_angle, int param_5, cXyz const* i_scale, f32* i_speedF, f32* i_speedY, bool i_createDirect) { // clang-format off - JUT_ASSERT(0 <= i_itemNo && i_itemNo <= 255 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo <= 255 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); - if (i_tableNo == 0xFF) { + if (i_itemNo == 0xFF) { return fpcM_ERROR_PROCESS_ID_e; } #ifdef DEBUG - if (tableList->mTableNum - 1 < i_tableNo) { + if (tableList->mTableNum - 1 < i_itemNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", - tableList->mTableNum, i_tableNo); - i_tableNo = 0; + tableList->mTableNum, i_itemNo); + i_itemNo = 0; } #endif - int itemNo = fopAcM_getItemNoFromTableNo(i_tableNo); + int itemNo = fopAcM_getItemNoFromTableNo(i_itemNo); if (itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1289,7 +1301,7 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN const csXyz* i_angle, int i_roomNo, const cXyz* scale, u8 param_7) { // clang-format off - JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == fpcNm_ITEM_NONE) { @@ -1349,7 +1361,7 @@ fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, int param_7) { // clang-format off - JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == fpcNm_ITEM_NONE) { @@ -1374,17 +1386,17 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1405,7 +1417,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, int param_5, const csXyz* i_angle, const cXyz* i_scale) { // clang-format off - JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on csXyz item_angle(csXyz::Zero); @@ -1432,17 +1444,17 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1467,7 +1479,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, f32* i_speedF, f32* i_speedY, int i_itemBitNo, int param_9, createFunc i_createFunc) { - JUT_ASSERT(0 <= i_itemNo && i_itemNo < 256); + JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256); csXyz angle; if (i_itemNo == fpcNm_ITEM_NONE) { @@ -1492,17 +1504,17 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0); + JUT_ASSERT(0, 0); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1597,11 +1609,11 @@ void* enemySearchJugge(void* i_actor, void* i_data) { /* 8001CA1C-8001CAD8 01735C 00BC+00 0/0 0/0 6/6 .text fopAcM_myRoomSearchEnemy__FSc */ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { - JUT_ASSERT(roomNo >= 0); + JUT_ASSERT(0, roomNo >= 0); int procID = dStage_roomControl_c::getStatusProcID(roomNo); scene_class* roomProc = fopScnM_SearchByID(procID); - JUT_ASSERT(roomProc != 0); + JUT_ASSERT(0, roomProc != 0); u32 actorID = ((daPy_py_c*)dComIfGp_getPlayer(0))->getGrabActorID(); fopAc_ac_c* actor = fopAcM_SearchByID(actorID); diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 084fa09e331..4909a946766 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -68,6 +68,11 @@ static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u1 J3DSys::mParentS.z = transformInfo->mScale.z; } +static BOOL isCurrentSolidHeap() { + /* Nonmatching */ + return FALSE; +} + /* 8000D320-8000D428 007C60 0108+00 6/6 0/0 0/0 .text initPlay__14mDoExt_baseAnmFsifss */ int mDoExt_baseAnm::initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { @@ -1043,7 +1048,7 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c return 0; } if (modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() && param_10 == 0) { - if (param_10 = modelData->isLocked()) { + if (modelData->isLocked()) { param_10 = 0x20000; } else { param_10 = 0x80000; @@ -1083,7 +1088,8 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c J3DModelData* r23 = mpModel->getModelData(); u16 jointNum = r23->getJointNum(); for (int i = 0; i < jointNum; i++) { - *info = r23->getJointNodePointer(i)->getTransformInfo(); + J3DJoint* joint = r23->getJointNodePointer(i); + *info = joint->getTransformInfo(); JMAEulerToQuat(info->mRotation.x, info->mRotation.y, info->mRotation.z, quat); info++; quat++; @@ -1711,6 +1717,13 @@ void mDoExt_McaMorf2::calc() { Quaternion sp30; Quaternion sp20; Quaternion* var_r27; + f32 var_f31; + f32 var_f30; + f32 var_f29; + f32 sp1C; + f32 sp18; + f32 sp14; + f32 sp10; if (mpQuat == NULL) { var_r27 = &sp30; } else { @@ -1741,8 +1754,6 @@ void mDoExt_McaMorf2::calc() { } else { field_0x40->getTransform(jnt_no, &spF0[1]); - f32 sp1C; - f32 sp18; sp18 = 1.0f - field_0x44; sp1C = field_0x44; @@ -1763,15 +1774,15 @@ void mDoExt_McaMorf2::calc() { JMAEulerToQuat(spF0[i].mRotation.x, spF0[i].mRotation.y, spF0[i].mRotation.z, &sp60[i]); } - f32 var_f29 = sp1C / (sp18 + sp1C); + var_f29 = sp1C / (sp18 + sp1C); JMAQuatLerp(&sp60[0], &sp60[1], var_f29, var_r27); mDoMtx_quat(spC0, var_r27); mDoExt_setJ3DData(spC0, var_r30, jnt_no); } } else if (field_0x40 == NULL) { - f32 var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); - f32 var_f30 = 1.0f - var_f31; + var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); + var_f30 = 1.0f - var_f31; mpAnm->getTransform(jnt_no, &sp80); if (mpCallback1 != NULL) { @@ -1800,7 +1811,6 @@ void mDoExt_McaMorf2::calc() { mpAnm->getTransform(jnt_no, &spF0[0]); field_0x40->getTransform(jnt_no, &spF0[1]); - f32 sp14, sp10; sp10 = 1.0f - field_0x44; sp14 = field_0x44; @@ -1821,11 +1831,11 @@ void mDoExt_McaMorf2::calc() { JMAEulerToQuat(spF0[i].mRotation.x, spF0[i].mRotation.y, spF0[i].mRotation.z, &sp40[i]); } - f32 var_f31 = sp14 / (sp10 + sp14); + var_f31 = sp14 / (sp10 + sp14); JMAQuatLerp(&sp40[0], &sp40[1], var_f31, &sp20); var_f31 = (mCurMorf - mPrevMorf) / (1.0f - mPrevMorf); - f32 var_f30 = 1.0f - var_f31; + var_f30 = 1.0f - var_f31; JMAQuatLerp(var_r27, &sp20, var_f31, var_r27); var_r30->mTranslate.x = var_r30->mTranslate.x * var_f30 @@ -2477,7 +2487,7 @@ void mDoExt_cylinderPacket::draw() { GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0); GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV); - if (field_0x28) { + if (mClipZ) { GXSetZMode(GX_ENABLE, GX_LEQUAL, GX_ENABLE); } else { GXSetZMode(GX_DISABLE, GX_LEQUAL, GX_DISABLE); diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 7035bb37824..8b7851d38d6 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -10,9 +10,37 @@ #include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_math.h" -// -// Declarations: -// +/* ############################################################################################## */ +/* 803DD470-803DD4A0 00A190 0030+00 12/12 142/142 1820/1820 .bss now__14mDoMtx_stack_c + */ +Mtx mDoMtx_stack_c::now; + +/* 803DD4A0-803DD7A0 00A1C0 0300+00 2/2 0/0 0/0 .bss buffer__14mDoMtx_stack_c */ +Mtx mDoMtx_stack_c::buffer[16]; + +/* 804505A8-804505AC -00001 0004+00 3/3 0/0 0/0 .sdata next__14mDoMtx_stack_c */ +Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer; + +/* 804505AC-804505B0 -00001 0004+00 2/2 0/0 0/0 .sdata end__14mDoMtx_stack_c */ +Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + 16; + +/* 80450C18-80450C20 000118 0001+07 1/1 0/0 0/0 .sbss mDoMtx_stack */ +static mDoMtx_stack_c mDoMtx_stack; + +/* 803DD7B8-803DD8D8 00A4D8 011C+04 0/1 0/0 0/0 .bss mDoMtx_quatStack */ +static mDoMtx_quatStack_c mDoMtx_quatStack; + +/* ############################################################################################## */ +/* 803A2FD8-803A3020 0000F8 0030+18 0/0 23/23 4/4 .data g_mDoMtx_identity */ +extern Mtx g_mDoMtx_identity = { + {1.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 1.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f, 0.0f}, +}; + +static void dummy() { + OSReport("mDoMtx_Dump %s\n"); +} /* 8000C0CC-8000C164 006A0C 0098+00 1/1 0/0 0/0 .text mDoMtx_XYZrotS__FPA4_fsss */ void mDoMtx_XYZrotS(Mtx mtx, s16 x, s16 y, s16 z) { @@ -117,7 +145,7 @@ void mDoMtx_XrotS(Mtx mtx, s16 x) { void mDoMtx_XrotM(Mtx mtx, s16 x) { Mtx tmp; mDoMtx_XrotS(tmp, x); - MTXConcat(mtx, tmp, mtx); + mDoMtx_concat(mtx, tmp, mtx); } /* 8000C3DC-8000C434 006D1C 0058+00 5/5 24/24 809/809 .text mDoMtx_YrotS__FPA4_fs */ @@ -145,7 +173,7 @@ void mDoMtx_YrotS(Mtx mtx, s16 y) { void mDoMtx_YrotM(Mtx mtx, s16 y) { Mtx tmp; mDoMtx_YrotS(tmp, y); - MTXConcat(mtx, tmp, mtx); + mDoMtx_concat(mtx, tmp, mtx); } /* 8000C474-8000C4CC 006DB4 0058+00 7/7 1/1 6/6 .text mDoMtx_ZrotS__FPA4_fs */ @@ -173,7 +201,7 @@ void mDoMtx_ZrotS(Mtx mtx, s16 z) { void mDoMtx_ZrotM(Mtx mtx, s16 z) { Mtx tmp; mDoMtx_ZrotS(tmp, z); - MTXConcat(mtx, tmp, mtx); + mDoMtx_concat(mtx, tmp, mtx); } /* 8000C50C-8000C710 006E4C 0204+00 0/0 3/3 0/0 .text mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs @@ -182,8 +210,9 @@ void mDoMtx_lookAt(Mtx mtx, Vec const* param_1, Vec const* param_2, s16 param_3) cXyz stack_48(*(cXyz*)param_1); cXyz local_54; cXyz local_60; - cXyz local_6c = stack_48 - cXyz(*(cXyz*)param_2); + cXyz local_6c; + local_6c = stack_48 - cXyz(*(cXyz*)param_2); local_6c.normalize(); local_54.set(0.0f, 1.0f, 0.0f); local_54 = local_54.outprod(local_6c); @@ -220,22 +249,25 @@ void mDoMtx_lookAt(Mtx mtx, Vec const* param_1, Vec const* param_2, s16 param_3) /* 8000C710-8000C8D0 007050 01C0+00 0/0 10/10 1/1 .text mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs */ void mDoMtx_lookAt(Mtx mtx, Vec const* i_eye, Vec const* i_center, Vec const* i_up, s16 i_bank) { - cXyz local_4c(*(cXyz*)i_eye); - cXyz local_58(*(cXyz*)i_center); - cXyz local_64(*(cXyz*)i_up); + cXyz local_4c(*i_eye); + cXyz local_58(*i_center); + cXyz local_64(*i_up); cXyz local_70 = local_4c - local_58; if (!local_70.normalizeRS()) { + OS_REPORT("%s: lookat: bad position!\n", __FILE__); + OS_REPORT("%s: ctr %f %f %f+1.0\n", __FILE__, local_58.x, local_58.y, local_58.z); + OS_REPORT("%s: eye %f %f %f\n", __FILE__, local_4c.x, local_4c.y, local_4c.z); local_58.z += 1.0f; } if (cM3d_IsZero(local_64.x) && cM3d_IsZero(local_64.y) && cM3d_IsZero(local_64.z)) { + OS_REPORT("%s: lookat: Zero Vector @ UP!\n", __FILE__); local_64.y = 1.0f; } C_MTXLookAt(mtx, &local_4c, &local_64, &local_58); Mtx local_40; mDoMtx_ZrotS(local_40, i_bank); mDoMtx_concat(local_40, mtx, mtx); - JGeometry::TVec3 local_7c; - local_7c.set(0.0f, mtx[1][1], mtx[2][1]); + JGeometry::TVec3 local_7c(0.0f, mtx[1][1], mtx[2][1]); if (local_7c.isZero()) { local_58.y += 1.0f; C_MTXLookAt(mtx, &local_4c, &local_64, &local_58); @@ -318,20 +350,6 @@ void mDoMtx_MtxToRot(CMtxP m, csXyz* o_rot) { } } -/* ############################################################################################## */ -/* 803DD470-803DD4A0 00A190 0030+00 12/12 142/142 1820/1820 .bss now__14mDoMtx_stack_c - */ -Mtx mDoMtx_stack_c::now; - -/* 803DD4A0-803DD7A0 00A1C0 0300+00 2/2 0/0 0/0 .bss buffer__14mDoMtx_stack_c */ -Mtx mDoMtx_stack_c::buffer[16]; - -/* 804505A8-804505AC -00001 0004+00 3/3 0/0 0/0 .sdata next__14mDoMtx_stack_c */ -Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer; - -/* 804505AC-804505B0 -00001 0004+00 2/2 0/0 0/0 .sdata end__14mDoMtx_stack_c */ -Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + 16; - /* 8000CCC8-8000CD14 007608 004C+00 0/0 0/0 24/24 .text push__14mDoMtx_stack_cFv */ bool mDoMtx_stack_c::push() { if (next >= end) { @@ -420,18 +438,3 @@ void mDoMtx_stack_c::quatM(Quaternion const* param_0) { mDoMtx_quat(tmp, param_0); mDoMtx_concat(now, tmp, now); } - -/* 80450C18-80450C20 000118 0001+07 1/1 0/0 0/0 .sbss mDoMtx_stack */ -static mDoMtx_stack_c mDoMtx_stack; - -/* 803DD7B8-803DD8D8 00A4D8 011C+04 0/1 0/0 0/0 .bss mDoMtx_quatStack */ -static mDoMtx_quatStack_c mDoMtx_quatStack; - - -/* ############################################################################################## */ -/* 803A2FD8-803A3020 0000F8 0030+18 0/0 23/23 4/4 .data g_mDoMtx_identity */ -extern Mtx g_mDoMtx_identity = { - {1.0f, 0.0f, 0.0f, 0.0f}, - {0.0f, 1.0f, 0.0f, 0.0f}, - {0.0f, 0.0f, 1.0f, 0.0f}, -};